Changeset 1279

Timestamp:

05/19/08 19:37:00 (5 months ago)

Author:

ArcRiley

Message:

Ticket #956 :

• basic move finished with Mesh and Shape
  
• _render removed from Body, Scene now calls _body._model._render()
  

Location:

trunk/pysoy

Files:

• include/soy.bodies.pxd (modified) (1 diff)
• src/bodies/Body.pym (modified) (1 diff)
• src/models/Mesh.pym (modified) (1 diff)
• src/models/Shape.pym (modified) (2 diffs)
• src/scenes/Scene.pym (modified) (1 diff)

trunk/pysoy/include/soy.bodies.pxd

@@ -79 +79 @@
   cdef void                     _addForce                ( self, ode.dVector3 )
   # WindowLoop functions
-  cdef void                     _render                  ( self )        #nogil
   cdef void                     _calcFogCoords           ( self )         nogil
   cdef void                     _getModelviewInv         ( self, float* ) nogil

trunk/pysoy/src/bodies/Body.pym

@@ -453 +453 @@
   #
 
-  cdef void _render(self) :
-    cdef gl.GLfloat _mtx[16]
-    #
-    ######################################
-    #
-    # return now if there's nothing to render
-    #
-    if self._model is None :
-      return
-    #
-    ######################################
-    #
-    # save current matrix
-    #
-    gl.glPushMatrix()
-    #
-    ######################################
-    #
-    # set model's matrix
-    #
-    _mtx[0]  = self._rotation[0]
-    _mtx[1]  = self._rotation[4]
-    _mtx[2]  = self._rotation[8]
-    _mtx[3]  = 0.0
-    _mtx[4]  = self._rotation[1]
-    _mtx[5]  = self._rotation[5]
-    _mtx[6]  = self._rotation[9]
-    _mtx[7]  = 0.0
-    _mtx[8]  = self._rotation[2]
-    _mtx[9]  = self._rotation[6]
-    _mtx[10] = self._rotation[10]
-    _mtx[11] = 0.0
-    _mtx[12] = self._position[0]
-    _mtx[13] = self._position[1]
-    _mtx[14] = self._position[2]
-    _mtx[15] = 1.0
-    gl.glMultMatrixf(_mtx)
-    #
-    ######################################
-    #
-    # call model's rendering function
-    #
-    self._model._render(self)
-    #
-    ######################################
-    #
-    # restore previous matrix
-    #
-    gl.glPopMatrix()
-    #
-    ######################################
-
-
   cdef void _calcFogCoords(self) nogil :
     if self._model is not None :

trunk/pysoy/src/models/Mesh.pym

@@ -130 +130 @@
 
   cdef void _render(self, soy.bodies.Body _body) :
+    cdef gl.GLfloat _mtx[16]
+    #
+    ######################################
+    #
+    # save current matrix
+    #
+    gl.glPushMatrix()
+    #
+    ######################################
+    #
+    # 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
+    gl.glMultMatrixf(_mtx)
+    #
+    ######################################
+    #
+    # render materials - insert new code here
+    #
     py.PyThread_acquire_lock(self._mutex, 1)
     self._mates._render(<void*> _body)
     py.PyThread_release_lock(self._mutex)
+    #
+    ######################################
+    #
+    # restore previous matrix
+    #
+    gl.glPopMatrix()
+    #
+    ######################################
+
 
   #

trunk/pysoy/src/models/Shape.pym

@@ -58 +58 @@
 
   cdef void _render(self, soy.bodies.Body _body) :
-    cdef int              _shapeclass
+    cdef int         _shapeclass
+    cdef gl.GLfloat  _mtx[16]
+    #
+    ######################################
     #
     # Don't attempt to render a non-existant shape
+    #
     if _body._shape is None :
       return
     #
+    ######################################
+    #
+    # save current matrix
+    #
+    gl.glPushMatrix()
+    #
+    ######################################
+    #
+    # 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
+    gl.glMultMatrixf(_mtx)
+    #
+    ######################################
+    #
     # Grab the shape's class
     _shapeclass = ode.dGeomGetClass(_body._shape._geomID)
     #
-    # Render the specific shape
+    ######################################
+    #
+    # render the specific shape
+    #
     if _shapeclass == ode.dSphereClass :
       self._renderSphere(_body._shape)
@@ -76 +113 @@
     elif _shapeclass == ode.dRayClass :
       self._renderRay(_body._shape)
+    #
+    ######################################
+    #
+    # restore previous matrix
+    #
+    gl.glPopMatrix()
+    #
+    ######################################
 
 

trunk/pysoy/src/scenes/Scene.pym

@@ -142 +142 @@
     self._bodies._iterStart()
     for _i from 0 <= _i < self._bodies._current :
-      (<soy.bodies.Body> self._bodies._list[_i])._render()
+      if (<soy.bodies.Body> self._bodies._list[_i])._model is not None :
+        (<soy.models.Model>
+         (<soy.bodies.Body> self._bodies._list[_i])._model)._render(
+         (<soy.bodies.Body> self._bodies._list[_i]))
     self._bodies._iterDone()
     #