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

diff --git a/src/Character.cc b/src/Character.cc
index 3022c31..52a13e6 100644
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -79,7 +79,7 @@ private:
 
 
 Character::Character(const std::string& name) :
-	tilemap(name),
+	tilemap("Particles"),
 	animation(name)
 {
 	mState.init();
@@ -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);
@@ -139,23 +139,18 @@ void Character::draw(Mf::Scalar alpha) const
 
 	glBegin(GL_TRIANGLE_FAN);
 		glTexCoord(coords[0], coords[1]);
-		glVertex(position[0]-s, position[1]-s, mZCoord);
+		glVertex(position[0]-s, position[1]-s);
 		glTexCoord(coords[2], coords[3]);
-		glVertex(position[0]+s, position[1]-s, mZCoord);
+		glVertex(position[0]+s, position[1]-s);
 		glTexCoord(coords[4], coords[5]);
-		glVertex(position[0]+s, position[1]+s, mZCoord);
+		glVertex(position[0]+s, position[1]+s);
 		glTexCoord(coords[6], coords[7]);
-		glVertex(position[0]-s, position[1]+s, mZCoord);
+		glVertex(position[0]-s, position[1]+s);
 	glEnd();
 }
 
-void Character::setZCoord(Mf::Scalar z)
-{
-	mZCoord = z;
-}
-
 
-int Character::getOctant(const Mf::Aabb<3>& aabb) const
+/*int Character::getOctant(const Mf::Aabb<3>& aabb) const
 {
 	int octantNum = -1;
 
@@ -263,6 +258,7 @@ int Character::getOctant(const Mf::Aabb<3>& aabb) const
 
 	return octantNum;
 }
+*/
 
 
 void Character::addImpulse(Mf::Vector2 impulse)