Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29872
Modified Files:
physicengine.cc q3bsp.cc
Log Message:
bug dans les déplacements
Index: physicengine.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/physicengine.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** physicengine.cc 22 Nov 2004 21:19:07 -0000 1.30
--- physicengine.cc 23 Nov 2004 10:31:04 -0000 1.31
***************
*** 165,176 ****
vUpNewPos = trace.EndPoint;
! if (updist > dist) //on passe l'obstacle
{
n->SetPosition(vUpNewPos);
}
else //l'obstacle est trop haut
! {
n->SetPosition(vNewPos);
! }
//Classification de la position
--- 165,176 ----
vUpNewPos = trace.EndPoint;
! /*if (updist > dist) //on passe l'obstacle
{
n->SetPosition(vUpNewPos);
}
else //l'obstacle est trop haut
! {*/
n->SetPosition(vNewPos);
! //}
//Classification de la position
Index: q3bsp.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/q3bsp.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** q3bsp.cc 22 Nov 2004 21:19:07 -0000 1.16
--- q3bsp.cc 23 Nov 2004 10:31:04 -0000 1.17
***************
*** 1168,1172 ****
//BEGIN NORMALs
! glBegin (GL_LINES);
Vector3 norm = pFace->plane.vNormal;
Vector3 v1 = pFace->plane.v[0]+pFace->plane.v[1]+pFace->plane.v[2];
--- 1168,1172 ----
//BEGIN NORMALs
! /*glBegin (GL_LINES);
Vector3 norm = pFace->plane.vNormal;
Vector3 v1 = pFace->plane.v[0]+pFace->plane.v[1]+pFace->plane.v[2];
***************
*** 1175,1179 ****
glVertex3fv(&v1.x);
glVertex3fv(&v2.x);
! glEnd ();
//END NORMALS
--- 1175,1179 ----
glVertex3fv(&v1.x);
glVertex3fv(&v2.x);
! glEnd ();*/
//END NORMALS
|
