X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FCharacter.cc;h=c6ad2a049874d821befa4e90da831703ce2ec653;hp=4ce11052274d0a0d9a23e378e3f5d7302ebd729a;hb=7e898e8ec0ff716e2fc722b883a626a6c346f107;hpb=df541170776dc4ac4f241ca480812bd70bcb6eca

diff --git a/src/Character.cc b/src/Character.cc
index 4ce1105..c6ad2a0 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -40,7 +40,7 @@ Character::Character(const std::string& name) :
 	current.inverseMass = 1.0 / current.mass;
 
 	// gravity
-	//current.force = Mf::Vector2(0.0, -120.0);
+	current.force = Mf::Vector2(0.0, -120.0);
 
 	// starting position
 	current.position = Mf::Vector2(64.0, 64.0);
@@ -57,21 +57,16 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	previous = current;
 
-	Mf::Scalar epsilon = 100.0;
+	Mf::Vector2 x = current.position - Mf::Vector2(500.0, 200.0);
+	Mf::Scalar mag = x.length();
+	Mf::Scalar d = 50.0;
 
-	//current.momentum = Mf::Vector2(0.0, -120.0);
-	current.momentum = -5 * (current.position - Mf::Vector2(500.0, 200.0))
-		- 2.0 * current.velocity;
+	current.force = Mf::Vector2(0.0, -2000.0);
+	//current.force += -15.0 * x - 1.5 * current.velocity;
+	current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity;
+	current.force += userForce;
 	current.recalculate();
-	std::cout << "force: " << current.momentum << std::endl;
-
-	//if (std::abs(current.force[0]) < epsilon && std::abs(current.force[1]) < epsilon &&
-		//std::abs(current.velocity[0]) < epsilon && std::abs(current.velocity[1]) < epsilon)
-	//{
-		//current.force = Mf::Vector2(0.0, 0.0);
-		//current.velocity = Mf::Vector2(0.0, 0.0);
-		//current.momentum = Mf::Vector2(0.0, 0.0);
-	//}
+	//std::cout << "force: " << current.momentum << std::endl;
 
 	Mf::integrate<State,Derivative>(current, t, dt);
 
@@ -92,7 +87,7 @@ void Character::handleEvent(const Mf::Event& event)
 {
 	// really just for heroine...
 	
-	Mf::Scalar force = 500.0;
+	Mf::Scalar force = 4000.0;
 	
 	Mf::Vector2 left = Mf::Vector2(-force, 0.0);
 	Mf::Vector2 right = Mf::Vector2(force, 0.0);
@@ -104,38 +99,38 @@ void Character::handleEvent(const Mf::Event& event)
 		case SDL_KEYDOWN:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				current.force += left;
+				userForce += left;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				current.force += right;
+				userForce += right;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				current.force += down;
+				userForce += down;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				current.force += up;
+				userForce += up;
 			}
 			break;
 
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_a)
 			{
-				current.force -= left;
+				userForce -= left;
 			}
 			else if (event.key.keysym.sym == SDLK_d)
 			{
-				current.force -= right;
+				userForce -= right;
 			}
 			else if (event.key.keysym.sym == SDLK_s)
 			{
-				current.force -= down;
+				userForce -= down;
 			}
 			else if (event.key.keysym.sym == SDLK_w)
 			{
-				current.force -= up;
+				userForce -= up;
 			}
 			break;
 	}
@@ -169,6 +164,17 @@ void Character::draw(Mf::Scalar alpha) const
 		glTexCoord2f(coords[6], coords[7]);
 		glVertex3(state.position[0]-s, state.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);
+	glEnd();
+
+	glColor3f(1.0f, 1.0f, 1.0f);
 }