converted tilemap scripts to lua

[chaz/yoink] / src / Character.hh

diff --git a/src/Character.hh b/src/Character.hh
index 5aeaeba0a7af1b8a5ea6e1c6f7f53fbee43c48e2..d1ec2c313713314bf0c3857002e33387c6a85680 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -31,13 +31,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Animation.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/RK4.hh>
+
+#include "Animation.hh"
+#include "Tilemap.hh"
+
 
 
 struct Character;
@@ -51,6 +52,7 @@ typedef boost::shared_ptr<Character> CharacterP;
 
 struct Character : public Mf::Entity
 {
+       /*
        struct Derivative
        {
                Mf::Vector2 velocity;
@@ -102,6 +104,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)
@@ -111,6 +116,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 +128,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;
@@ -129,50 +137,32 @@ struct Character : public Mf::Entity
                        return newState;
                }
        };
+*/
 
-       State                   previous;
-       State                   current;
-
-       Mf::OctreeNodeP treeNode;
+       Mf::State2              previous;
+       Mf::State2              current;
 
 
 private:
 
        static const Mf::Scalar z = 96.0;
 
-       Mf::Tilemap             tilemap_;
-       Mf::Animation   animation_;
+protected:
 
-       void updateContainers();
+       Mf::Vector2 userForce;
 
 public:
 
-       inline static CharacterP alloc(const std::string& name)
-       {
-               return CharacterP(new Character(name));
-       }
-
        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;
+       virtual ~Character() {}
 
-       Mf::Tilemap& getTilemap();
-       Mf::Animation& getAnimation();
-};
+       virtual void update(Mf::Scalar t, Mf::Scalar dt);
+       virtual void draw(Mf::Scalar alpha) const;
 
 
-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;
-}
+       Tilemap         tilemap;
+       Animation       animation;
+};
 
 
 #endif // _CHARACTER_HH_