Changeset 1357

Timestamp:

09/08/08 19:45:36 (2 months ago)

Author:

ArcRiley

Message:

Ticket #962 :

• added proper matrix translation code
  
• still doesn't work
  

Files:

• trunk/pysoy/src/models/Liquid.pym (modified) (4 diffs)

trunk/pysoy/src/models/Liquid.pym

@@ -85 +85 @@
     cdef ode.dReal*         _pos
     cdef float              _halfSize[3]
+    cdef gl.GLfloat         _mtx[16]
+    #
+    ######################################
+    #
+    # set model's matrix
+    #
+    _mtx[0]  = _body._rotation[0]
+    _mtx[1]  = _body._rotation[4]
+    _mtx[2]  = _body._rotation[8]
+    _mtx[3]  = 0.0
+    _mtx[4]  = _body._rotation[1]
+    _mtx[5]  = _body._rotation[5]
+    _mtx[6]  = _body._rotation[9]
+    _mtx[7]  = 0.0
+    _mtx[8]  = _body._rotation[2]
+    _mtx[9]  = _body._rotation[6]
+    _mtx[10] = _body._rotation[10]
+    _mtx[11] = 0.0
+    _mtx[12] = _body._position[0]
+    _mtx[13] = _body._position[1]
+    _mtx[14] = _body._position[2]
+    _mtx[15] = 1.0
+    #
+    ######################################
+    #
+    # save current matix before setting it
+    #
+    gl.glPushMatrix()
+    gl.glMultMatrixf(_mtx)
+    #
+    ######################################
+    #
+    # render liquid surface and bottom
+    #
     _pos = _body._position
     _halfSize[0] = self._size[0]/2.0
@@ -101 +135 @@
     gl.glEnable(gl.GL_DEPTH_TEST)
     #
-    #RENDER BODIES
+    ######################################
+    #
+    # return to camera matrix
+    #
+    gl.glPopMatrix()
+    #
+    ######################################
+    #
+    # render each body inside the liquid
+    #
     gl.glEnable(gl.GL_FOG)
     gl.glEnableClientState(gl.GL_FOG_COORDINATE_ARRAY_EXT)
@@ -110 +153 @@
     gl.glHint(gl.GL_FOG_HINT, gl.GL_NICEST)
     gl.glFogi(gl.GL_FOG_COORDINATE_SOURCE_EXT, gl.GL_FOG_COORDINATE_EXT)
-    gl.glPushMatrix()
-    gl.glTranslatef(-pos[0],-pos[1], -pos[2])
     #
     # We need not _iterStart here since _bodies is already iterating via Scene
@@ -124 +165 @@
          _body._scene._bodies._list[_i])._model._render(
           (<soy.bodies.Body> _body._scene._bodies._list[_i]))
-    gl.glPopMatrix()
     gl.glDisableClientState(gl.GL_FOG_COORDINATE_ARRAY_EXT)
     gl.glDisable(gl.GL_FOG)
     #
-    #RENDER SURFACE
+    ######################################
+    #
+    # save current matix before setting it
+    #
+    gl.glPushMatrix()
+    gl.glMultMatrixf(_mtx)
     self._material._coreBind()
     self._renderSurf()
     self._material._coreUnBind()
     gl.glDisable(gl.GL_STENCIL_TEST)
+    #
+    ######################################
+    #
+    # return to camera matrix
+    #
+    gl.glPopMatrix()
+    #
+    ######################################