X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c5d48385c8793bc71db777f4e3416bc4dabe3909;hp=a29e63d792fd50d17935f6dc1d3bb82067cc2903;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=bc2bc12125d6c223d2935557e01926fe21166e38 diff --git a/src/Character.cc b/src/Character.cc index a29e63d..c5d4838 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: - //current.force += -15.0 * x - 1.5 * current.velocity; - force = -20.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,92 +66,185 @@ Character::Character(const std::string& name) : tilemap(name), animation(name) { - current.init(); + state_.init(); - current.mass = 1.0; - current.inverseMass = 1.0 / current.mass; + state_.mass = 1.0; + state_.inverse_mass = 1.0 / state_.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(ResistanceForce(4.0)); - current.forces.push_back(Mf::LinearState<2>::GravityForce(-2000.0)); + // forces + 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 - current.position = Mf::Vector2(64.0, 64.0); - current.momentum = Mf::Vector2(0.0, 0.0); - current.recalculate(); + state_.position = moof::vector2(5.0, 5.0); + state_.momentum = moof::vector2(1.0, 0.0); + state_.recalculate(); - previous = current; + prev_state_ = state_; } -void Character::update(Mf::Scalar t, Mf::Scalar dt) +void Character::update(moof::scalar t, moof::scalar dt) { - previous = current; + moof::rigid_body2::update(t, dt); // update physics - //Mf::Vector2 x = current.position - Mf::Vector2(500.0, 200.0); - //Mf::Scalar mag = x.length(); - //Mf::Scalar d = 50.0; + animation.update(t, dt); - //// 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; + 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); - //Mf::euler(current, t, dt); + aabb_.init(a, b); + sphere_.init(center, a); - current.integrate(t, dt); - animation.update(t, dt); + 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(previous.position, current.position, alpha); + moof::state2 state = moof::rigid_body2::state(alpha); + const moof::vector2& position = state.position; - //glColor3f(1.0f, 1.0f, 1.0f); - tilemap.bind(); + const moof::scalar s = 0.5; - Tilemap::Index frame = animation.getFrame(); + moof::vector3 coords[4]; - Tilemap::Orientation orientation = Tilemap::NORMAL; + 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)); - if (current.velocity[0] < 0.0) orientation = Tilemap::REVERSE; + tilemap.draw(coords); +} - Mf::Scalar coords[8]; - tilemap.getTileCoords(frame, coords, orientation); - Mf::Scalar s = 16.0; +/*int Character::getOctant(const moof::Aabb<3>& aabb) const +{ + int octantNum = -1; - 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::plane::halfspace halfspace; - //glColor3f(0.0f, 0.0f, 0.0f); - Mf::Texture::resetBind(); + moof::plane xy = aabb.xy_plane(); + halfspace = xy.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = xy.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + moof::plane xz = aabb.xz_plane(); + halfspace = xz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = xz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = yz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + octantNum = 2; + } + else if (halfspace == moof::plane::negative) + { + octantNum = 3; + } + } + else if (halfspace == moof::plane::negative) + { + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = yz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + octantNum = 1; + } + else if (halfspace == moof::plane::negative) + { + octantNum = 0; + } + } + } + else if (halfspace == moof::plane::negative) + { + moof::plane xz = aabb.xz_plane(); + halfspace = xz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = xz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = yz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + octantNum = 6; + } + else if (halfspace == moof::plane::negative) + { + octantNum = 7; + } + } + else if (halfspace == moof::plane::negative) + { + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = yz.intersects(aabb_); + } + + if (halfspace == moof::plane::positive) + { + octantNum = 5; + } + else if (halfspace == moof::plane::negative) + { + octantNum = 4; + } + } + } + + return octantNum; +} +*/ - 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); +void Character::addImpulse(moof::vector2 impulse) +{ + state_.momentum += impulse; } +void Character::addForce(moof::vector2 force) +{ + state_.force += force; +} -/** vim: set ts=4 sw=4 tw=80: *************************************************/ +void Character::setPosition(moof::vector2 position) +{ + state_.position = position; +}