experimental shapes hierarchy and raycasting

[chaz/yoink] / src / Character.cc

diff --git a/src/Character.cc b/src/Character.cc
index 7110449e0f5a2019cb36f74b6dd61c7534f7399e..3022c31acc7f1f9d2d060c10dc917ae7a0327924 100644 (file)
--- a/src/Character.cc
+++ b/src/Character.cc
@@ -138,14 +138,14 @@ 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, mZCoord);
+               glTexCoord(coords[2], coords[3]);
+               glVertex(position[0]+s, position[1]-s, mZCoord);
+               glTexCoord(coords[4], coords[5]);
+               glVertex(position[0]+s, position[1]+s, mZCoord);
+               glTexCoord(coords[6], coords[7]);
+               glVertex(position[0]-s, position[1]+s, mZCoord);
        glEnd();
 }
 
@@ -155,7 +155,7 @@ void Character::setZCoord(Mf::Scalar z)
 }
 
 
-int Character::getOctant(const Mf::Aabb& aabb) const
+int Character::getOctant(const Mf::Aabb<3>& aabb) const
 {
        int octantNum = -1;