X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;fp=src%2FCharacter.cc;h=a857cbebfa6fffbb76facc3830c220d67df59b52;hp=82d5e548e47beab288d6b262bb8cab9cca3ec66d;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=299af4f2047e767e5d79501c26444473bda64c64

diff --git a/src/Character.cc b/src/Character.cc
index 82d5e54..a857cbe 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -11,25 +11,26 @@
 
 #include <iostream>
 
+#include <moof/log.hh>
+
 #include "Character.hh"
-#include "Log.hh"
 
 	
 class SpringForce
 {
 public:
 
-	explicit SpringForce(Mf::Vector2 x) :
+	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 = 0.0;
+		moof::vector2 x = state.position - location;
+		moof::scalar mag = x.length();
+		moof::scalar d = 0.0;
 
 		// spring:
-		//mState.force += -15.0 * x - 1.5 * mState.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;
@@ -37,18 +38,18 @@ public:
 
 private:
 
-	Mf::Vector2 force;
-	Mf::Vector2 location;
+	moof::vector2 force;
+	moof::vector2 location;
 };
 
 class ResistanceForce
 {
 public:
 
-	explicit ResistanceForce(Mf::Scalar scale = 1.0) :
+	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;
@@ -56,8 +57,8 @@ public:
 
 private:
 
-	Mf::Vector2	force;
-	Mf::Scalar	k;
+	moof::vector2	force;
+	moof::scalar	k;
 };
 
 
@@ -65,58 +66,58 @@ Character::Character(const std::string& name) :
 	tilemap(name),
 	animation(name)
 {
-	mState.init();
+	state_.init();
 
-	mState.mass = 1.0;
-	mState.inverseMass = 1.0 / mState.mass;
+	state_.mass = 1.0;
+	state_.inverse_mass = 1.0 / state_.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));
+	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
-	mState.position = Mf::Vector2(5.0, 5.0);
-	mState.momentum = Mf::Vector2(0.0, 0.0);
-	mState.recalculate();
+	state_.position = moof::vector2(5.0, 5.0);
+	state_.momentum = moof::vector2(0.0, 0.0);
+	state_.recalculate();
 
-	mPrevState = mState;
+	prev_state_ = state_;
 }
 
 
-void Character::update(Mf::Scalar t, Mf::Scalar dt)
+void Character::update(moof::scalar t, moof::scalar dt)
 {
-	Mf::RigidBody2::update(t, dt); // update physics
+	moof::rigid_body2::update(t, dt); // update physics
 
 	animation.update(t, dt);
 
-	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);
+	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);
 
-	mAabb.init(a, b);
-	mSphere.init(center, a);
+	aabb_.init(a, b);
+	sphere_.init(center, a);
 }
 
 
-void Character::draw(Mf::Scalar alpha) const
+void Character::draw(moof::scalar alpha) const
 {
-	Mf::State2 state = getState(alpha);
-	Mf::Vector2 position = state.position;
+	moof::state2 state = moof::rigid_body2::state(alpha);
+	moof::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;
+	int frame = animation.getFrame();
+	moof::texture::orientation orientation = moof::texture::normal;
 
-	if (mState.velocity[0] < 0.0) orientation = Mf::Texture::REVERSE;
+	if (state_.velocity[0] < 0.0) orientation = moof::texture::reverse;
 
-	Mf::Scalar coords[8];
-	tilemap.getTileCoords(frame, coords, orientation);
+	moof::scalar coords[8];
+	tilemap.tile_coordinates(frame, coords, orientation);
 
-	Mf::Scalar s = 0.5;
+	moof::scalar s = 0.5;
 
 	glBegin(GL_TRIANGLE_FAN);
 		glTexCoord(coords[0], coords[1]);
@@ -131,106 +132,106 @@ void Character::draw(Mf::Scalar alpha) const
 }
 
 
-/*int Character::getOctant(const Mf::Aabb<3>& aabb) const
+/*int Character::getOctant(const moof::Aabb<3>& aabb) const
 {
 	int octantNum = -1;
 
-	Mf::Plane::Halfspace halfspace;
+	moof::plane::halfspace halfspace;
 
-	Mf::Plane xy = aabb.getPlaneXY();
-	halfspace = xy.intersects(mSphere);
-	if (halfspace == Mf::Plane::INTERSECT)
+	moof::plane xy = aabb.xy_plane();
+	halfspace = xy.intersects(sphere_);
+	if (halfspace == moof::plane::intersecting)
 	{
-		halfspace = xy.intersects(mAabb);
+		halfspace = xy.intersects(aabb_);
 	}
 
-	if (halfspace == Mf::Plane::POSITIVE)
+	if (halfspace == moof::plane::positive)
 	{
-		Mf::Plane xz = aabb.getPlaneXZ();
-		halfspace = xz.intersects(mSphere);
-		if (halfspace == Mf::Plane::INTERSECT)
+		moof::plane xz = aabb.xz_plane();
+		halfspace = xz.intersects(sphere_);
+		if (halfspace == moof::plane::intersecting)
 		{
-			halfspace = xz.intersects(mAabb);
+			halfspace = xz.intersects(aabb_);
 		}
 
-		if (halfspace == Mf::Plane::POSITIVE)
+		if (halfspace == moof::plane::positive)
 		{
-			Mf::Plane yz = aabb.getPlaneYZ();
-			halfspace = yz.intersects(mSphere);
-			if (halfspace == Mf::Plane::INTERSECT)
+			moof::plane yz = aabb.yz_plane();
+			halfspace = yz.intersects(sphere_);
+			if (halfspace == moof::plane::intersecting)
 			{
-				halfspace = yz.intersects(mAabb);
+				halfspace = yz.intersects(aabb_);
 			}
 
-			if (halfspace == Mf::Plane::POSITIVE)
+			if (halfspace == moof::plane::positive)
 			{
 				octantNum = 2;
 			}
-			else if (halfspace == Mf::Plane::NEGATIVE)
+			else if (halfspace == moof::plane::negative)
 			{
 				octantNum = 3;
 			}
 		}
-		else if (halfspace == Mf::Plane::NEGATIVE)
+		else if (halfspace == moof::plane::negative)
 		{
-			Mf::Plane yz = aabb.getPlaneYZ();
-			halfspace = yz.intersects(mSphere);
-			if (halfspace == Mf::Plane::INTERSECT)
+			moof::plane yz = aabb.yz_plane();
+			halfspace = yz.intersects(sphere_);
+			if (halfspace == moof::plane::intersecting)
 			{
-				halfspace = yz.intersects(mAabb);
+				halfspace = yz.intersects(aabb_);
 			}
 
-			if (halfspace == Mf::Plane::POSITIVE)
+			if (halfspace == moof::plane::positive)
 			{
 				octantNum = 1;
 			}
-			else if (halfspace == Mf::Plane::NEGATIVE)
+			else if (halfspace == moof::plane::negative)
 			{
 				octantNum = 0;
 			}
 		}
 	}
-	else if (halfspace == Mf::Plane::NEGATIVE)
+	else if (halfspace == moof::plane::negative)
 	{
-		Mf::Plane xz = aabb.getPlaneXZ();
-		halfspace = xz.intersects(mSphere);
-		if (halfspace == Mf::Plane::INTERSECT)
+		moof::plane xz = aabb.xz_plane();
+		halfspace = xz.intersects(sphere_);
+		if (halfspace == moof::plane::intersecting)
 		{
-			halfspace = xz.intersects(mAabb);
+			halfspace = xz.intersects(aabb_);
 		}
 
-		if (halfspace == Mf::Plane::POSITIVE)
+		if (halfspace == moof::plane::positive)
 		{
-			Mf::Plane yz = aabb.getPlaneYZ();
-			halfspace = yz.intersects(mSphere);
-			if (halfspace == Mf::Plane::INTERSECT)
+			moof::plane yz = aabb.yz_plane();
+			halfspace = yz.intersects(sphere_);
+			if (halfspace == moof::plane::intersecting)
 			{
-				halfspace = yz.intersects(mAabb);
+				halfspace = yz.intersects(aabb_);
 			}
 
-			if (halfspace == Mf::Plane::POSITIVE)
+			if (halfspace == moof::plane::positive)
 			{
 				octantNum = 6;
 			}
-			else if (halfspace == Mf::Plane::NEGATIVE)
+			else if (halfspace == moof::plane::negative)
 			{
 				octantNum = 7;
 			}
 		}
-		else if (halfspace == Mf::Plane::NEGATIVE)
+		else if (halfspace == moof::plane::negative)
 		{
-			Mf::Plane yz = aabb.getPlaneYZ();
-			halfspace = yz.intersects(mSphere);
-			if (halfspace == Mf::Plane::INTERSECT)
+			moof::plane yz = aabb.yz_plane();
+			halfspace = yz.intersects(sphere_);
+			if (halfspace == moof::plane::intersecting)
 			{
-				halfspace = yz.intersects(mAabb);
+				halfspace = yz.intersects(aabb_);
 			}
 
-			if (halfspace == Mf::Plane::POSITIVE)
+			if (halfspace == moof::plane::positive)
 			{
 				octantNum = 5;
 			}
-			else if (halfspace == Mf::Plane::NEGATIVE)
+			else if (halfspace == moof::plane::negative)
 			{
 				octantNum = 4;
 			}
@@ -242,18 +243,18 @@ void Character::draw(Mf::Scalar alpha) const
 */
 
 
-void Character::addImpulse(Mf::Vector2 impulse)
+void Character::addImpulse(moof::vector2 impulse)
 {
-	mState.momentum += impulse;
+	state_.momentum += impulse;
 }
 
-void Character::addForce(Mf::Vector2 force)
+void Character::addForce(moof::vector2 force)
 {
-	mState.force += force;
+	state_.force += force;
 }
 
-void Character::setPosition(Mf::Vector2 position)
+void Character::setPosition(moof::vector2 position)
 {
-	mState.position = position;
+	state_.position = position;
 }