fixed layer bugs; generalized octree

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index a92992c6e3eca9fc4e6bb22581b8903f80bcdf58..c19206c416a022e1bcabce36c0a591facc35fc22 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -35,20 +35,21 @@
 #include <Moof/Entity.hh>
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
-#include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
+#include <Moof/RK4.hh>
 #include <Moof/Tilemap.hh>
 
 
+struct Character;
+typedef boost::shared_ptr<Character> CharacterP;
+
+
 /**
  * Parent class of animate objects with "personalities."  This basically
  * includes the heroine herself and the bad guys.
  */
 
-class Character : public Mf::Entity
+struct Character : public Mf::Entity
 {
-public:
-
        struct Derivative
        {
                Mf::Vector2 velocity;
@@ -88,6 +89,11 @@ public:
                Mf::Scalar      mass;
                Mf::Scalar      inverseMass;
 
+               void recalculate()
+               {
+                       velocity = momentum * inverseMass;
+               }
+
 
                void getDerivative(Derivative& derivative, Mf::Scalar t) const
                {
@@ -97,11 +103,6 @@ public:
                        derivative.force = force;
                }
 
-               void recalculate()
-               {
-                       velocity = momentum * inverseMass;
-               }
-
                void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
                {
                        position += dt * derivative.velocity;
@@ -109,6 +110,9 @@ public:
                        recalculate();
                }
 
+               // these two operator overloads all using the state in generic
+               // interpolator implementations
+
                State operator*(Mf::Scalar scalar) const
                {
                        State state = *this;
@@ -118,7 +122,7 @@ public:
                        return state;
                }
 
-               State operator+(State state) const
+               State operator+(const State& state) const
                {
                        State newState = *this;
                        newState.position +=  state.position;
@@ -128,43 +132,45 @@ public:
                }
        };
 
-
-       Character(const std::string& name);
-       virtual ~Character();
-
-       void update(Mf::Scalar t, Mf::Scalar dt);
-       void handleEvent(const Mf::Event& event);
-       void draw(Mf::Scalar alpha) const;
-
-       Mf::Tilemap& getTilemap();
-       Mf::Animation& getAnimation();
-
        State                   previous;
        State                   current;
 
-       stlplus::ntree<Mf::OctreeNode>::iterator treeNode;
 
 private:
 
-       void updateContainers();
-
        static const Mf::Scalar z = 96.0;
 
        Mf::Tilemap             tilemap_;
        Mf::Animation   animation_;
-};
 
-typedef boost::shared_ptr<Character> CharacterPtr;
+       //void updateContainers();
 
+protected:
 
-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;
-}
+       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();
+};
+
+
+//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_