[Pyode-commits] pyode/src declarations.pyx, 1.17, 1.18 geoms.pyx, 1.11, 1.12 joints.pyx, 1.11, 1.12 ode.pyx, 1.15, 1.16

[Matthias B. <mb...@us...>]

Update of /cvsroot/pyode/pyode/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20097/src

Modified Files:
	declarations.pyx geoms.pyx joints.pyx ode.pyx 
Log Message:
Applied some more patches from Ethan Glasser-Camp (GeomCCylinder was replaced by GeomCapsule. The old name is still available and is an alias for GeomCapsule).

Index: ode.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/ode.pyx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ode.pyx	9 Nov 2006 13:09:24 -0000	1.15
--- ode.pyx	10 Nov 2006 10:43:23 -0000	1.16
***************
*** 56,59 ****
--- 56,60 ----
   - ContactJoint
   - AMotor
+  - LMotor
   - Plane2DJoint
  
***************
*** 63,67 ****
   - GeomBox
   - GeomPlane
!  - GeomCCylinder
   - GeomRay
   - GeomTransform
--- 64,68 ----
   - GeomBox
   - GeomPlane
!  - GeomCapsule
   - GeomRay
   - GeomTransform

Index: geoms.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/geoms.pyx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** geoms.pyx	15 Nov 2004 20:16:03 -0000	1.11
--- geoms.pyx	10 Nov 2006 10:43:23 -0000	1.12
***************
*** 210,215 ****
  
  
! # GeomCCylinder
! cdef class GeomCCylinder(GeomObject):
      """Capped cylinder geometry.
  
--- 210,215 ----
  
  
! # GeomCapsule
! cdef class GeomCapsule(GeomObject):
      """Capped cylinder geometry.
  
***************
*** 219,223 ****
      Constructor::
      
!       GeomCCylinder(space=None, radius=0.5, length=1.0)
  
      The length parameter does not include the caps.
--- 219,223 ----
      Constructor::
      
!       GeomCapsule(space=None, radius=0.5, length=1.0)
  
      The length parameter does not include the caps.
***************
*** 232,236 ****
              sp = space
              sid = sp.sid
!         self.gid = dCreateCCylinder(sid, radius, length)
  #        if space!=None:
  #            space._addgeom(self)
--- 232,236 ----
              sp = space
              sid = sp.sid
!         self.gid = dCreateCapsule(sid, radius, length)
  #        if space!=None:
  #            space._addgeom(self)
***************
*** 251,259 ****
  
      def setParams(self, radius, length):
!         dGeomCCylinderSetParams(self.gid, radius, length)
  
      def getParams(self):
          cdef dReal radius, length
!         dGeomCCylinderGetParams(self.gid, &radius, &length)
          return (radius, length)
  
--- 251,259 ----
  
      def setParams(self, radius, length):
!         dGeomCapsuleSetParams(self.gid, radius, length)
  
      def getParams(self):
          cdef dReal radius, length
!         dGeomCapsuleGetParams(self.gid, &radius, &length)
          return (radius, length)
  
***************
*** 269,273 ****
          @type p: 3-sequence of floats
          """
!         return dGeomCCylinderPointDepth(self.gid, p[0], p[1], p[2])
  
  
--- 269,275 ----
          @type p: 3-sequence of floats
          """
!         return dGeomCapsulePointDepth(self.gid, p[0], p[1], p[2])
! 
! GeomCCylinder = GeomCapsule # backwards compatibility
  
  

Index: joints.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/joints.pyx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** joints.pyx	9 Nov 2006 13:09:24 -0000	1.11
--- joints.pyx	10 Nov 2006 10:43:23 -0000	1.12
***************
*** 1132,1137 ****
  
          The anum argument selects the axis to change (0,1 or 2).
  
! 	rel is (in ODE 0.7) ignored for LMotors.
  
          @param anum: Axis number
--- 1132,1141 ----
  
          The anum argument selects the axis to change (0,1 or 2).
+         Each axis can have one of three "relative orientation" modes,
+         selected by rel:
  
!         0: The axis is anchored to the global frame. 
!         1: The axis is anchored to the first body. 
!         2: The axis is anchored to the second body.
  
          @param anum: Axis number

Index: declarations.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/declarations.pyx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** declarations.pyx	9 Nov 2006 13:09:24 -0000	1.17
--- declarations.pyx	10 Nov 2006 10:43:23 -0000	1.18
***************
*** 354,358 ****
      dGeomID dCreateBox (dSpaceID space, dReal lx, dReal ly, dReal lz)
      dGeomID dCreatePlane (dSpaceID space, dReal a, dReal b, dReal c, dReal d)
!     dGeomID dCreateCCylinder (dSpaceID space, dReal radius, dReal length)
      dGeomID dCreateGeomGroup (dSpaceID space)
  
--- 354,358 ----
      dGeomID dCreateBox (dSpaceID space, dReal lx, dReal ly, dReal lz)
      dGeomID dCreatePlane (dSpaceID space, dReal a, dReal b, dReal c, dReal d)
!     dGeomID dCreateCapsule (dSpaceID space, dReal radius, dReal length)
      dGeomID dCreateGeomGroup (dSpaceID space)
  
***************
*** 360,374 ****
      void dGeomBoxSetLengths (dGeomID box, dReal lx, dReal ly, dReal lz)
      void dGeomPlaneSetParams (dGeomID plane, dReal a, dReal b, dReal c, dReal d)
!     void dGeomCCylinderSetParams (dGeomID ccylinder, dReal radius, dReal length)
  
      dReal dGeomSphereGetRadius (dGeomID sphere)
      void  dGeomBoxGetLengths (dGeomID box, dVector3 result)
      void  dGeomPlaneGetParams (dGeomID plane, dVector4 result)
!     void  dGeomCCylinderGetParams (dGeomID ccylinder, dReal *radius, dReal *length)
  
      dReal dGeomSpherePointDepth (dGeomID sphere, dReal x, dReal y, dReal z)
      dReal dGeomBoxPointDepth (dGeomID box, dReal x, dReal y, dReal z)
      dReal dGeomPlanePointDepth (dGeomID plane, dReal x, dReal y, dReal z)
!     dReal dGeomCCylinderPointDepth (dGeomID ccylinder, dReal x, dReal y, dReal z)
  
      dGeomID dCreateRay (dSpaceID space, dReal length)
--- 360,374 ----
      void dGeomBoxSetLengths (dGeomID box, dReal lx, dReal ly, dReal lz)
      void dGeomPlaneSetParams (dGeomID plane, dReal a, dReal b, dReal c, dReal d)
!     void dGeomCapsuleSetParams (dGeomID ccylinder, dReal radius, dReal length)
  
      dReal dGeomSphereGetRadius (dGeomID sphere)
      void  dGeomBoxGetLengths (dGeomID box, dVector3 result)
      void  dGeomPlaneGetParams (dGeomID plane, dVector4 result)
!     void  dGeomCapsuleGetParams (dGeomID ccylinder, dReal *radius, dReal *length)
  
      dReal dGeomSpherePointDepth (dGeomID sphere, dReal x, dReal y, dReal z)
      dReal dGeomBoxPointDepth (dGeomID box, dReal x, dReal y, dReal z)
      dReal dGeomPlanePointDepth (dGeomID plane, dReal x, dReal y, dReal z)
!     dReal dGeomCapsulePointDepth (dGeomID ccylinder, dReal x, dReal y, dReal z)
  
      dGeomID dCreateRay (dSpaceID space, dReal length)