projects
/
hair
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the calls to the 1st collision detection attempt
[hair]
/
src
/
main.cc
diff --git
a/src/main.cc
b/src/main.cc
index
01f6716
..
852b7cb
100644
(file)
--- 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]);
/* multiplying with the head rot matrix */
glPushMatrix();
glMultMatrixf(head_xform[0]);
+/*
glPushAttrib(GL_LINE_BIT);
glLineWidth(1);
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
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();
}
for(size_t i=0; i<meshes.size(); i++) {
meshes[i]->draw();
}
+/*
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glPopAttrib();
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glPopAttrib();
+*/
glPopMatrix();
glPopMatrix();
@@
-182,7
+186,7
@@
static void display()
}
glEnd();
glPopAttrib();
}
glEnd();
glPopAttrib();
- */
+*/
glutSwapBuffers();
assert(glGetError() == GL_NO_ERROR);
glutSwapBuffers();
assert(glGetError() == GL_NO_ERROR);