Author: ArcRiley
Date: 2008-02-26 17:34:56 -0500 (Tue, 26 Feb 2008)
New Revision: 999
Modified:
trunk/pysoy/src/bodies._bodies/Body.pxi
Log:
Ticket #934 :
* changed several uses of ode.dBodyGet* to self._* in bodies.Body
Modified: trunk/pysoy/src/bodies._bodies/Body.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-26 21:59:09 UTC (rev
998)
+++ trunk/pysoy/src/bodies._bodies/Body.pxi 2008-02-26 22:34:56 UTC (rev
999)
@@ -171,14 +171,7 @@
Defaults to (0.0, 0.0, 0.0).
'''
def __get__(self) :
- cdef ode.dReal *real
- if self._bodyID :
- self._scene._stepLock()
- real = <ode.dReal *> ode.dBodyGetAngularVel(self._bodyID)
- self._scene._stepUnLock()
- return (real[0], real[1], real[2])
- else :
- return (self._angularVel[0], self._angularVel[1], self._angularVel[2])
+ return (self._angularVel[0], self._angularVel[1], self._angularVel[2])
def __set__(self, value) :
if type(value)!=tuple and type(value)!=list :
raise TypeError('Must provide a tuple or list')
@@ -201,14 +194,7 @@
Defaults to (0.0, 0.0, 0.0).
'''
def __get__(self) :
- cdef ode.dReal *real
- if self._bodyID :
- self._scene._stepLock()
- real = <ode.dReal *> ode.dBodyGetLinearVel(self._bodyID)
- self._scene._stepUnLock()
- return (real[0], real[1], real[2])
- else :
- return (self._linearVel[0], self._linearVel[1], self._linearVel[2])
+ return (self._linearVel[0], self._linearVel[1], self._linearVel[2])
def __set__(self, value) :
if type(value)!=tuple and type(value)!=list :
raise TypeError('Must provide a tuple or list')
@@ -316,12 +302,10 @@
gl.glPopMatrix()
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] )
+ _verts._uploadFogCoord( <float> self._position[1] )
cdef void _coreGetModelview(self, float* mtx):
mtx[0] = self._rotation[0]
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
