X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FCharacter.cc;h=f12ed5f2d88f66935f5b3923fd0d1f7b57632f9e;hb=bffc879fc8ee8167bb123310d39fad4e2f426ffd;hp=1b184fa2d0160ad353ef3645823d25626397b3cf;hpb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;p=chaz%2Fyoink diff --git a/src/Character.cc b/src/Character.cc index 1b184fa..f12ed5f 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -32,141 +32,238 @@ #include "Log.hh" -Character::Character(const std::string& name) : - tilemap_(name), - animation_(name) +struct SpringForce { - current.mass = 1.0; - current.inverseMass = 1.0 / current.mass; + 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; - current.force = Mf::Vector2(0.0, -120.0); + // spring: + //mState.force += -15.0 * x - 1.5 * mState.velocity; + force = SCALAR(-10.0) * (mag - d) * (x / mag) - 2.0 * state.velocity; - current.position = Mf::Vector2(64.0, 64.0); - current.momentum = Mf::Vector2(0.0, 0.0); - current.recalculate(); + return force; + } - previous = current; +private: - updateContainers(); -} + Mf::Vector2 force; + Mf::Vector2 location; +}; -Character::~Character() +struct ResistanceForce { - //delete texture; - //delete anim; -} + explicit ResistanceForce(Mf::Scalar scale = 1.0) : + k(scale) {} + const Mf::Vector2& operator () (const Mf::LinearState<2>& state) + { + force = -k * state.velocity; + return force; + } -void Character::update(Mf::Scalar t, Mf::Scalar dt) -{ - previous = current; - Mf::integrate(current, t, dt); +private: - animation_.update(t, dt); + Mf::Vector2 force; + Mf::Scalar k; +}; - updateContainers(); -} -void Character::updateContainers() +Character::Character(const std::string& name) : + tilemap(name), + animation(name) { - aabb_.init(Mf::Vector3(current.position[0]-16.0, current.position[1]-16.0, z), - Mf::Vector3(current.position[0]+16.0, current.position[1]+16.0, z)); - sphere_.point = Mf::Vector3(current.position[0], current.position[1], z); - sphere_.radius = (aabb_.min - sphere_.point).length(); + mState.init(); + + 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(-100.0)); + + // starting position + mState.position = Mf::Vector2(64.0, 64.0); + mState.momentum = Mf::Vector2(0.0, 0.0); + mState.recalculate(); + + mPrevState = mState; } -void Character::handleEvent(const Mf::Event& event) + +void Character::update(Mf::Scalar t, Mf::Scalar dt) { - // really just for heroine... - - Mf::Scalar force = 500.0; - - Mf::Vector2 left = Mf::Vector2(-force, 0.0); - Mf::Vector2 right = Mf::Vector2(force, 0.0); - Mf::Vector2 down = Mf::Vector2(0.0, -force); - Mf::Vector2 up = Mf::Vector2(0.0, force); + Mf::RigidBody2::update(t, dt); // update physics - switch (event.type) - { - case SDL_KEYDOWN: - if (event.key.keysym.sym == SDLK_a) - { - current.force += left; - } - else if (event.key.keysym.sym == SDLK_d) - { - current.force += right; - } - else if (event.key.keysym.sym == SDLK_s) - { - current.force += down; - } - else if (event.key.keysym.sym == SDLK_w) - { - current.force += up; - } - break; + animation.update(t, dt); - case SDL_KEYUP: - if (event.key.keysym.sym == SDLK_a) - { - current.force -= left; - } - else if (event.key.keysym.sym == SDLK_d) - { - current.force -= right; - } - else if (event.key.keysym.sym == SDLK_s) - { - current.force -= down; - } - else if (event.key.keysym.sym == SDLK_w) - { - current.force -= up; - } - break; - } + Mf::Vector3 center(mState.position[0], mState.position[1], z); + Mf::Vector3 a(mState.position[0] - 16.0, mState.position[1] - 16.0, z); + Mf::Vector3 b(mState.position[0] + 16.0, mState.position[1] + 16.0, z); - //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]); - //std::cerr << "current force: " << current.force << std::endl; + 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::Index frame = animation.getFrame(); - glColor3f(1.0f, 1.0f, 1.0f); - tilemap_.bind(); + Tilemap::Orientation orientation = Tilemap::NORMAL; - Mf::Tilemap::Index frame = animation_.getFrame(); + if (mState.velocity[0] < 0.0) orientation = Tilemap::REVERSE; Mf::Scalar coords[8]; - tilemap_.getTileCoords(frame, coords); + tilemap.getTileCoords(frame, coords, orientation); Mf::Scalar s = 16.0; glBegin(GL_TRIANGLE_FAN); glTexCoord2f(coords[0], coords[1]); - glVertex3(state.position[0]-s, state.position[1]-s, z); + glVertex3(position[0]-s, position[1]-s, z); glTexCoord2f(coords[2], coords[3]); - glVertex3(state.position[0]+s, state.position[1]-s, z); + glVertex3(position[0]+s, position[1]-s, z); glTexCoord2f(coords[4], coords[5]); - glVertex3(state.position[0]+s, state.position[1]+s, z); + glVertex3(position[0]+s, position[1]+s, z); glTexCoord2f(coords[6], coords[7]); - glVertex3(state.position[0]-s, state.position[1]+s, z); + glVertex3(position[0]-s, position[1]+s, z); glEnd(); -} + //glColor3f(0.0f, 0.0f, 0.0f); + Mf::Texture::resetBind(); -Mf::Tilemap& Character::getTilemap() -{ - return tilemap_; + 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); } -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(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; }