X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=19559f38b0f54be1643f31fc29f2949323be977b;hp=c19206c416a022e1bcabce36c0a591facc35fc22;hb=bc2bc12125d6c223d2935557e01926fe21166e38;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c

diff --git a/src/Character.hh b/src/Character.hh
index c19206c..19559f3 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,12 +31,13 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Animation.hh>
 #include <Moof/Entity.hh>
-#include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/RK4.hh>
-#include <Moof/Tilemap.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
 
 
 struct Character;
@@ -50,101 +51,6 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
-	struct Derivative
-	{
-		Mf::Vector2 velocity;
-		Mf::Vector2 force;
-
-		Derivative operator*(Mf::Scalar dt) const
-		{
-			Derivative derivative;
-			derivative.velocity = dt * velocity;
-			derivative.force = dt * force;
-			return derivative;
-		}
-
-		Derivative operator+(const Derivative& other) const
-		{
-			Derivative derivative;
-			derivative.velocity = velocity + other.velocity;
-			derivative.force = force + other.force;
-			return derivative;
-		}
-	};
-
-	struct State
-	{
-		// primary
-		
-		Mf::Vector2 position;
-		Mf::Vector2 momentum;
-		Mf::Vector2 force;
-
-		// secondary
-
-		Mf::Vector2 velocity;
-
-		// constant
-		
-		Mf::Scalar	mass;
-		Mf::Scalar	inverseMass;
-
-		void recalculate()
-		{
-			velocity = momentum * inverseMass;
-		}
-
-
-		void getDerivative(Derivative& derivative, Mf::Scalar t) const
-		{
-			//derivative.velocity = Mf::Vector2(0.0, 0.0);
-			//derivative.force = Mf::Vector2(0.0, 0.0);
-			derivative.velocity = velocity;
-			derivative.force = force;
-		}
-
-		void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
-		{
-			position += dt * derivative.velocity;
-			momentum += dt * derivative.force;
-			recalculate();
-		}
-
-		// these two operator overloads all using the state in generic
-		// interpolator implementations
-
-		State operator*(Mf::Scalar scalar) const
-		{
-			State state = *this;
-			state.position *= scalar;
-			state.momentum *= scalar;
-			state.recalculate();
-			return state;
-		}
-
-		State operator+(const State& state) const
-		{
-			State newState = *this;
-			newState.position +=  state.position;
-			newState.momentum +=  state.momentum;
-			newState.recalculate();
-			return newState;
-		}
-	};
-
-	State			previous;
-	State			current;
-
-
-private:
-
-	static const Mf::Scalar z = 96.0;
-
-	Mf::Tilemap		tilemap_;
-	Mf::Animation	animation_;
-
-	//void updateContainers();
-
 protected:
 
 	Mf::Vector2 userForce;
@@ -157,20 +63,10 @@ public:
 	virtual void update(Mf::Scalar t, Mf::Scalar dt);
 	virtual void draw(Mf::Scalar alpha) const;
 
-	Mf::Tilemap& getTilemap();
-	Mf::Animation& getAnimation();
-};
-
 
-//inline Character::State operator*(Mf::Scalar scalar,
-		//const Character::State& state)
-//{
-	//Character::State newState = state;
-	//newState.position *= scalar;
-	//newState.momentum *= scalar;
-	//newState.recalculate();
-	//return newState;
-//}
+	Tilemap		tilemap;
+	Animation	animation;
+};
 
 
 #endif // _CHARACTER_HH_