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

diff --git a/src/Character.hh b/src/Character.hh
index c9cf11a..090e7cb 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -29,36 +29,139 @@
 #ifndef _CHARACTER_HH_
 #define _CHARACTER_HH_
 
-#include "resource.hh"
-#include "drawable.hh"
-#include "animation.hh"
-#include "tilemap.hh"
+#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>
+
+
+struct Character;
+typedef boost::shared_ptr<Character> CharacterP;
 
 
 /**
- * Parent class of animate objects with "personalities."
+ * Parent class of animate objects with "personalities."  This basically
+ * includes the heroine herself and the bad guys.
  */
 
-class Character : public dc::drawable
+struct Character : public Mf::Entity
 {
-public:
-	struct exception : public std::runtime_error
+	/*
+	struct Derivative
 	{
-		explicit exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
+		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;
+		}
 	};
 
-	Character(const std::string& name);
-	~Character();
+	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;
+
+			//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)
+		{
+			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;
+		}
+	};
+*/
 
-	void draw(dc::scalar alpha);
+	Mf::State2		previous;
+	Mf::State2		current;
 
-	dc::tilemap& getTilemap();
-	dc::animation& getAnimation();
 
 private:
-	dc::tilemap texture;
-	dc::animation anim;
+
+	static const Mf::Scalar z = 96.0;
+
+	Mf::Tilemap		tilemap_;
+	Mf::Animation	animation_;
+
+protected:
+
+	Mf::Vector2 userForce;
+
+public:
+
+	Character(const std::string& name);
+	virtual ~Character() {}
+
+	virtual void update(Mf::Scalar t, Mf::Scalar dt);
+	virtual void draw(Mf::Scalar alpha) const;
+
+	Mf::Tilemap& getTilemap();
+	Mf::Animation& getAnimation();
 };