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

diff --git a/src/Character.cc b/src/Character.cc
index 52a13e6..2290e3c 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;
@@ -79,7 +79,7 @@ private:
 
 
 Character::Character(const std::string& name) :
-	tilemap("Particles"),
+	tilemap(name),
 	animation(name)
 {
 	mState.init();
@@ -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);
@@ -126,11 +126,10 @@ void Character::draw(Mf::Scalar alpha) const
 	//glColor3f(1.0f, 1.0f, 1.0f);
 	tilemap.bind();
 
-	Tilemap::Index frame = animation.getFrame();
+	Mf::Texture::TileIndex frame = animation.getFrame();
+	Mf::Texture::Orientation orientation = Mf::Texture::NORMAL;
 
-	Tilemap::Orientation orientation = Tilemap::NORMAL;
-
-	if (mState.velocity[0] < 0.0) orientation = Tilemap::REVERSE;
+	if (mState.velocity[0] < 0.0) orientation = Mf::Texture::REVERSE;
 
 	Mf::Scalar coords[8];
 	tilemap.getTileCoords(frame, coords, orientation);