spring experiments

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index b72e8c87e58910d6296218b2eff58696e8ac2ab1..00e5a4b2b6912dc8ceae0b27643d5f67496102ea 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -36,7 +36,7 @@
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
 #include <Moof/Octree.hh>
-#include <Moof/Physics.hh>
+#include <Moof/RK4.hh>
 #include <Moof/Tilemap.hh>
 
 
@@ -90,6 +90,11 @@ struct Character : public Mf::Entity
                Mf::Scalar      mass;
                Mf::Scalar      inverseMass;
 
+               void recalculate()
+               {
+                       velocity = momentum * inverseMass;
+               }
+
 
                void getDerivative(Derivative& derivative, Mf::Scalar t) const
                {
@@ -99,11 +104,6 @@ struct Character : public Mf::Entity
                        derivative.force = force;
                }
 
-               void recalculate()
-               {
-                       velocity = momentum * inverseMass;
-               }
-
                void applyDerivative(const Derivative& derivative, Mf::Scalar dt)
                {
                        position += dt * derivative.velocity;
@@ -111,6 +111,9 @@ struct Character : public Mf::Entity
                        recalculate();
                }
 
+               // these two operator overloads all using the state in generic
+               // interpolator implementations
+
                State operator*(Mf::Scalar scalar) const
                {
                        State state = *this;
@@ -120,7 +123,7 @@ struct Character : public Mf::Entity
                        return state;
                }
 
-               State operator+(State state) const
+               State operator+(const State& state) const
                {
                        State newState = *this;
                        newState.position +=  state.position;
@@ -133,7 +136,7 @@ struct Character : public Mf::Entity
        State                   previous;
        State                   current;
 
-       stlplus::ntree<Mf::OctreeNode>::iterator treeNode;
+       Mf::OctreeNodeP treeNode;
 
 
 private:
@@ -153,7 +156,7 @@ public:
        }
 
        Character(const std::string& name);
-       virtual ~Character();
+       inline virtual ~Character() {}
 
        void update(Mf::Scalar t, Mf::Scalar dt);
        void handleEvent(const Mf::Event& event);
@@ -164,14 +167,15 @@ 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;
-}
+//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_