X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c5d48385c8793bc71db777f4e3416bc4dabe3909;hp=ac5f8bcb6693349b44679613279465f36fdd7546;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=25aefe01ef7dbdb603c51411e04b0d6a6107684f diff --git a/src/Character.cc b/src/Character.cc index ac5f8bc..c5d4838 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -1,191 +1,250 @@ -/******************************************************************************* - - 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" +class SpringForce +{ +public: + + explicit SpringForce(moof::vector2 x) : + location(x) {} + + const moof::vector2& operator () (const moof::linear_state<2>& state) + { + moof::vector2 x = state.position - location; + moof::scalar mag = x.length(); + moof::scalar d = 0.0; + + // spring: + //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: + + moof::vector2 force; + moof::vector2 location; +}; + +class ResistanceForce +{ +public: + + explicit ResistanceForce(moof::scalar scale = 1.0) : + k(scale) {} + + const moof::vector2& operator () (const moof::linear_state<2>& state) + { + force = -k * state.velocity; + return force; + } + +private: + + moof::vector2 force; + moof::scalar k; +}; + + Character::Character(const std::string& name) : - tilemap_(name), - animation_(name) + tilemap(name), + animation(name) { - current.mass = 1.0; - current.inverseMass = 1.0 / current.mass; + state_.init(); - // gravity - current.force = Mf::Vector2(0.0, -120.0); + state_.mass = 1.0; + state_.inverse_mass = 1.0 / state_.mass; - // starting position - current.position = Mf::Vector2(64.0, 64.0); - current.momentum = Mf::Vector2(0.0, 0.0); - current.recalculate(); + // 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)); - previous = current; + // starting position + state_.position = moof::vector2(5.0, 5.0); + state_.momentum = moof::vector2(1.0, 0.0); + state_.recalculate(); - updateContainers(); + prev_state_ = state_; } -void Character::update(Mf::Scalar t, Mf::Scalar dt) +void Character::update(moof::scalar t, moof::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; + moof::rigid_body2::update(t, dt); // update physics - current.force = -5 * (current.position - Mf::Vector2(500.0, 200.0)) - - 2.0 * current.velocity; - current.recalculate(); - std::cout << "force: " << current.momentum << std::endl; + animation.update(t, dt); - Mf::integrate(current, t, dt); + 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); - animation_.update(t, dt); + aabb_.init(a, b); + sphere_.init(center, a); - updateContainers(); + int frame = animation.getFrame(); + tilemap.tile(frame); } -void Character::updateContainers() + +void Character::draw(moof::scalar alpha) const { - 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(); + moof::state2 state = moof::rigid_body2::state(alpha); + const moof::vector2& position = state.position; + + const moof::scalar s = 0.5; + + moof::vector3 coords[4]; + + 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)); + + tilemap.draw(coords); } -void Character::handleEvent(const Mf::Event& event) + +/*int Character::getOctant(const moof::Aabb<3>& aabb) const { - // 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); + int octantNum = -1; + + moof::plane::halfspace halfspace; + + moof::plane xy = aabb.xy_plane(); + halfspace = xy.intersects(sphere_); + if (halfspace == moof::plane::intersecting) + { + halfspace = xy.intersects(aabb_); + } - switch (event.type) + if (halfspace == moof::plane::positive) { - case SDL_KEYDOWN: - if (event.key.keysym.sym == SDLK_a) + 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) { - userForce += left; + halfspace = yz.intersects(aabb_); } - else if (event.key.keysym.sym == SDLK_d) + + if (halfspace == moof::plane::positive) { - userForce += right; + octantNum = 2; } - else if (event.key.keysym.sym == SDLK_s) + else if (halfspace == moof::plane::negative) { - userForce += down; + octantNum = 3; } - else if (event.key.keysym.sym == SDLK_w) + } + else if (halfspace == moof::plane::negative) + { + moof::plane yz = aabb.yz_plane(); + halfspace = yz.intersects(sphere_); + if (halfspace == moof::plane::intersecting) { - userForce += up; + halfspace = yz.intersects(aabb_); } - break; - case SDL_KEYUP: - if (event.key.keysym.sym == SDLK_a) + if (halfspace == moof::plane::positive) { - userForce -= left; + octantNum = 1; } - else if (event.key.keysym.sym == SDLK_d) + else if (halfspace == moof::plane::negative) { - userForce -= right; + octantNum = 0; } - else if (event.key.keysym.sym == SDLK_s) + } + } + 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) { - userForce -= down; + halfspace = yz.intersects(aabb_); } - else if (event.key.keysym.sym == SDLK_w) + + if (halfspace == moof::plane::positive) + { + octantNum = 6; + } + else if (halfspace == moof::plane::negative) { - userForce -= up; + octantNum = 7; } - break; + } + 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; + } + } } - //Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]); - //std::cerr << "current force: " << current.force << std::endl; + return octantNum; } +*/ -void Character::draw(Mf::Scalar alpha) const +void Character::addImpulse(moof::vector2 impulse) { - State state = cml::lerp(previous, current, alpha); - - glColor3f(1.0f, 1.0f, 1.0f); - tilemap_.bind(); - - Mf::Tilemap::Index frame = animation_.getFrame(); - - Mf::Scalar coords[8]; - tilemap_.getTileCoords(frame, coords); - - Mf::Scalar s = 16.0; - - glBegin(GL_TRIANGLE_FAN); - glTexCoord2f(coords[0], coords[1]); - glVertex3(state.position[0]-s, state.position[1]-s, z); - glTexCoord2f(coords[2], coords[3]); - glVertex3(state.position[0]+s, state.position[1]-s, z); - glTexCoord2f(coords[4], coords[5]); - glVertex3(state.position[0]+s, state.position[1]+s, z); - glTexCoord2f(coords[6], coords[7]); - glVertex3(state.position[0]-s, state.position[1]+s, z); - glEnd(); - - glColor3f(0.0f, 0.0f, 0.0f); - Mf::Texture::resetBind(); - - 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); + state_.momentum += impulse; } - -Mf::Tilemap& Character::getTilemap() +void Character::addForce(moof::vector2 force) { - return tilemap_; + state_.force += force; } -Mf::Animation& Character::getAnimation() +void Character::setPosition(moof::vector2 position) { - return animation_; + state_.position = position; } - -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -