Author: ArcRiley
Date: 2008-02-24 19:16:39 -0500 (Sun, 24 Feb 2008)
New Revision: 976

Modified:
   trunk/pysoy/src/bodies._bodies/Camera.pxi
   trunk/pysoy/src/scenes/Scene.pxi
   trunk/pysoy/src/widgets/Projector.pxi
Log:
Moving the depth buffer reset/enable/disable from Projector to Scene


Modified: trunk/pysoy/src/bodies._bodies/Camera.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Camera.pxi   2008-02-24 17:16:04 UTC (rev 
975)
+++ trunk/pysoy/src/bodies._bodies/Camera.pxi   2008-02-25 00:16:39 UTC (rev 
976)
@@ -38,6 +38,7 @@
     cdef ode.dReal  *rot
     cdef gl.GLfloat  mtx[16]
     #
+    # Check if wireframe mode is turned on
     if self._wire == 1 :
       gl.glEnable (gl.GL_LINE_SMOOTH)
       gl.glEnable (gl.GL_BLEND)
@@ -53,6 +54,7 @@
       #gl.glHint (gl.GL_LINE_SMOOTH_HINT, gl.GL_DONT_CARE)
       gl.glLineWidth (1)
     #
+    # Now we apply an inverse matrix to translate to the Scene's origin
     pos = <ode.dReal *> ode.dBodyGetPosition(self._bodyID)
     rot = <ode.dReal *> ode.dBodyGetRotation(self._bodyID)
     mtx[0]  = rot[0]
@@ -74,6 +76,8 @@
     gl.glLoadMatrixf(mtx)
     gl.glTranslatef(-pos[0], -pos[1], -pos[2])
     self._scene._coreRender()
+    #
+    # What is this for?  Framerate calc?
     self._rpt = (self._rpt + 1) % 16
     self._rtimes[self._rpt] = _time()
 

Modified: trunk/pysoy/src/scenes/Scene.pxi
===================================================================
--- trunk/pysoy/src/scenes/Scene.pxi    2008-02-24 17:16:04 UTC (rev 975)
+++ trunk/pysoy/src/scenes/Scene.pxi    2008-02-25 00:16:39 UTC (rev 976)
@@ -118,6 +118,8 @@
     cdef int i
     cdef float _ambientLight[4]
 
+    gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
+    gl.glEnable(gl.GL_DEPTH_TEST)
     gl.glEnable(gl.GL_LIGHTING)
     (<soy.colors.Color> self._ambient)._getRGBA(_ambientLight)
     gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, _ambientLight)
@@ -136,6 +138,7 @@
       (<soy.bodies.lights.Light> self._lights.list[i])._off(gl.GL_LIGHT0+i)
     self._lights.unlock()
     gl.glDisable(gl.GL_LIGHTING)
+    gl.glDisable(gl.GL_DEPTH_TEST)
 
 
   cdef void _updateTime(self) :

Modified: trunk/pysoy/src/widgets/Projector.pxi
===================================================================
--- trunk/pysoy/src/widgets/Projector.pxi       2008-02-24 17:16:04 UTC (rev 
975)
+++ trunk/pysoy/src/widgets/Projector.pxi       2008-02-25 00:16:39 UTC (rev 
976)
@@ -54,10 +54,7 @@
     gl.gluPerspective(self._camera._fovy, _aspect, self._znear, self._zfar)
     gl.glMatrixMode(gl.GL_MODELVIEW)
     gl.glLoadIdentity()
-    gl.glEnable(gl.GL_DEPTH_TEST)
-    gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
     self._camera._coreProject()
-    gl.glDisable(gl.GL_DEPTH_TEST)
 
 
   property camera :

_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn

Reply via email to