X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=3022c31acc7f1f9d2d060c10dc917ae7a0327924;hp=e0ce1c05c016afa66b9ff4612f125808bc2cade4;hb=71bd9dbaf1c1e3c55a9f63392a73865d8aeee7d4;hpb=64bd443538f57ad1bdff6c6b35953e72141129b2 diff --git a/src/Character.cc b/src/Character.cc index e0ce1c0..3022c31 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -32,8 +32,10 @@ #include "Log.hh" -struct SpringForce +class SpringForce { +public: + explicit SpringForce(Mf::Vector2 x) : location(x) {} @@ -44,8 +46,8 @@ struct SpringForce Mf::Scalar d = 50.0; // spring: - //current.force += -15.0 * x - 1.5 * current.velocity; - force = -20.0 * (mag - d) * (x / mag) - 2.0 * state.velocity; + //mState.force += -15.0 * x - 1.5 * mState.velocity; + force = SCALAR(-10.0) * (mag - d) * (x / mag) - 2.0 * state.velocity; return force; } @@ -56,8 +58,10 @@ private: Mf::Vector2 location; }; -struct ResistanceForce +class ResistanceForce { +public: + explicit ResistanceForce(Mf::Scalar scale = 1.0) : k(scale) {} @@ -78,61 +82,46 @@ Character::Character(const std::string& name) : tilemap(name), animation(name) { - current.init(); + mState.init(); - current.mass = 1.0; - current.inverseMass = 1.0 / current.mass; + mState.mass = 1.0; + mState.inverseMass = 1.0 / mState.mass; // forces - current.force = Mf::Vector2(0.0, 0.0); - current.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0))); - current.forces.push_back(ResistanceForce(2.0)); - current.forces.push_back(Mf::LinearState<2>::GravityForce(-1000.0)); + 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; - - //// 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; + Mf::RigidBody2::update(t, dt); // update physics - //Mf::euler(current, t, dt); - - current.integrate(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); + 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); - aabb_.init(a, b); - sphere_.init(center, a); + mAabb.init(a, b); + mSphere.init(center, a); } void Character::draw(Mf::Scalar alpha) const { - Mf::Vector2 position = cml::lerp(previous.position, current.position, 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(); @@ -141,82 +130,60 @@ void Character::draw(Mf::Scalar alpha) const Tilemap::Orientation orientation = Tilemap::NORMAL; - if (current.velocity[0] < 0.0) orientation = Tilemap::REVERSE; + if (mState.velocity[0] < 0.0) orientation = Tilemap::REVERSE; Mf::Scalar coords[8]; 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(position[0]-s, position[1]-s, z); - glTexCoord2f(coords[2], coords[3]); - glVertex3(position[0]+s, position[1]-s, z); - glTexCoord2f(coords[4], coords[5]); - glVertex3(position[0]+s, position[1]+s, z); - glTexCoord2f(coords[6], coords[7]); - glVertex3(position[0]-s, 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(); - - 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); } - -bool Character::isInsideAabb(const Mf::Aabb& aabb) const +void Character::setZCoord(Mf::Scalar z) { - // 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; + mZCoord = z; } -int Character::getOctant(const Mf::Aabb& aabb) const + +int Character::getOctant(const Mf::Aabb<3>& aabb) const { int octantNum = -1; Mf::Plane::Halfspace halfspace; Mf::Plane xy = aabb.getPlaneXY(); - halfspace = xy.intersects(sphere_); + halfspace = xy.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = xy.intersects(aabb_); + halfspace = xy.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) { Mf::Plane xz = aabb.getPlaneXZ(); - halfspace = xz.intersects(sphere_); + halfspace = xz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = xz.intersects(aabb_); + halfspace = xz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) { Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(sphere_); + halfspace = yz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = yz.intersects(aabb_); + halfspace = yz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) @@ -231,10 +198,10 @@ int Character::getOctant(const Mf::Aabb& aabb) const else if (halfspace == Mf::Plane::NEGATIVE) { Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(sphere_); + halfspace = yz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = yz.intersects(aabb_); + halfspace = yz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) @@ -250,19 +217,19 @@ int Character::getOctant(const Mf::Aabb& aabb) const else if (halfspace == Mf::Plane::NEGATIVE) { Mf::Plane xz = aabb.getPlaneXZ(); - halfspace = xz.intersects(sphere_); + halfspace = xz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = xz.intersects(aabb_); + halfspace = xz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) { Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(sphere_); + halfspace = yz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = yz.intersects(aabb_); + halfspace = yz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) @@ -277,10 +244,10 @@ int Character::getOctant(const Mf::Aabb& aabb) const else if (halfspace == Mf::Plane::NEGATIVE) { Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(sphere_); + halfspace = yz.intersects(mSphere); if (halfspace == Mf::Plane::INTERSECT) { - halfspace = yz.intersects(aabb_); + halfspace = yz.intersects(mAabb); } if (halfspace == Mf::Plane::POSITIVE) @@ -298,5 +265,21 @@ int Character::getOctant(const Mf::Aabb& aabb) const } +void Character::addImpulse(Mf::Vector2 impulse) +{ + mState.momentum += impulse; +} + +void Character::addForce(Mf::Vector2 force) +{ + mState.force += force; +} + +void Character::setPosition(Mf::Vector2 position) +{ + mState.position = position; +} + + /** vim: set ts=4 sw=4 tw=80: *************************************************/