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

diff --git a/src/Character.hh b/src/Character.hh
index c19206c..090e7cb 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -50,6 +50,7 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
+	/*
 	struct Derivative
 	{
 		Mf::Vector2 velocity;
@@ -101,6 +102,9 @@ struct Character : public Mf::Entity
 			//derivative.force = Mf::Vector2(0.0, 0.0);
 			derivative.velocity = velocity;
 			derivative.force = force;
+
+			//Mf::Vector2 x = position - Mf::Vector2(500.0, 200.0);
+			//derivative.force += -15.0 * x - 1.5 * velocity;
 		}
 
 		void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
@@ -131,9 +135,10 @@ struct Character : public Mf::Entity
 			return newState;
 		}
 	};
+*/
 
-	State			previous;
-	State			current;
+	Mf::State2		previous;
+	Mf::State2		current;
 
 
 private:
@@ -143,8 +148,6 @@ private:
 	Mf::Tilemap		tilemap_;
 	Mf::Animation	animation_;
 
-	//void updateContainers();
-
 protected:
 
 	Mf::Vector2 userForce;
@@ -162,17 +165,6 @@ public:
 };
 
 
-//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;
-//}
-
-
 #endif // _CHARACTER_HH_
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/