Author: ArcRiley
Date: 2008-03-08 20:38:22 -0500 (Sat, 08 Mar 2008)
New Revision: 1113
Modified:
trunk/pysoy/src/actions/Force.pxi
trunk/pysoy/src/actions/soy.actions.pxd
trunk/pysoy/src/models/Liquid.pxi
trunk/pysoy/src/models/Shape.pxi
trunk/pysoy/src/models/soy.models.pyx
Log:
Ticket #943 :
* upgraded soy.models and soy.actions for soy.bodies move
Modified: trunk/pysoy/src/actions/Force.pxi
===================================================================
--- trunk/pysoy/src/actions/Force.pxi 2008-03-09 01:25:55 UTC (rev 1112)
+++ trunk/pysoy/src/actions/Force.pxi 2008-03-09 01:38:22 UTC (rev 1113)
@@ -1,4 +1,4 @@
-# PySoy action.Force class
+# PySoy's action.Force class
#
# Copyright (C) 2006,2007,2008 PySoy Group
#
@@ -18,13 +18,13 @@
# $Id$
cdef class Force (Action) :
- '''PySoy Force
+ '''soy.actions.Force
Adds velocity to it's target.
First argument is the force's target, an instance of soy.bodies.Body.
'''
def __cinit__(self, target, xforce, yforce, zforce, *args, **kw) :
- if not isinstance(target, soy.bodies._bodies.Body) :
+ if not isinstance(target, soy.bodies.Body) :
raise TypeError('first argument must be an instance of soy.bodies.Body')
self._target = target
self._xforce = xforce
Modified: trunk/pysoy/src/actions/soy.actions.pxd
===================================================================
--- trunk/pysoy/src/actions/soy.actions.pxd 2008-03-09 01:25:55 UTC (rev
1112)
+++ trunk/pysoy/src/actions/soy.actions.pxd 2008-03-09 01:38:22 UTC (rev
1113)
@@ -1,4 +1,4 @@
-# PySoy Actions Declarations
+# PySoy's actions declarations
#
# Copyright (C) 2006,2007,2008 PySoy Group
#
@@ -17,13 +17,13 @@
#
# $Id$
-cimport soy.bodies._bodies
+cimport soy.bodies
cdef class Action :
- cdef void _perform (self, unsigned int)
+ cdef void _perform (self, unsigned int)
cdef class Force (Action) :
- cdef soy.bodies._bodies.Body _target
+ cdef soy.bodies.Body _target
cdef int _xforce
cdef int _yforce
cdef int _zforce
Modified: trunk/pysoy/src/models/Liquid.pxi
===================================================================
--- trunk/pysoy/src/models/Liquid.pxi 2008-03-09 01:25:55 UTC (rev 1112)
+++ trunk/pysoy/src/models/Liquid.pxi 2008-03-09 01:38:22 UTC (rev 1113)
@@ -82,7 +82,7 @@
cdef ode.dReal* _pos
cdef gl.GLfloat _diffuse[4]
cdef float _halfSize[3]
- _pos = (<soy.bodies._bodies.Body> _body)._position
+ _pos = (<soy.bodies.Body> _body)._position
(<soy.colors.Color> self._color)._getRGBA(_diffuse)
_halfSize[0] = self._size[0]/2.0
_halfSize[1] = self._size[1]/2.0
@@ -112,12 +112,12 @@
gl.glTranslatef(-pos[0],-pos[1], -pos[2])
#
# We need not _iterStart here since _bodies is already iterating via Scene
- _scene = <soy.scenes.Scene> (<soy.bodies._bodies.Body> _body)._scene
+ _scene = <soy.scenes.Scene> (<soy.bodies.Body> _body)._scene
for _i from 0 <= _i < _scene._bodies._current :
if _body != (<void*> _scene._bodies._list[_i]) :
- (<soy.bodies._bodies.Body>
+ (<soy.bodies.Body>
_scene._bodies._list[_i])._coreCreateVertFogCoords()
- (<soy.bodies._bodies.Body>
+ (<soy.bodies.Body>
_scene._bodies._list[_i])._render()
gl.glPopMatrix()
gl.glDisableClientState(gl.GL_FOG_COORDINATE_ARRAY_EXT)
Modified: trunk/pysoy/src/models/Shape.pxi
===================================================================
--- trunk/pysoy/src/models/Shape.pxi 2008-03-09 01:25:55 UTC (rev 1112)
+++ trunk/pysoy/src/models/Shape.pxi 2008-03-09 01:38:22 UTC (rev 1113)
@@ -57,11 +57,11 @@
cdef int _shapeclass
#
# Don't attempt to render a non-existant shape
- if (<soy.bodies._bodies.Body> _body)._shape == NULL :
+ if (<soy.bodies.Body> _body)._shape == NULL :
return
#
# Grab the body's shape
- _shape = <soy.shapes.Shape> (<soy.bodies._bodies.Body> _body)._shape
+ _shape = <soy.shapes.Shape> (<soy.bodies.Body> _body)._shape
_shapeclass = ode.dGeomGetClass(_shape._geomID)
#
# Bind the material
Modified: trunk/pysoy/src/models/soy.models.pyx
===================================================================
--- trunk/pysoy/src/models/soy.models.pyx 2008-03-09 01:25:55 UTC (rev
1112)
+++ trunk/pysoy/src/models/soy.models.pyx 2008-03-09 01:38:22 UTC (rev
1113)
@@ -24,7 +24,7 @@
__version__ = 'Trunk (r'+'$Rev: 1090 $'[6:-2]+')'
cimport ode
-cimport soy.bodies._bodies
+cimport soy.bodies
cimport soy.colors
cimport soy.scenes
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
