Replaced the collision detection with a check of the angle

[hair] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 01f6716..0fceafe 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -33,7 +33,7 @@ static int win_width, win_height;
 static float cam_theta, cam_phi = 25, cam_dist = 8;
 static float head_rz, head_rx; /* rot angles x, z axis */
 static Mat4 head_xform;
-static CollSphere coll_sphere; /* sphere used for collision detection */
+//static CollSphere coll_sphere; /* sphere used for collision detection */
 
 int main(int argc, char **argv)
 {
@@ -105,15 +105,15 @@ static bool init()
                return false;
        }
 
-       coll_sphere.radius = 1.0;
-       coll_sphere.center = Vec3(0, 0.6, 0.53);
+//     coll_sphere.radius = 1.0;
+//     coll_sphere.center = Vec3(0, 0.6, 0.53);
 
        if(!hair.init(mesh_head, MAX_NUM_SPAWNS, THRESH)) {
                fprintf(stderr, "Failed to initialize hair\n");
                return false;
        }
 
-       hair.add_collider(&coll_sphere);
+//     hair.add_collider(&coll_sphere);
 
        return true;
 }
@@ -146,14 +146,18 @@ static void display()
        /* multiplying with the head rot matrix */
        glPushMatrix();
        glMultMatrixf(head_xform[0]);
+/*
        glPushAttrib(GL_LINE_BIT);
        glLineWidth(1);
        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+*/
        for(size_t i=0; i<meshes.size(); i++) {
                meshes[i]->draw();
        }
+/*
        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
        glPopAttrib();
+*/
 
        glPopMatrix();
 
@@ -182,7 +186,7 @@ static void display()
        }
        glEnd();
        glPopAttrib();
-       */
+*/
 
        glutSwapBuffers();
        assert(glGetError() == GL_NO_ERROR);