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

diff --git a/src/Heroine.cc b/src/Heroine.cc
index 314f2c9..a70b798 100644
--- a/src/Heroine.cc
+++ b/src/Heroine.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include <iostream>
+#include <Moof/Sound.hh>
 
 #include "Heroine.hh"
 #include "Log.hh"
@@ -36,60 +36,73 @@ 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;
 }