Author: ArcRiley
Date: 2008-09-08 15:24:04 -0400 (Mon, 08 Sep 2008)
New Revision: 1356
Modified:
trunk/pysoy/examples/liquid_example.py
trunk/pysoy/include/soy.bodies.pxd
trunk/pysoy/src/bodies/Body.pym
trunk/pysoy/src/models/Liquid.pym
Log:
Ticket #962 :
* eliminated soy.bodies.Body._calcFogCoords
* fixed some obvious problems with liquid_example.py
* still renders just black
Modified: trunk/pysoy/examples/liquid_example.py
===================================================================
--- trunk/pysoy/examples/liquid_example.py 2008-09-08 08:24:34 UTC (rev
1355)
+++ trunk/pysoy/examples/liquid_example.py 2008-09-08 19:24:04 UTC (rev
1356)
@@ -61,10 +61,10 @@
#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)
#face_vert = [ map( lambda x: verts[x], x) for x in bottom_indices]
@@ -85,7 +85,7 @@
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
@@ -158,12 +158,12 @@
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)
Modified: trunk/pysoy/include/soy.bodies.pxd
===================================================================
--- trunk/pysoy/include/soy.bodies.pxd 2008-09-08 08:24:34 UTC (rev 1355)
+++ trunk/pysoy/include/soy.bodies.pxd 2008-09-08 19:24:04 UTC (rev 1356)
@@ -80,7 +80,6 @@
cdef void _addForce ( self, ode.dVector3 )
cdef void _addTorque ( self, ode.dVector3 )
# WindowLoop functions
- cdef void _calcFogCoords ( self ) nogil
cdef void _getModelviewInv ( self, float* ) nogil
Modified: trunk/pysoy/src/bodies/Body.pym
===================================================================
--- trunk/pysoy/src/bodies/Body.pym 2008-09-08 08:24:34 UTC (rev 1355)
+++ trunk/pysoy/src/bodies/Body.pym 2008-09-08 19:24:04 UTC (rev 1356)
@@ -461,11 +461,6 @@
# WindowLoop Functions
#
- 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]
_mtx[4] = self._rotation[4]
Modified: trunk/pysoy/src/models/Liquid.pym
===================================================================
--- trunk/pysoy/src/models/Liquid.pym 2008-09-08 08:24:34 UTC (rev 1355)
+++ trunk/pysoy/src/models/Liquid.pym 2008-09-08 19:24:04 UTC (rev 1356)
@@ -114,9 +114,15 @@
#
# 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)
gl.glDisable(gl.GL_FOG)
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
