X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FCharacter.cc;h=52a13e63ec38d78178c9f6e9ec259d91b366e47a;hb=b357615aba1dbde81e3c6999366604e6001010a7;hp=f12ed5f2d88f66935f5b3923fd0d1f7b57632f9e;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f;p=chaz%2Fyoink

diff --git a/src/Character.cc b/src/Character.cc
index f12ed5f..52a13e6 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -32,8 +32,10 @@
 #include "Log.hh"
 
 	
-struct SpringForce
+class SpringForce
 {
+public:
+
 	explicit SpringForce(Mf::Vector2 x) :
 		location(x) {}
 
@@ -56,8 +58,10 @@ private:
 	Mf::Vector2 location;
 };
 
-struct ResistanceForce
+class ResistanceForce
 {
+public:
+
 	explicit ResistanceForce(Mf::Scalar scale = 1.0) :
 		k(scale) {}
 
@@ -75,7 +79,7 @@ private:
 
 
 Character::Character(const std::string& name) :
-	tilemap(name),
+	tilemap("Particles"),
 	animation(name)
 {
 	mState.init();
@@ -87,10 +91,10 @@ Character::Character(const std::string& name) :
 	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(-100.0));
+	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-400.0));
 
 	// starting position
-	mState.position = Mf::Vector2(64.0, 64.0);
+	mState.position = Mf::Vector2(5.0, 5.0);
 	mState.momentum = Mf::Vector2(0.0, 0.0);
 	mState.recalculate();
 
@@ -104,9 +108,9 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 
 	animation.update(t, dt);
 
-	Mf::Vector3 center(mState.position[0], mState.position[1], z);
-	Mf::Vector3 a(mState.position[0] - 16.0, mState.position[1] - 16.0, z);
-	Mf::Vector3 b(mState.position[0] + 16.0, mState.position[1] + 16.0, z);
+	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);
@@ -131,33 +135,22 @@ void Character::draw(Mf::Scalar alpha) const
 	Mf::Scalar coords[8];
 	tilemap.getTileCoords(frame, coords, orientation);
 
-	Mf::Scalar s = 16.0;
+	Mf::Scalar s = 0.5;
 
 	glBegin(GL_TRIANGLE_FAN);
-		glTexCoord2f(coords[0], coords[1]);
-		glVertex3(position[0]-s, position[1]-s, z);
-		glTexCoord2f(coords[2], coords[3]);
-		glVertex3(position[0]+s, position[1]-s, z);
-		glTexCoord2f(coords[4], coords[5]);
-		glVertex3(position[0]+s, position[1]+s, z);
-		glTexCoord2f(coords[6], coords[7]);
-		glVertex3(position[0]-s, 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);
+		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();
-
-	//glColor3f(1.0f, 1.0f, 1.0f);
 }
 
 
-int Character::getOctant(const Mf::Aabb& aabb) const
+/*int Character::getOctant(const Mf::Aabb<3>& aabb) const
 {
 	int octantNum = -1;
 
@@ -265,6 +258,23 @@ int Character::getOctant(const Mf::Aabb& aabb) const
 
 	return octantNum;
 }
+*/
+
+
+void Character::addImpulse(Mf::Vector2 impulse)
+{
+	mState.momentum += impulse;
+}
+
+void Character::addForce(Mf::Vector2 force)
+{
+	mState.force += force;
+}
+
+void Character::setPosition(Mf::Vector2 position)
+{
+	mState.position = position;
+}
 
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/