X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHeroine.cc;h=c1c9f076d2b00eb9b6c0db09e61596b6e03df7de;hp=314f2c984090c013ca697916079f731750dfc81e;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c

diff --git a/src/Heroine.cc b/src/Heroine.cc
index 314f2c9..c1c9f07 100644
--- a/src/Heroine.cc
+++ b/src/Heroine.cc
@@ -1,32 +1,15 @@
 
-/*******************************************************************************
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <iostream>
+#include <Moof/Sound.hh>
 
 #include "Heroine.hh"
 #include "Log.hh"
@@ -36,62 +19,72 @@ Heroine::Heroine() :
 	Character("Heroine") {}
 
 
-void Heroine::handleEvent(const Mf::Event& event)
+void Heroine::update(Mf::Scalar t, Mf::Scalar dt)
 {
-	// really just for heroine...
-	
-	Mf::Scalar force = 4000.0;
-	
-	Mf::Vector2 left = Mf::Vector2(-force, 0.0);
-	Mf::Vector2 right = Mf::Vector2(force, 0.0);
-	Mf::Vector2 down = Mf::Vector2(0.0, -force);
-	Mf::Vector2 up = Mf::Vector2(0.0, force);
+	Character::update(t, dt);
+
+	Mf::Vector3 at(0.0, 0.0, 0.0);
+	const Mf::Vector3 up(0.0, 1.0, 0.0);
+
+	if (mState.velocity[0] < 0.0) at[0] = -1.0;
+	else                          at[0] = 1.0;
+
+	Mf::Sound::setListenerPosition(Mf::promote(mState.position));
+	Mf::Sound::setListenerVelocity(Mf::promote(mState.velocity));
+	Mf::Sound::setListenerOrientation(at, up);
+}
+
 
+bool Heroine::handleEvent(const Mf::Event& event)
+{
+	Mf::Scalar force = 40.0;
+	
 	switch (event.type)
 	{
 		case SDL_KEYDOWN:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				userForce += left;
+				mState.force += Mf::Vector2(-force, 0.0);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				userForce += right;
+				mState.force += Mf::Vector2(force, 0.0);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				userForce += down;
+				mState.force += Mf::Vector2(0.0, -force);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				userForce += up;
+				mState.force += Mf::Vector2(0.0, force);
+				return true;
 			}
-			break;
 
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				userForce -= left;
+				mState.force += Mf::Vector2(force, 0.0);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				userForce -= right;
+				mState.force += Mf::Vector2(-force, 0.0);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				userForce -= down;
+				mState.force += Mf::Vector2(0.0, force);
+				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				userForce -= up;
+				mState.force += Mf::Vector2(0.0, -force);
+				return true;
 			}
-			break;
 	}
-
-	//Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]);
-	//std::cerr << "current force: " << current.force << std::endl;
+	return false;
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-