X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=e0ce1c05c016afa66b9ff4612f125808bc2cade4;hp=8e5a4c65e7437ca4f80a8614a8b17c5f1c087454;hb=64bd443538f57ad1bdff6c6b35953e72141129b2;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c diff --git a/src/Character.cc b/src/Character.cc index 8e5a4c6..e0ce1c0 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -32,15 +32,62 @@ #include "Log.hh" +struct SpringForce +{ + 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: + //current.force += -15.0 * x - 1.5 * current.velocity; + force = -20.0 * (mag - d) * (x / mag) - 2.0 * state.velocity; + + return force; + } + +private: + + Mf::Vector2 force; + Mf::Vector2 location; +}; + +struct ResistanceForce +{ + 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.init(); + current.mass = 1.0; current.inverseMass = 1.0 / current.mass; - // gravity - current.force = Mf::Vector2(0.0, -120.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(ResistanceForce(2.0)); + current.forces.push_back(Mf::LinearState<2>::GravityForce(-1000.0)); // starting position current.position = Mf::Vector2(64.0, 64.0); @@ -48,8 +95,6 @@ Character::Character(const std::string& name) : current.recalculate(); previous = current; - - //updateContainers(); } @@ -57,60 +102,61 @@ 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; - - current.force = Mf::Vector2(0.0, -2000.0); - //current.force += -15.0 * x - 1.5 * current.velocity; - current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity; - current.force += userForce; - current.recalculate(); + //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::integrate(current, t, dt); + //Mf::euler(current, t, dt); - animation_.update(t, dt); + current.integrate(t, dt); + animation.update(t, dt); - //updateContainers(); -} + 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); -//void Character::updateContainers() -//{ - //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(); -//} + aabb_.init(a, b); + sphere_.init(center, a); +} void Character::draw(Mf::Scalar alpha) const { - State state = cml::lerp(previous, current, alpha); + 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; 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); @@ -126,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; }