Author: EricStein
Date: 2007-07-01 04:25:35 -0400 (Sun, 01 Jul 2007)
New Revision: 317
Modified:
trunk/pysoy/include/ode.pxd
trunk/pysoy/src/_core-common/_coreLoop.pxi
Log:
Collision detection work, doesn't quite compile
Modified: trunk/pysoy/include/ode.pxd
===================================================================
--- trunk/pysoy/include/ode.pxd 2007-06-29 16:43:04 UTC (rev 316)
+++ trunk/pysoy/include/ode.pxd 2007-07-01 08:25:35 UTC (rev 317)
@@ -161,6 +161,12 @@
cdef int dSpaceGetNumGeoms ( dSpaceID )
cdef dGeomID dSpaceGetGeom ( dSpaceID, int )
+ # Collision functions
+
+ cdef void dSpaceCollide ( dSpaceID, void*, dNearCallback )
+ cdef void dSpaceCollide2 ( dGeomID, dGeomID, void*, dNearCallback )
+ cdef int dCollide ( dGeomID, dGeomID, int, dContactGeom,
int )
+
# General geom functions
cdef void dGeomDestroy ( dGeomID )
cdef void dGeomSetData ( dGeomID, void* )
Modified: trunk/pysoy/src/_core-common/_coreLoop.pxi
===================================================================
--- trunk/pysoy/src/_core-common/_coreLoop.pxi 2007-06-29 16:43:04 UTC (rev
316)
+++ trunk/pysoy/src/_core-common/_coreLoop.pxi 2007-07-01 08:25:35 UTC (rev
317)
@@ -19,6 +19,9 @@
#
# $Id$
+cdef void callback(void* data, ode.dGeomID o1, ode.dGeomID o2) :
+ return
+
cdef void _coreLoop() :
cdef int i, j
cdef int _step, _maxstep
@@ -39,7 +42,7 @@
if _step > _maxstep :
_maxstep = _step
for j from 0 <= j < _step :
- # ode.dSpaceCollide((<Scene> _scenes.list[i])._spaceID, 0, &callback)
+ ode.dSpaceCollide((<Scene> _scenes.list[i])._spaceID, NULL,
<ode.dNearCallback> &callback)
ode.dWorldQuickStep((<Scene> _scenes.list[i])._worldID,
(<Scene> _scenes.list[i])._stepSize)
# ode.dJointGroupEmpty(contactgroup)
@@ -48,4 +51,3 @@
_sleep(10)
else :
_sleep(1)
-
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
