X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FHeroine.cc;h=a20691855b7fb44a42fcc0eb9962780170fba576;hp=c1c9f076d2b00eb9b6c0db09e61596b6e03df7de;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=299af4f2047e767e5d79501c26444473bda64c64

diff --git a/src/Heroine.cc b/src/Heroine.cc
index c1c9f07..a206918 100644
--- a/src/Heroine.cc
+++ b/src/Heroine.cc
@@ -9,79 +9,78 @@
 *
 **************************************************************************/
 
-#include <Moof/Sound.hh>
+#include <moof/log.hh>
+#include <moof/sound.hh>
 
 #include "Heroine.hh"
-#include "Log.hh"
-
 	
 Heroine::Heroine() :
 	Character("Heroine") {}
 
 
-void Heroine::update(Mf::Scalar t, Mf::Scalar dt)
+void Heroine::update(moof::scalar t, moof::scalar dt)
 {
 	Character::update(t, dt);
 
-	Mf::Vector3 at(0.0, 0.0, 0.0);
-	const Mf::Vector3 up(0.0, 1.0, 0.0);
+	moof::vector3 at(0.0, 0.0, 0.0);
+	const moof::vector3 up(0.0, 1.0, 0.0);
 
-	if (mState.velocity[0] < 0.0) at[0] = -1.0;
+	if (state_.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);
+	moof::sound::listener_position(moof::promote(state_.position));
+	moof::sound::listener_velocity(moof::promote(state_.velocity));
+	moof::sound::listener_orientation(at, up);
 }
 
 
-bool Heroine::handleEvent(const Mf::Event& event)
+bool Heroine::handle_event(const moof::event& event)
 {
-	Mf::Scalar force = 40.0;
+	moof::scalar force = 40.0;
 	
 	switch (event.type)
 	{
 		case SDL_KEYDOWN:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				mState.force += Mf::Vector2(-force, 0.0);
+				state_.force += moof::vector2(-force, 0.0);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				mState.force += Mf::Vector2(force, 0.0);
+				state_.force += moof::vector2(force, 0.0);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				mState.force += Mf::Vector2(0.0, -force);
+				state_.force += moof::vector2(0.0, -force);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				mState.force += Mf::Vector2(0.0, force);
+				state_.force += moof::vector2(0.0, force);
 				return true;
 			}
 
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				mState.force += Mf::Vector2(force, 0.0);
+				state_.force += moof::vector2(force, 0.0);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				mState.force += Mf::Vector2(-force, 0.0);
+				state_.force += moof::vector2(-force, 0.0);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				mState.force += Mf::Vector2(0.0, force);
+				state_.force += moof::vector2(0.0, force);
 				return true;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				mState.force += Mf::Vector2(0.0, -force);
+				state_.force += moof::vector2(0.0, -force);
 				return true;
 			}
 	}