Author: EricStein
Date: 2007-06-22 17:43:13 -0400 (Fri, 22 Jun 2007)
New Revision: 251
Modified:
trunk/pysoy/src/bodies._bodies/Body.pxi
trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
trunk/pysoy/src/bodies.fields/Field.pxi
trunk/pysoy/src/bodies.fields/Monopole.pxi
trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
Log:
Working on autofields (run from coreloop).
Modified: trunk/pysoy/src/bodies._bodies/Body.pxi
===================================================================
--- trunk/pysoy/src/bodies._bodies/Body.pxi 2007-06-22 21:11:58 UTC (rev
250)
+++ trunk/pysoy/src/bodies._bodies/Body.pxi 2007-06-22 21:43:13 UTC (rev
251)
@@ -36,7 +36,7 @@
def __dealloc__(self) :
del(self.scene)
- def poke(self, vector) :
+ cdef void poke(self, vector) :
cdef ode.dReal* vel
cdef ode.dMass _mass
if self._bodyID :
Modified: trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd
===================================================================
--- trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2007-06-22
21:11:58 UTC (rev 250)
+++ trunk/pysoy/src/bodies._bodies/soy.bodies._bodies.pxd 2007-06-22
21:43:13 UTC (rev 251)
@@ -71,6 +71,7 @@
cdef void _destroy(self)
cdef int _isActive(self)
cdef void _render(self)
+ cdef void poke(self, vector)
cdef class Camera (Body) :
Modified: trunk/pysoy/src/bodies.fields/Field.pxi
===================================================================
--- trunk/pysoy/src/bodies.fields/Field.pxi 2007-06-22 21:11:58 UTC (rev
250)
+++ trunk/pysoy/src/bodies.fields/Field.pxi 2007-06-22 21:43:13 UTC (rev
251)
@@ -26,8 +26,8 @@
forces and other changes to other bodies.
'''
- def apply(self) :
+ cdef void apply(self) :
return
- def _exert(self, other) :
+ cdef void _exert(self, other) :
return
Modified: trunk/pysoy/src/bodies.fields/Monopole.pxi
===================================================================
--- trunk/pysoy/src/bodies.fields/Monopole.pxi 2007-06-22 21:11:58 UTC (rev
250)
+++ trunk/pysoy/src/bodies.fields/Monopole.pxi 2007-06-22 21:43:13 UTC (rev
251)
@@ -29,7 +29,7 @@
def __new__(self, soy._core.Scene parent, *args, **keywords) :
self._multiplier = 0
- def apply(self) :
+ cdef void apply(self) :
cdef int i
if self.scene :
self._scene._bodies.lock()
@@ -38,13 +38,12 @@
self._exert(<soy.bodies._bodies.Body> self._scene._bodies.list[i])
self._scene._bodies.unlock()
- def _exert(self, other) :
+ cdef void _exert(self, other) :
# single dimension distances
cdef float xd, yd, zd
# direct distances
cdef float d, d2
-
- # get positions and subtract
+
this = self.position
that = other.position
xd = that[0] - this[0]
Modified: trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd
===================================================================
--- trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2007-06-22 21:11:58 UTC
(rev 250)
+++ trunk/pysoy/src/bodies.fields/soy.bodies.fields.pxd 2007-06-22 21:43:13 UTC
(rev 251)
@@ -27,7 +27,9 @@
cimport soy.bodies._bodies
cdef class Field(soy.bodies._bodies.Body) :
- cdef void _render(self)
+ cdef void apply(self)
+ cdef void _exert(self, other)
+ cdef void _render(self)
cdef class Monopole(soy.bodies.fields.Field) :
cdef float _multiplier
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
