From c595e4a5c4d54f24af1357816a1baecfdeb7d25e Mon Sep 17 00:00:00 2001 From: Eleni Maria Stea Date: Sat, 26 Jan 2019 20:33:43 +0200 Subject: [PATCH] Removed the calls to the 1st collision detection attempt (but kept the collider code etc in case I want to add some other sort of collision detection later). --- src/hair.cc | 2 +- src/main.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/hair.cc b/src/hair.cc index b99d133..ef93f2c 100644 --- a/src/hair.cc +++ b/src/hair.cc @@ -187,7 +187,7 @@ void Hair::update(float dt) hair[i].velocity += ((-hair[i].velocity * DAMPING) + accel) * dt; Vec3 new_pos = hair[i].pos + hair[i].velocity * dt; - hair[i].pos = handle_collision(new_pos); + hair[i].pos = new_pos; //= handle_collision(new_pos); dbg_force = force; } diff --git a/src/main.cc b/src/main.cc index 01f6716..852b7cb 100644 --- a/src/main.cc +++ b/src/main.cc @@ -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; idraw(); } +/* glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glPopAttrib(); +*/ glPopMatrix(); @@ -182,7 +186,7 @@ static void display() } glEnd(); glPopAttrib(); - */ +*/ glutSwapBuffers(); assert(glGetError() == GL_NO_ERROR); -- 1.7.10.4