Author: ArcRiley
Date: 2008-02-07 05:31:20 -0500 (Thu, 07 Feb 2008)
New Revision: 832
Modified:
trunk/pysoy/src/_datatypes/VertexList.pxi
trunk/pysoy/src/bodies._bodies/Body.pxi
trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
trunk/pysoy/src/meshes/Liquid.pxi
Log:
#902 - renamed some Body _core* functions
Modified: trunk/pysoy/src/_datatypes/VertexList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/VertexList.pxi 2008-02-07 10:21:20 UTC (rev
831)
+++ trunk/pysoy/src/_datatypes/VertexList.pxi 2008-02-07 10:31:20 UTC (rev
832)
@@ -216,7 +216,7 @@
if _scene._lights.current > 0:
_light = <soy.bodies.lights.Light> _scene._lights.list[0]
ode.dBodyCopyPosition(<ode.dBodyID> _light._bodyID, _light_pos)
- _body._get_inv_modelview(_inv_mm)
+ _body._coreGetModelviewInv(_inv_mm)
#vector by matrix multiplication by hand
_model_light_pos[0] = _inv_mm[0] * _light_pos[0] + \
Modified: trunk/pysoy/src/bodies._bodies/Body.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 10:21:20 UTC (rev
831)
+++ trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-07 10:31:20 UTC (rev
832)
@@ -302,35 +302,32 @@
return 1
+ ##########################################################################
+ #
+ # _coreLoop Functions
+ #
+
cdef void _coreRender(self) :
if not self._mesh :
return
-
cdef gl.GLfloat mtx[16]
-
- self._get_modelview(mtx)
-
+ self._coreGetModelview(mtx)
gl.glPushMatrix()
gl.glMultMatrixf(mtx)
-
(<soy.meshes.Mesh> self._mesh)._coreRender(<void *> self)
-
gl.glPopMatrix()
- cdef void _createVerticalFogCoords(self):
+ cdef void _coreCreateVertFogCoords(self):
cdef ode.dReal *pos
cdef soy._datatypes.VertexList _verts
-
pos = <ode.dReal *> ode.dBodyGetPosition(self._bodyID)
-
if self._mesh:
_verts = (<soy.meshes.Mesh> self._mesh)._verts
_verts._uploadFogCoord( <float>pos[1] )
- cdef void _get_modelview(self, float* mtx):
+ cdef void _coreGetModelview(self, float* mtx):
cdef ode.dReal *pos
cdef ode.dReal *rot
-
pos = <ode.dReal *> ode.dBodyGetPosition(self._bodyID)
rot = <ode.dReal *> ode.dBodyGetRotation(self._bodyID)
mtx[0] = rot[0]
@@ -350,10 +347,9 @@
mtx[14] = pos[2]
mtx[15] = 1.0
- cdef void _get_inv_modelview(self, float* mtx):
+ cdef void _coreGetModelviewInv(self, float* mtx):
cdef ode.dReal *pos
cdef ode.dReal *rot
-
pos = <ode.dReal *> ode.dBodyGetPosition(self._bodyID)
rot = <ode.dReal *> ode.dBodyGetRotation(self._bodyID)
mtx[0] = rot[0]
@@ -372,5 +368,3 @@
mtx[13] = -pos[1]
mtx[14] = -pos[2]
mtx[15] = 1.0
-
-
Modified: trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
===================================================================
--- trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2008-02-07
10:21:20 UTC (rev 831)
+++ trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2008-02-07
10:31:20 UTC (rev 832)
@@ -42,11 +42,11 @@
cdef void _create(self)
cdef void _destroy(self)
cdef int _isActive(self)
+ cdef void poke(self, vector)
cdef void _coreRender(self)
- cdef void _createVerticalFogCoords(self)
- cdef void poke(self, vector)
- cdef void _get_modelview (self, float*)
- cdef void _get_inv_modelview(self, float*)
+ cdef void _coreCreateVertFogCoords (self)
+ cdef void _coreGetModelview (self, float*)
+ cdef void _coreGetModelviewInv (self, float*)
cdef class Camera (Body) :
Modified: trunk/pysoy/src/meshes/Liquid.pxi
===================================================================
--- trunk/pysoy/src/meshes/Liquid.pxi 2008-02-07 10:21:20 UTC (rev 831)
+++ trunk/pysoy/src/meshes/Liquid.pxi 2008-02-07 10:31:20 UTC (rev 832)
@@ -91,7 +91,7 @@
gl.glTranslatef(-pos[0],-pos[1], -pos[2])
for i from 0 <= i < _scene._bodies.current:
if body != (<void*> _scene._bodies.list[i]):
- (<soy.bodies._bodies.Body>
_scene._bodies.list[i])._createVerticalFogCoords()
+ (<soy.bodies._bodies.Body>
_scene._bodies.list[i])._coreCreateVertFogCoords()
(<soy.bodies._bodies.Body> _scene._bodies.list[i])._coreRender()
gl.glPopMatrix()
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
