-/*******************************************************************************
-
- 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 <iostream>
#include "Log.hh"
-Character::Character(const std::string& name) :
- tilemap_(name),
- animation_(name)
+class SpringForce
{
- current.mass = 1.0;
- current.inverseMass = 1.0 / current.mass;
+public:
- current.force = Mf::Vector2(0.0, -120.0);
+ explicit SpringForce(Mf::Vector2 x) :
+ location(x) {}
- current.position = Mf::Vector2(64.0, 64.0);
- current.momentum = Mf::Vector2(0.0, 0.0);
- current.recalculate();
+ const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
+ {
+ Mf::Vector2 x = state.position - location;
+ Mf::Scalar mag = x.length();
+ Mf::Scalar d = 0.0;
- previous = current;
+ // spring:
+ //mState.force += -15.0 * x - 1.5 * mState.velocity;
+ force = SCALAR(-10.0) * (mag - d) * (x / mag);// - SCALAR(2.0) * state.velocity;
- updateContainers();
-}
+ return force;
+ }
+
+private:
+
+ Mf::Vector2 force;
+ Mf::Vector2 location;
+};
+
+class ResistanceForce
+{
+public:
-Character::~Character()
+ 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)
{
- //delete texture;
- //delete anim;
+ mState.init();
+
+ mState.mass = 1.0;
+ mState.inverseMass = 1.0 / mState.mass;
+
+ // forces
+ mState.force = Mf::Vector2(0.0, 0.0);
+ //mState.forces.push_back(SpringForce(Mf::Vector2(5.0, 4.0)));
+ //mState.forces.push_back(ResistanceForce(2.0));
+ //mState.forces.push_back(Mf::LinearState<2>::GravityForce(-9.8));
+
+ // starting position
+ mState.position = Mf::Vector2(5.0, 5.0);
+ mState.momentum = Mf::Vector2(0.0, 0.0);
+ mState.recalculate();
+
+ mPrevState = mState;
}
void Character::update(Mf::Scalar t, Mf::Scalar dt)
{
- previous = current;
- Mf::integrate<State,Derivative>(current, t, dt);
+ Mf::RigidBody2::update(t, dt); // update physics
- animation_.update(t, dt);
+ animation.update(t, dt);
- updateContainers();
+ Mf::Vector3 center(mState.position[0], mState.position[1], 0.0);
+ Mf::Vector3 a(mState.position[0] - 0.5, mState.position[1] - 0.5, 0.0);
+ Mf::Vector3 b(mState.position[0] + 0.5, mState.position[1] + 0.5, 0.0);
+
+ mAabb.init(a, b);
+ mSphere.init(center, a);
}
-void Character::updateContainers()
+
+void Character::draw(Mf::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();
+ Mf::State2 state = getState(alpha);
+ Mf::Vector2 position = state.position;
+
+ //glColor3f(1.0f, 1.0f, 1.0f);
+ tilemap.bind();
+
+ Mf::Texture::TileIndex frame = animation.getFrame();
+ Mf::Texture::Orientation orientation = Mf::Texture::NORMAL;
+
+ if (mState.velocity[0] < 0.0) orientation = Mf::Texture::REVERSE;
+
+ Mf::Scalar coords[8];
+ tilemap.getTileCoords(frame, coords, orientation);
+
+ Mf::Scalar s = 0.5;
+
+ glBegin(GL_TRIANGLE_FAN);
+ glTexCoord(coords[0], coords[1]);
+ glVertex(position[0]-s, position[1]-s);
+ glTexCoord(coords[2], coords[3]);
+ glVertex(position[0]+s, position[1]-s);
+ glTexCoord(coords[4], coords[5]);
+ glVertex(position[0]+s, position[1]+s);
+ glTexCoord(coords[6], coords[7]);
+ glVertex(position[0]-s, position[1]+s);
+ glEnd();
}
-void Character::handleEvent(const Mf::Event& event)
+
+/*int Character::getOctant(const Mf::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;
+
+ Mf::Plane::Halfspace halfspace;
- switch (event.type)
+ Mf::Plane xy = aabb.getPlaneXY();
+ halfspace = xy.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
{
- case SDL_KEYDOWN:
- if (event.key.keysym.sym == SDLK_a)
+ halfspace = xy.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane xz = aabb.getPlaneXZ();
+ halfspace = xz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = xz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = yz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ octantNum = 2;
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
{
- current.force += left;
+ octantNum = 3;
}
- else if (event.key.keysym.sym == SDLK_d)
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
{
- current.force += right;
+ halfspace = yz.intersects(mAabb);
}
- else if (event.key.keysym.sym == SDLK_s)
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ octantNum = 1;
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
{
- current.force += down;
+ octantNum = 0;
}
- else if (event.key.keysym.sym == SDLK_w)
+ }
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
+ {
+ Mf::Plane xz = aabb.getPlaneXZ();
+ halfspace = xz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
+ {
+ halfspace = xz.intersects(mAabb);
+ }
+
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
{
- current.force += up;
+ halfspace = yz.intersects(mAabb);
}
- break;
- case SDL_KEYUP:
- if (event.key.keysym.sym == SDLK_a)
+ if (halfspace == Mf::Plane::POSITIVE)
+ {
+ octantNum = 6;
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
{
- current.force -= left;
+ octantNum = 7;
}
- else if (event.key.keysym.sym == SDLK_d)
+ }
+ else if (halfspace == Mf::Plane::NEGATIVE)
+ {
+ Mf::Plane yz = aabb.getPlaneYZ();
+ halfspace = yz.intersects(mSphere);
+ if (halfspace == Mf::Plane::INTERSECT)
{
- current.force -= right;
+ halfspace = yz.intersects(mAabb);
}
- else if (event.key.keysym.sym == SDLK_s)
+
+ if (halfspace == Mf::Plane::POSITIVE)
{
- current.force -= down;
+ octantNum = 5;
}
- else if (event.key.keysym.sym == SDLK_w)
+ else if (halfspace == Mf::Plane::NEGATIVE)
{
- current.force -= up;
+ octantNum = 4;
}
- break;
+ }
}
- //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(Mf::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();
+ mState.momentum += impulse;
}
-
-Mf::Tilemap& Character::getTilemap()
+void Character::addForce(Mf::Vector2 force)
{
- return tilemap_;
+ mState.force += force;
}
-Mf::Animation& Character::getAnimation()
+void Character::setPosition(Mf::Vector2 position)
{
- return animation_;
+ mState.position = position;
}
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-
projects / chaz / yoink / blobdiff