X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FCharacter.cc;h=f12ed5f2d88f66935f5b3923fd0d1f7b57632f9e;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hp=b26f2d4f06b2432da563d7c791594d26ecdc6530;hpb=23d8f7a5fbd1eca7f46f2342c20ac5e28ae0128a;p=chaz%2Fyoink diff --git a/src/Character.cc b/src/Character.cc index b26f2d4..f12ed5f 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -44,8 +44,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,17 +56,21 @@ 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; }; @@ -74,57 +78,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; - // gravity - current.force = Mf::Vector2(0.0, 000.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)); + // 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 - current.position = Mf::Vector2(64.0, 64.0); - current.momentum = Mf::Vector2(0.0, 0.0); - current.recalculate(); + mState.position = Mf::Vector2(64.0, 64.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; - - //Mf::euler(current, t, dt); + animation.update(t, dt); - //current.force = Mf::Vector2(0.0, -2000.0); - current.force = userForce; - current.integrate(t, dt); + 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); - animation.update(t, dt); + 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(); @@ -133,7 +126,7 @@ 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); @@ -164,5 +157,115 @@ void Character::draw(Mf::Scalar alpha) const } +int Character::getOctant(const Mf::Aabb& 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; +} + + /** vim: set ts=4 sw=4 tw=80: *************************************************/