X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.hh;h=28e588b627da8ccc0b45b49dc80cbac1b37fc258;hp=a92992c6e3eca9fc4e6bb22581b8903f80bcdf58;hb=2fdb5f5824826a6c54f5afde8c62eafd24c1a152;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/src/Character.hh b/src/Character.hh
index a92992c..28e588b 100644
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,13 +31,20 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Animation.hh>
+#include <Moof/Aabb.hh>
 #include <Moof/Entity.hh>
-#include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
-#include <Moof/Tilemap.hh>
+#include <Moof/RigidBody.hh>
+#include <Moof/Sphere.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
+
+
+class Character;
+typedef boost::shared_ptr<Character> CharacterP;
 
 
 /**
@@ -45,127 +52,32 @@
  * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::Entity
+class Character : public Mf::RigidBody2, public Mf::OctreeInsertable
 {
 public:
 
-	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 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 recalculate()
-		{
-			velocity = momentum * inverseMass;
-		}
-
-		void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
-		{
-			position += dt * derivative.velocity;
-			momentum += dt * derivative.force;
-			recalculate();
-		}
-
-		State operator*(Mf::Scalar scalar) const
-		{
-			State state = *this;
-			state.position *= scalar;
-			state.momentum *= scalar;
-			state.recalculate();
-			return state;
-		}
-
-		State operator+(State state) const
-		{
-			State newState = *this;
-			newState.position +=  state.position;
-			newState.momentum +=  state.momentum;
-			newState.recalculate();
-			return newState;
-		}
-	};
-
-
 	Character(const std::string& name);
-	virtual ~Character();
+	virtual ~Character() {}
 
-	void update(Mf::Scalar t, Mf::Scalar dt);
-	void handleEvent(const Mf::Event& event);
-	void draw(Mf::Scalar alpha) const;
+	virtual void update(Mf::Scalar t, Mf::Scalar dt);
+	virtual void draw(Mf::Scalar alpha) const;
 
-	Mf::Tilemap& getTilemap();
-	Mf::Animation& getAnimation();
+	void setZCoord(Mf::Scalar z);
 
-	State			previous;
-	State			current;
+	void addImpulse(Mf::Vector2 impulse);
+	void addForce(Mf::Vector2 force);
+	void setPosition(Mf::Vector2 position);
 
-	stlplus::ntree<Mf::OctreeNode>::iterator treeNode;
+	virtual int getOctant(const Mf::Aabb& aabb) const;
 
-private:
+	Tilemap		tilemap;
+	Animation	animation;
 
-	void updateContainers();
-
-	static const Mf::Scalar z = 96.0;
+private:
 
-	Mf::Tilemap		tilemap_;
-	Mf::Animation	animation_;
+	mutable Mf::Scalar mZCoord;
 };
 
-typedef boost::shared_ptr<Character> CharacterPtr;
-
-
-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_