Changeset 1356

Timestamp:

09/08/08 15:24:04 (3 months ago)

Author:

ArcRiley

Message:

Ticket #962 :

• eliminated soy.bodies.Body._calcFogCoords
  
• fixed some obvious problems with liquid_example.py
  
• still renders just black
  

Location:

trunk/pysoy

Files:

• examples/liquid_example.py (modified) (3 diffs)
• include/soy.bodies.pxd (modified) (1 diff)
• src/bodies/Body.pym (modified) (1 diff)
• src/models/Liquid.pym (modified) (1 diff)

trunk/pysoy/examples/liquid_example.py

@@ -62 +62 @@
     #lava = soy.transports.File('media/lava.soy')['gimp']
     #lavam = soy.materials.Material(lava)
-    bottom = soy.models.Mesh(material=soy.materials.StainlessSteel())
+    bottom = soy.models.Mesh(material=soy.materials.stainlessSteel)
 
     V1 = lambda x : V(bottom, position=x[0])
-    F1 = lambda x : F(bottom, verts=x, material=soy.materials.StainlessSteel())
+    F1 = lambda x : F(bottom, verts=x, material=soy.materials.stainlessSteel)
 
     #verts = map(V1, bottom_vertices)
@@ -86 +86 @@
     return bottom
 
-def create_simple_test_mesh(mat=soy.materials.StainlessSteel()):
+def create_simple_test_mesh(mat=soy.materials.stainlessSteel):
     V = soy.atoms.Vertex
     F = soy.atoms.Face
@@ -159 +159 @@
     water = soy.transports.File('media/water.soy')['gimp']
 
-    water_mat = soy.materials.Material(water)
+    water_mat = soy.materials.Material(colorMap=water)
     water_mat.ambient = soy.colors.blue
     water_mat.diffuse = soy.colors.blue
     water_mat.specular = soy.colors.black
 
-    liquid = soy.models.Liquid(liquid_mat=water_mat)
+    liquid = soy.models.Liquid(material=water_mat)
     liquid_b = soy.bodies.Body(sce, mesh=liquid)
     liquid_b.position = (0, -1, 0)

trunk/pysoy/include/soy.bodies.pxd

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

trunk/pysoy/src/bodies/Body.pym

@@ -462 +462 @@
   #
 
-  cdef void _calcFogCoords(self) nogil :
-    if self._model is not None :
-      self._model._calcFogCoords(<float> self._position[1])
-
-
   cdef void _getModelviewInv(self, float* _mtx) nogil :
     _mtx[0]  = self._rotation[0]

trunk/pysoy/src/models/Liquid.pym

@@ -115 +115 @@
     # We need not _iterStart here since _bodies is already iterating via Scene
     for _i from 0 <= _i < _body._scene._bodies._current :
-      if <void*> _body != (_body._scene._bodies._list[_i]) :
-        (<soy.bodies.Body> _body._scene._bodies._list[_i])._calcFogCoords()
-        (<soy.bodies.Body> _body._scene._bodies._list[_i])._render()
+      if (<void*> _body != (_body._scene._bodies._list[_i]) and 
+          (<soy.bodies.Body> 
+           _body._scene._bodies._list[_i])._model is not None) :
+        (<soy.bodies.Body> 
+         _body._scene._bodies._list[_i])._model._calcFogCoords(
+          (<soy.bodies.Body> _body._scene._bodies._list[_i]))
+        (<soy.bodies.Body> 
+         _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)