#include "Log.hh"
+class SpringForce
+{
+public:
+
+ explicit SpringForce(Mf::Vector2 x) :
+ location(x) {}
+
+ const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
+ {
+ Mf::Vector2 x = state.position - location;
+ Mf::Scalar mag = x.length();
+ Mf::Scalar d = 50.0;
+
+ // spring:
+ //mState.force += -15.0 * x - 1.5 * mState.velocity;
+ force = SCALAR(-10.0) * (mag - d) * (x / mag) - 2.0 * state.velocity;
+
+ return force;
+ }
+
+private:
+
+ Mf::Vector2 force;
+ Mf::Vector2 location;
+};
+
+class ResistanceForce
+{
+public:
+
+ explicit ResistanceForce(Mf::Scalar scale = 1.0) :
+ k(scale) {}
+
+ const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
+ {
+ force = -k * state.velocity;
+ return force;
+ }
+
+private:
+
+ Mf::Vector2 force;
+ Mf::Scalar k;
+};
+
+
Character::Character(const std::string& name) :
- tilemap_(name),
- animation_(name)
+ tilemap(name),
+ animation(name)
{
- current.mass = 1.0;
- current.inverseMass = 1.0 / current.mass;
+ mState.init();
- // gravity
- current.force = Mf::Vector2(0.0, -120.0);
+ mState.mass = 1.0;
+ mState.inverseMass = 1.0 / mState.mass;
+
+ // forces
+ mState.force = Mf::Vector2(0.0, 0.0);
+ //mState.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0)));
+ mState.forces.push_back(ResistanceForce(2.0));
+ //mState.forces.push_back(Mf::LinearState<2>::GravityForce(-400.0));
// starting position
- current.position = Mf::Vector2(64.0, 64.0);
- current.momentum = Mf::Vector2(0.0, 0.0);
- current.recalculate();
+ mState.position = Mf::Vector2(5.0, 5.0);
+ mState.momentum = Mf::Vector2(0.0, 0.0);
+ mState.recalculate();
- previous = current;
+ mPrevState = mState;
}
void Character::update(Mf::Scalar t, Mf::Scalar dt)
{
- previous = current;
-
- Mf::Vector2 x = current.position - Mf::Vector2(500.0, 200.0);
- Mf::Scalar mag = x.length();
- Mf::Scalar d = 50.0;
+ Mf::RigidBody2::update(t, dt); // update physics
- // gravity:
- current.force = Mf::Vector2(0.0, -2000.0);
- // spring:
- //current.force += -15.0 * x - 1.5 * current.velocity;
- current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity;
- // internal:
- current.force += userForce;
- current.recalculate();
- //std::cout << "force: " << current.momentum << std::endl;
+ animation.update(t, dt);
- Mf::euler<State,Derivative>(current, t, dt);
+ Mf::Vector3 center(mState.position[0], mState.position[1], mZCoord);
+ Mf::Vector3 a(mState.position[0] - 0.5, mState.position[1] - 0.5, mZCoord);
+ Mf::Vector3 b(mState.position[0] + 0.5, mState.position[1] + 0.5, mZCoord);
- animation_.update(t, dt);
+ mAabb.init(a, b);
+ mSphere.init(center, a);
}
void Character::draw(Mf::Scalar alpha) const
{
- State state = cml::lerp(previous, current, alpha);
+ //Mf::Vector2 position = cml::lerp(mPrevState.position, mState.position, alpha);
+ Mf::State2 state = getState(alpha);
+ Mf::Vector2 position = state.position;
//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 (mState.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;
+ Mf::Scalar s = 0.5;
glBegin(GL_TRIANGLE_FAN);
- glTexCoord2f(coords[0], coords[1]);
- glVertex3(state.position[0]-s, state.position[1]-s, z);
- glTexCoord2f(coords[2], coords[3]);
- glVertex3(state.position[0]+s, state.position[1]-s, z);
- glTexCoord2f(coords[4], coords[5]);
- glVertex3(state.position[0]+s, state.position[1]+s, z);
- glTexCoord2f(coords[6], coords[7]);
- glVertex3(state.position[0]-s, state.position[1]+s, z);
+ glTexCoord(coords[0], coords[1]);
+ glVertex(position[0]-s, position[1]-s, mZCoord);
+ glTexCoord(coords[2], coords[3]);
+ glVertex(position[0]+s, position[1]-s, mZCoord);
+ glTexCoord(coords[4], coords[5]);
+ glVertex(position[0]+s, position[1]+s, mZCoord);
+ glTexCoord(coords[6], coords[7]);
+ glVertex(position[0]-s, position[1]+s, mZCoord);
glEnd();
+}
- //glColor3f(0.0f, 0.0f, 0.0f);
- Mf::Texture::resetBind();
+void Character::setZCoord(Mf::Scalar z)
+{
+ mZCoord = z;
+}
- glBegin(GL_TRIANGLES);
- glVertex3(480.0, 190.0, 64.0);
- glVertex3(520.0, 190.0, 64.0);
- glVertex3(500.0, 210.0, 64.0);
- glEnd();
- //glColor3f(1.0f, 1.0f, 1.0f);
+int Character::getOctant(const Mf::Aabb<3>& aabb) const
+{
+ int octantNum = -1;
+
+ Mf::Plane::Halfspace halfspace;
+
+ Mf::Plane xy = aabb.getPlaneXY();
+ halfspace = xy.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = xy.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane xz = aabb.getPlaneXZ();
+ halfspace = xz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = xz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = yz.intersects(mAabb);
+ }
+
+ 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(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = yz.intersects(mAabb);
+ }
+
+ 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(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = xz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = yz.intersects(mAabb);
+ }
+
+ 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(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = yz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ octantNum = 5;
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
+ {
+ octantNum = 4;
+ }
+ }
+ }
+
+ return octantNum;
}
-Mf::Tilemap& Character::getTilemap()
+void Character::addImpulse(Mf::Vector2 impulse)
+{
+ mState.momentum += impulse;
+}
+
+void Character::addForce(Mf::Vector2 force)
{
- return tilemap_;
+ mState.force += force;
}
-Mf::Animation& Character::getAnimation()
+void Character::setPosition(Mf::Vector2 position)
{
- return animation_;
+ mState.position = position;
}
projects / chaz / yoink / blobdiff