beginning CD implementation

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index ffecfd5b8c5db2c2c82c3e4cc478c00d718f3fed..e0ce1c05c016afa66b9ff4612f125808bc2cade4 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -56,34 +56,38 @@ private:
        Mf::Vector2 location;
 };
 
-struct WindResistenceForce
+struct ResistanceForce
 {
+       explicit ResistanceForce(Mf::Scalar scale = 1.0) :
+               k(scale) {}
+
        const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
        {
-               force = -2.0 * state.velocity;
+               force = -k * state.velocity;
                return force;
        }
 
 private:
 
-       Mf::Vector2 force;
+       Mf::Vector2     force;
+       Mf::Scalar      k;
 };
 
 
 Character::Character(const std::string& name) :
-       tilemap_(name),
-       animation_(name)
+       tilemap(name),
+       animation(name)
 {
        current.init();
 
        current.mass = 1.0;
        current.inverseMass = 1.0 / current.mass;
 
-       // gravity
-       current.force = Mf::Vector2(0.0, 000.0);
+       // forces
+       current.force = Mf::Vector2(0.0, 0.0);
        current.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0)));
-       current.forces.push_back(WindResistenceForce());
-       current.forces.push_back(Mf::LinearState<2>::GravityForce(-2000.0));
+       current.forces.push_back(ResistanceForce(2.0));
+       current.forces.push_back(Mf::LinearState<2>::GravityForce(-1000.0));
 
        // starting position
        current.position = Mf::Vector2(64.0, 64.0);
@@ -114,11 +118,15 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 
        //Mf::euler<State,Derivative>(current, t, dt);
 
-       //current.force = Mf::Vector2(0.0, -2000.0);
-       current.force = userForce;
        current.integrate(t, dt);
+       animation.update(t, dt);
 
-       animation_.update(t, dt);
+       Mf::Vector3 center(current.position[0], current.position[1], z);
+       Mf::Vector3 a(current.position[0] - 16.0, current.position[1] - 16.0, z);
+       Mf::Vector3 b(current.position[0] + 16.0, current.position[1] + 16.0, z);
+
+       aabb_.init(a, b);
+       sphere_.init(center, a);
 }
 
 
@@ -127,16 +135,16 @@ void Character::draw(Mf::Scalar alpha) const
        Mf::Vector2 position = cml::lerp(previous.position, current.position, alpha);
 
        //glColor3f(1.0f, 1.0f, 1.0f);
-       tilemap_.bind();
+       tilemap.bind();
 
-       Mf::Tilemap::Index frame = animation_.getFrame();
+       Tilemap::Index frame = animation.getFrame();
 
-       Mf::Tilemap::Orientation orientation = Mf::Tilemap::NORMAL;
+       Tilemap::Orientation orientation = Tilemap::NORMAL;
 
-       if (current.velocity[0] < 0.0) orientation = Mf::Tilemap::REVERSE;
+       if (current.velocity[0] < 0.0) orientation = Tilemap::REVERSE;
 
        Mf::Scalar coords[8];
-       tilemap_.getTileCoords(frame, coords, orientation);
+       tilemap.getTileCoords(frame, coords, orientation);
 
        Mf::Scalar s = 16.0;
 
@@ -164,14 +172,129 @@ void Character::draw(Mf::Scalar alpha) const
 }
 
 
-Mf::Tilemap& Character::getTilemap()
+bool Character::isInsideAabb(const Mf::Aabb& aabb) const
 {
-       return tilemap_;
+       // make sure the entity is fully inside the volume
+       if (!(aabb_.max[0] < aabb.max[0] &&
+                 aabb_.min[0] > aabb.min[0] &&
+                 aabb_.max[1] < aabb.max[1] &&
+                 aabb_.min[1] > aabb.min[1] &&
+                 aabb_.max[2] < aabb.max[2] &&
+                 aabb_.min[2] > aabb.min[2]))
+       {
+               return false;
+       }
+
+       return true;
 }
 
-Mf::Animation& Character::getAnimation()
+int Character::getOctant(const Mf::Aabb& aabb) const
 {
-       return animation_;
+       int octantNum = -1;
+
+       Mf::Plane::Halfspace halfspace;
+
+       Mf::Plane xy = aabb.getPlaneXY();
+       halfspace = xy.intersects(sphere_);
+       if (halfspace == Mf::Plane::INTERSECT)
+       {
+               halfspace = xy.intersects(aabb_);
+       }
+
+       if (halfspace == Mf::Plane::POSITIVE)
+       {
+               Mf::Plane xz = aabb.getPlaneXZ();
+               halfspace = xz.intersects(sphere_);
+               if (halfspace == Mf::Plane::INTERSECT)
+               {
+                       halfspace = xz.intersects(aabb_);
+               }
+
+               if (halfspace == Mf::Plane::POSITIVE)
+               {
+                       Mf::Plane yz = aabb.getPlaneYZ();
+                       halfspace = yz.intersects(sphere_);
+                       if (halfspace == Mf::Plane::INTERSECT)
+                       {
+                               halfspace = yz.intersects(aabb_);
+                       }
+
+                       if (halfspace == Mf::Plane::POSITIVE)
+                       {
+                               octantNum = 2;
+                       }
+                       else if (halfspace == Mf::Plane::NEGATIVE)
+                       {
+                               octantNum = 3;
+                       }
+               }
+               else if (halfspace == Mf::Plane::NEGATIVE)
+               {
+                       Mf::Plane yz = aabb.getPlaneYZ();
+                       halfspace = yz.intersects(sphere_);
+                       if (halfspace == Mf::Plane::INTERSECT)
+                       {
+                               halfspace = yz.intersects(aabb_);
+                       }
+
+                       if (halfspace == Mf::Plane::POSITIVE)
+                       {
+                               octantNum = 1;
+                       }
+                       else if (halfspace == Mf::Plane::NEGATIVE)
+                       {
+                               octantNum = 0;
+                       }
+               }
+       }
+       else if (halfspace == Mf::Plane::NEGATIVE)
+       {
+               Mf::Plane xz = aabb.getPlaneXZ();
+               halfspace = xz.intersects(sphere_);
+               if (halfspace == Mf::Plane::INTERSECT)
+               {
+                       halfspace = xz.intersects(aabb_);
+               }
+
+               if (halfspace == Mf::Plane::POSITIVE)
+               {
+                       Mf::Plane yz = aabb.getPlaneYZ();
+                       halfspace = yz.intersects(sphere_);
+                       if (halfspace == Mf::Plane::INTERSECT)
+                       {
+                               halfspace = yz.intersects(aabb_);
+                       }
+
+                       if (halfspace == Mf::Plane::POSITIVE)
+                       {
+                               octantNum = 6;
+                       }
+                       else if (halfspace == Mf::Plane::NEGATIVE)
+                       {
+                               octantNum = 7;
+                       }
+               }
+               else if (halfspace == Mf::Plane::NEGATIVE)
+               {
+                       Mf::Plane yz = aabb.getPlaneYZ();
+                       halfspace = yz.intersects(sphere_);
+                       if (halfspace == Mf::Plane::INTERSECT)
+                       {
+                               halfspace = yz.intersects(aabb_);
+                       }
+
+                       if (halfspace == Mf::Plane::POSITIVE)
+                       {
+                               octantNum = 5;
+                       }
+                       else if (halfspace == Mf::Plane::NEGATIVE)
+                       {
+                               octantNum = 4;
+                       }
+               }
+       }
+
+       return octantNum;
 }