X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=3cae68009e4b998bf8b4b823538204bf6c803a66;hp=f12ed5f2d88f66935f5b3923fd0d1f7b57632f9e;hb=e9a16d767785b1a903a4466ff26265a5f7dae9e5;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f diff --git a/src/Character.cc b/src/Character.cc index f12ed5f..3cae680 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -1,67 +1,55 @@ -/******************************************************************************* - - Copyright (c) 2009, Charles McGarvey - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*******************************************************************************/ +/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +**] All rights reserved. +* +* vi:ts=4 sw=4 tw=75 +* +* Distributable under the terms and conditions of the 2-clause BSD license; +* see the file COPYING for a complete text of the license. +* +**************************************************************************/ #include +#include + #include "Character.hh" -#include "Log.hh" -struct SpringForce +class SpringForce { - explicit SpringForce(Mf::Vector2 x) : +public: + + explicit SpringForce(moof::vector2 x) : location(x) {} - const Mf::Vector2& operator () (const Mf::LinearState<2>& state) + const moof::vector2& operator () (const moof::linear_state<2>& state) { - Mf::Vector2 x = state.position - location; - Mf::Scalar mag = x.length(); - Mf::Scalar d = 50.0; + moof::vector2 x = state.position - location; + moof::scalar mag = x.length(); + moof::scalar d = 0.0; // spring: - //mState.force += -15.0 * x - 1.5 * mState.velocity; - force = SCALAR(-10.0) * (mag - d) * (x / mag) - 2.0 * state.velocity; + //state_.force += -15.0 * x - 1.5 * state_.velocity; + force = SCALAR(-10.0) * (mag - d) * (x / mag);// - SCALAR(2.0) * state.velocity; return force; } private: - Mf::Vector2 force; - Mf::Vector2 location; + moof::vector2 force; + moof::vector2 location; }; -struct ResistanceForce +class ResistanceForce { - explicit ResistanceForce(Mf::Scalar scale = 1.0) : +public: + + explicit ResistanceForce(moof::scalar scale = 1.0) : k(scale) {} - const Mf::Vector2& operator () (const Mf::LinearState<2>& state) + const moof::vector2& operator () (const moof::linear_state<2>& state) { force = -k * state.velocity; return force; @@ -69,8 +57,8 @@ struct ResistanceForce private: - Mf::Vector2 force; - Mf::Scalar k; + moof::vector2 force; + moof::scalar k; }; @@ -78,185 +66,162 @@ Character::Character(const std::string& name) : tilemap(name), animation(name) { - mState.init(); + state_.init(); - mState.mass = 1.0; - mState.inverseMass = 1.0 / mState.mass; + state_.mass = 1.0; + state_.inverse_mass = 1.0 / state_.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)); + state_.force = moof::vector2(0.0, 0.0); + //state_.forces.push_back(SpringForce(moof::vector2(5.0, 4.0))); + //state_.forces.push_back(ResistanceForce(2.0)); + //state_.forces.push_back(moof::linear_state<2>::gravity_force(-9.8)); // starting position - mState.position = Mf::Vector2(64.0, 64.0); - mState.momentum = Mf::Vector2(0.0, 0.0); - mState.recalculate(); + state_.position = moof::vector2(5.0, 5.0); + state_.momentum = moof::vector2(3.0, 0.0); + state_.recalculate(); - mPrevState = mState; + prev_state_ = state_; } -void Character::update(Mf::Scalar t, Mf::Scalar dt) +void Character::update(moof::scalar t, moof::scalar dt) { - Mf::RigidBody2::update(t, dt); // update physics + moof::rigid_body2::update(t, dt); // update physics animation.update(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); + moof::vector3 center(state_.position[0], state_.position[1], 0.0); + moof::vector3 a(state_.position[0] - 0.5, state_.position[1] - 0.5, 0.0); + moof::vector3 b(state_.position[0] + 0.5, state_.position[1] + 0.5, 0.0); - mAabb.init(a, b); - mSphere.init(center, a); + aabb_.init(a, b); + sphere_.init(center, a); + + int frame = animation.getFrame(); + tilemap.tile(frame); } -void Character::draw(Mf::Scalar alpha) const +void Character::draw(moof::scalar alpha) const { - //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(); - - Tilemap::Orientation orientation = Tilemap::NORMAL; - - if (mState.velocity[0] < 0.0) orientation = Tilemap::REVERSE; - - Mf::Scalar coords[8]; - tilemap.getTileCoords(frame, coords, orientation); + moof::state2 state = moof::rigid_body2::state(alpha); + const moof::vector2& position = state.position; - Mf::Scalar s = 16.0; + const moof::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); - glEnd(); + moof::vector3 coords[4]; - //glColor3f(0.0f, 0.0f, 0.0f); - Mf::Texture::resetBind(); + coords[0] = moof::vector3(position[0] - s, position[1] - s, SCALAR(0.0)); + coords[1] = moof::vector3(position[0] + s, position[1] - s, SCALAR(0.0)); + coords[2] = moof::vector3(position[0] + s, position[1] + s, SCALAR(0.0)); + coords[3] = moof::vector3(position[0] - s, position[1] + s, SCALAR(0.0)); - 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); + tilemap.draw(coords); } -int Character::getOctant(const Mf::Aabb& aabb) const +/*int Character::getOctant(const moof::Aabb<3>& aabb) const { int octantNum = -1; - Mf::Plane::Halfspace halfspace; + moof::plane::halfspace halfspace; - Mf::Plane xy = aabb.getPlaneXY(); - halfspace = xy.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane xy = aabb.xy_plane(); + halfspace = xy.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = xy.intersects(mAabb); + halfspace = xy.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { - Mf::Plane xz = aabb.getPlaneXZ(); - halfspace = xz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane xz = aabb.xz_plane(); + halfspace = xz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = xz.intersects(mAabb); + halfspace = xz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { - Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = yz.intersects(mAabb); + halfspace = yz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { octantNum = 2; } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { octantNum = 3; } } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { - Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = yz.intersects(mAabb); + halfspace = yz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { octantNum = 1; } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { octantNum = 0; } } } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { - Mf::Plane xz = aabb.getPlaneXZ(); - halfspace = xz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane xz = aabb.xz_plane(); + halfspace = xz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = xz.intersects(mAabb); + halfspace = xz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { - Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = yz.intersects(mAabb); + halfspace = yz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { octantNum = 6; } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { octantNum = 7; } } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { - Mf::Plane yz = aabb.getPlaneYZ(); - halfspace = yz.intersects(mSphere); - if (halfspace == Mf::Plane::INTERSECT) + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - halfspace = yz.intersects(mAabb); + halfspace = yz.intersects(aabb_); } - if (halfspace == Mf::Plane::POSITIVE) + if (halfspace == moof::plane::positive) { octantNum = 5; } - else if (halfspace == Mf::Plane::NEGATIVE) + else if (halfspace == moof::plane::negative) { octantNum = 4; } @@ -265,7 +230,21 @@ int Character::getOctant(const Mf::Aabb& aabb) const return octantNum; } +*/ -/** vim: set ts=4 sw=4 tw=80: *************************************************/ +void Character::addImpulse(moof::vector2 impulse) +{ + state_.momentum += impulse; +} + +void Character::addForce(moof::vector2 force) +{ + state_.force += force; +} + +void Character::setPosition(moof::vector2 position) +{ + state_.position = position; +}