X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=9da4344aab361bd369eb26f41f56677eff2a5689;hp=7110449e0f5a2019cb36f74b6dd61c7534f7399e;hb=3f6e44698c38b74bb622ad81ea9d2daa636981d2;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1

diff --git a/src/Character.cc b/src/Character.cc
index 7110449..9da4344 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -43,7 +43,7 @@ public:
 	{
 		Mf::Vector2 x = state.position - location;
 		Mf::Scalar mag = x.length();
-		Mf::Scalar d = 50.0;
+		Mf::Scalar d = 0.0;
 
 		// spring:
 		//mState.force += -15.0 * x - 1.5 * mState.velocity;
@@ -89,9 +89,9 @@ Character::Character(const std::string& name) :
 
 	// forces
 	mState.force = Mf::Vector2(0.0, 0.0);
-	//mState.forces.push_back(SpringForce(Mf::Vector2(500.0, 200.0)));
+	//mState.forces.push_back(SpringForce(Mf::Vector2(20.0, 4.0)));
 	mState.forces.push_back(ResistanceForce(2.0));
-	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-400.0));
+	//mState.forces.push_back(Mf::LinearState<2>::GravityForce(-9.8));
 
 	// starting position
 	mState.position = Mf::Vector2(5.0, 5.0);
@@ -108,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], 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);
+	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);
@@ -138,24 +138,19 @@ void Character::draw(Mf::Scalar alpha) const
 	Mf::Scalar s = 0.5;
 
 	glBegin(GL_TRIANGLE_FAN);
-		glTexCoord2f(coords[0], coords[1]);
-		glVertex3(position[0]-s, position[1]-s, mZCoord);
-		glTexCoord2f(coords[2], coords[3]);
-		glVertex3(position[0]+s, position[1]-s, mZCoord);
-		glTexCoord2f(coords[4], coords[5]);
-		glVertex3(position[0]+s, position[1]+s, mZCoord);
-		glTexCoord2f(coords[6], coords[7]);
-		glVertex3(position[0]-s, position[1]+s, mZCoord);
+		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::setZCoord(Mf::Scalar z)
-{
-	mZCoord = z;
-}
-
 
-int Character::getOctant(const Mf::Aabb& aabb) const
+/*int Character::getOctant(const Mf::Aabb<3>& aabb) const
 {
 	int octantNum = -1;
 
@@ -263,6 +258,7 @@ int Character::getOctant(const Mf::Aabb& aabb) const
 
 	return octantNum;
 }
+*/
 
 
 void Character::addImpulse(Mf::Vector2 impulse)