X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=3022c31acc7f1f9d2d060c10dc917ae7a0327924;hp=f508682944d3a5db96ca210d9a710cd7ef2065d8;hb=71bd9dbaf1c1e3c55a9f63392a73865d8aeee7d4;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/Character.cc b/src/Character.cc
index f508682..3022c31 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -26,30 +26,258 @@
 
 *******************************************************************************/
 
+#include <iostream>
+
 #include "Character.hh"
+#include "Log.hh"
 
 	
+class SpringForce
+{
+public:
+
+	explicit SpringForce(Mf::Vector2 x) :
+		location(x) {}
+
+	const Mf::Vector2& operator () (const Mf::LinearState<2>& state)
+	{
+		Mf::Vector2 x = state.position - location;
+		Mf::Scalar mag = x.length();
+		Mf::Scalar d = 50.0;
+
+		// spring:
+		//mState.force += -15.0 * x - 1.5 * mState.velocity;
+		force = SCALAR(-10.0) * (mag - d) * (x / mag) - 2.0 * state.velocity;
+
+		return force;
+	}
+
+private:
+
+	Mf::Vector2 force;
+	Mf::Vector2 location;
+};
+
+class ResistanceForce
+{
+public:
+
+	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) {}
+	animation(name)
+{
+	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(500.0, 200.0)));
+	mState.forces.push_back(ResistanceForce(2.0));
+	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-400.0));
+
+	// 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)
+{
+	Mf::RigidBody2::update(t, dt); // update physics
+
+	animation.update(t, dt);
+
+	Mf::Vector3 center(mState.position[0], mState.position[1], mZCoord);
+	Mf::Vector3 a(mState.position[0] - 0.5, mState.position[1] - 0.5, mZCoord);
+	Mf::Vector3 b(mState.position[0] + 0.5, mState.position[1] + 0.5, mZCoord);
+
+	mAabb.init(a, b);
+	mSphere.init(center, a);
+}
+
+
+void Character::draw(Mf::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);
+
+	Mf::Scalar s = 0.5;
+
+	glBegin(GL_TRIANGLE_FAN);
+		glTexCoord(coords[0], coords[1]);
+		glVertex(position[0]-s, position[1]-s, mZCoord);
+		glTexCoord(coords[2], coords[3]);
+		glVertex(position[0]+s, position[1]-s, mZCoord);
+		glTexCoord(coords[4], coords[5]);
+		glVertex(position[0]+s, position[1]+s, mZCoord);
+		glTexCoord(coords[6], coords[7]);
+		glVertex(position[0]-s, position[1]+s, mZCoord);
+	glEnd();
+}
+
+void Character::setZCoord(Mf::Scalar z)
+{
+	mZCoord = z;
+}
+
 
-Character::~Character()
+int Character::getOctant(const Mf::Aabb<3>& aabb) const
 {
-	//delete texture;
-	//delete anim;
+	int octantNum = -1;
+
+	Mf::Plane::Halfspace halfspace;
+
+	Mf::Plane xy = aabb.getPlaneXY();
+	halfspace = xy.intersects(mSphere);
+	if (halfspace == Mf::Plane::INTERSECT)
+	{
+		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)
+			{
+				octantNum = 3;
+			}
+		}
+		else if (halfspace == Mf::Plane::NEGATIVE)
+		{
+			Mf::Plane yz = aabb.getPlaneYZ();
+			halfspace = yz.intersects(mSphere);
+			if (halfspace == Mf::Plane::INTERSECT)
+			{
+				halfspace = yz.intersects(mAabb);
+			}
+
+			if (halfspace == Mf::Plane::POSITIVE)
+			{
+				octantNum = 1;
+			}
+			else if (halfspace == Mf::Plane::NEGATIVE)
+			{
+				octantNum = 0;
+			}
+		}
+	}
+	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)
+			{
+				halfspace = yz.intersects(mAabb);
+			}
+
+			if (halfspace == Mf::Plane::POSITIVE)
+			{
+				octantNum = 6;
+			}
+			else if (halfspace == Mf::Plane::NEGATIVE)
+			{
+				octantNum = 7;
+			}
+		}
+		else if (halfspace == Mf::Plane::NEGATIVE)
+		{
+			Mf::Plane yz = aabb.getPlaneYZ();
+			halfspace = yz.intersects(mSphere);
+			if (halfspace == Mf::Plane::INTERSECT)
+			{
+				halfspace = yz.intersects(mAabb);
+			}
+
+			if (halfspace == Mf::Plane::POSITIVE)
+			{
+				octantNum = 5;
+			}
+			else if (halfspace == Mf::Plane::NEGATIVE)
+			{
+				octantNum = 4;
+			}
+		}
+	}
+
+	return octantNum;
 }
 
 
-void Character::draw(Mf::Scalar alpha) const {}
+void Character::addImpulse(Mf::Vector2 impulse)
+{
+	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;
 }