X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c5d48385c8793bc71db777f4e3416bc4dabe3909;hp=64866c5eba907b172d3bb1847f65573ff22c0c41;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=7d15b919681bb9ec0088b4b27c6abf62d6dfb9b1 diff --git a/src/Character.cc b/src/Character.cc index 64866c5..c5d4838 100644 --- a/src/Character.cc +++ b/src/Character.cc @@ -1,57 +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" +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) : - texture(name), - anim(name) {} + tilemap(name), + animation(name) +{ + state_.init(); + + state_.mass = 1.0; + state_.inverse_mass = 1.0 / state_.mass; -Character::~Character() + // 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 + state_.position = moof::vector2(5.0, 5.0); + state_.momentum = moof::vector2(1.0, 0.0); + state_.recalculate(); + + prev_state_ = state_; +} + + +void Character::update(moof::scalar t, moof::scalar dt) { - //delete texture; - //delete anim; + moof::rigid_body2::update(t, dt); // update physics + + animation.update(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); + + aabb_.init(a, b); + sphere_.init(center, a); + + int frame = animation.getFrame(); + tilemap.tile(frame); } -void Character::draw(dc::scalar alpha) {} +void Character::draw(moof::scalar alpha) const +{ + 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)); -dc::tilemap& Character::getTilemap() + tilemap.draw(coords); +} + + +/*int Character::getOctant(const moof::Aabb<3>& aabb) const { - return texture; + 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_); + } + + 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; } +*/ + -dc::animation& Character::getAnimation() +void Character::addImpulse(moof::vector2 impulse) { - return anim; + 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; +}