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

diff --git a/src/Character.cc b/src/Character.cc
index c6ad2a0..accad65 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -48,8 +48,6 @@ Character::Character(const std::string& name) :
 	current.recalculate();
 
 	previous = current;
-
-	updateContainers();
 }
 
 
@@ -61,82 +59,19 @@ void Character::update(Mf::Scalar t, Mf::Scalar dt)
 	Mf::Scalar mag = x.length();
 	Mf::Scalar d = 50.0;
 
+	// gravity:
 	current.force = Mf::Vector2(0.0, -2000.0);
+	// spring:
 	//current.force += -15.0 * x - 1.5 * current.velocity;
 	current.force += -20.0 * (mag - d) * (x / mag) - 2.0 * current.velocity;
+	// internal:
 	current.force += userForce;
 	current.recalculate();
 	//std::cout << "force: " << current.momentum << std::endl;
 
-	Mf::integrate<State,Derivative>(current, t, dt);
+	Mf::euler<State,Derivative>(current, t, dt);
 
 	animation_.update(t, dt);
-
-	updateContainers();
-}
-
-void Character::updateContainers()
-{
-	aabb_.init(Mf::Vector3(current.position[0]-16.0, current.position[1]-16.0, z),
-			Mf::Vector3(current.position[0]+16.0, current.position[1]+16.0, z));
-	sphere_.point = Mf::Vector3(current.position[0], current.position[1], z);
-	sphere_.radius = (aabb_.min - sphere_.point).length();
-}
-
-void Character::handleEvent(const Mf::Event& event)
-{
-	// really just for heroine...
-	
-	Mf::Scalar force = 4000.0;
-	
-	Mf::Vector2 left = Mf::Vector2(-force, 0.0);
-	Mf::Vector2 right = Mf::Vector2(force, 0.0);
-	Mf::Vector2 down = Mf::Vector2(0.0, -force);
-	Mf::Vector2 up = Mf::Vector2(0.0, force);
-
-	switch (event.type)
-	{
-		case SDL_KEYDOWN:
-			if (event.key.keysym.sym == SDLK_a)
-			{
-				userForce += left;
-			}
-			else if (event.key.keysym.sym == SDLK_d)
-			{
-				userForce += right;
-			}
-			else if (event.key.keysym.sym == SDLK_s)
-			{
-				userForce += down;
-			}
-			else if (event.key.keysym.sym == SDLK_w)
-			{
-				userForce += up;
-			}
-			break;
-
-		case SDL_KEYUP:
-			if (event.key.keysym.sym == SDLK_a)
-			{
-				userForce -= left;
-			}
-			else if (event.key.keysym.sym == SDLK_d)
-			{
-				userForce -= right;
-			}
-			else if (event.key.keysym.sym == SDLK_s)
-			{
-				userForce -= down;
-			}
-			else if (event.key.keysym.sym == SDLK_w)
-			{
-				userForce -= up;
-			}
-			break;
-	}
-
-	//Mf::logInfo("current force [%f %f]", current.force[0], current.force[1]);
-	//std::cerr << "current force: " << current.force << std::endl;
 }
 
 
@@ -144,13 +79,17 @@ void Character::draw(Mf::Scalar alpha) const
 {
 	State state = cml::lerp(previous, current, alpha);
 
-	glColor3f(1.0f, 1.0f, 1.0f);
+	//glColor3f(1.0f, 1.0f, 1.0f);
 	tilemap_.bind();
 
 	Mf::Tilemap::Index frame = animation_.getFrame();
 
+	Mf::Tilemap::Orientation orientation = Mf::Tilemap::NORMAL;
+
+	if (current.velocity[0] < 0.0) orientation = Mf::Tilemap::REVERSE;
+
 	Mf::Scalar coords[8];
-	tilemap_.getTileCoords(frame, coords);
+	tilemap_.getTileCoords(frame, coords, orientation);
 
 	Mf::Scalar s = 16.0;
 
@@ -165,7 +104,7 @@ void Character::draw(Mf::Scalar alpha) const
 		glVertex3(state.position[0]-s, state.position[1]+s, z);
 	glEnd();
 
-	glColor3f(0.0f, 0.0f, 0.0f);
+	//glColor3f(0.0f, 0.0f, 0.0f);
 	Mf::Texture::resetBind();
 
 	glBegin(GL_TRIANGLES);
@@ -174,7 +113,7 @@ void Character::draw(Mf::Scalar alpha) const
 		glVertex3(500.0, 210.0, 64.0);
 	glEnd();
 
-	glColor3f(1.0f, 1.0f, 1.0f);
+	//glColor3f(1.0f, 1.0f, 1.0f);
 }