[Pyode-commits] pyode/src body.pyx,1.2,1.3 contact.pyx,1.1,1.2 declarations.pyx,1.2,1.3 geoms.pyx,1.1,1.2 mass.pyx,1.4,1.5 ode.pyx,1.3,1.4 space.pyx,1.1,1.2

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

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

Modified Files:
	body.pyx contact.pyx declarations.pyx geoms.pyx mass.pyx 
	ode.pyx space.pyx 
Log Message:
Doc string updates. There are no warnings from epydoc anymore. Cleared the cleanup flag in the Space object.

Index: body.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/body.pyx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** body.pyx	12 Jul 2004 12:35:26 -0000	1.2
--- body.pyx	12 Jul 2004 17:30:08 -0000	1.3
***************
*** 147,151 ****
      # setLinearVel
      def setLinearVel(self, vel):
!         """setLinearVel(pos)
  
          Set the linear velocity of the body.
--- 147,151 ----
      # setLinearVel
      def setLinearVel(self, vel):
!         """setLinearVel(vel)
  
          Set the linear velocity of the body.
***************
*** 169,173 ****
      # setAngularVel
      def setAngularVel(self, vel):
!         """setAngularVel(pos)
  
          Set the angular velocity of the body.
--- 169,173 ----
      # setAngularVel
      def setAngularVel(self, vel):
!         """setAngularVel(vel)
  
          Set the angular velocity of the body.

Index: space.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/space.pyx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** space.pyx	27 Jun 2004 20:46:17 -0000	1.1
--- space.pyx	12 Jul 2004 17:30:08 -0000	1.2
***************
*** 12,17 ****
      (see ODE documentation).
  
!     space = Space(type=0)   # Create a SimpleSpace
!     space = Space(type=1)   # Create a HashSpace
      """
  
--- 12,17 ----
      (see ODE documentation).
  
!      >>> space = Space(type=0)   # Create a SimpleSpace
!      >>> space = Space(type=1)   # Create a HashSpace
      """
  
***************
*** 27,30 ****
--- 27,31 ----
              self.sid = dHashSpaceCreate(0)
  
+         dSpaceSetCleanup(self.sid, 0)
          _geom_c2py_lut[<long>self.sid]=self
  
***************
*** 61,64 ****
--- 62,72 ----
          return id
  
+     def getNumGeoms(self):
+         """getNumGeoms() -> int
+ 
+         Return the number of geoms contained within the space.
+         """
+         return dSpaceGetNumGeoms(self.sid)
+ 
      def collide(self, arg, callback):
          """Do collision detection.

Index: geoms.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/geoms.pyx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** geoms.pyx	27 Jun 2004 20:46:17 -0000	1.1
--- geoms.pyx	12 Jul 2004 17:30:08 -0000	1.2
***************
*** 55,61 ****
  
      def setBody(self, Body body):
!         """Associate the geom to a body or remove an association.
  
          @param body: The Body object or None.
          """
          
--- 55,64 ----
  
      def setBody(self, Body body):
!         """setBody(body)
! 
!         Associate the geom to a body or remove an association.
  
          @param body: The Body object or None.
+         @type body: Body
          """
          

Index: mass.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/mass.pyx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mass.pyx	5 Jul 2004 20:01:37 -0000	1.4
--- mass.pyx	12 Jul 2004 17:30:08 -0000	1.5
***************
*** 155,159 ****
          relative to the body frame.
  
!         @param t Translation vector (x, y, z)
          @type t: 3-tuple of floats
          """
--- 155,159 ----
          relative to the body frame.
  
!         @param t: Translation vector (x, y, z)
          @type t: 3-tuple of floats
          """

Index: declarations.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/declarations.pyx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** declarations.pyx	3 Jul 2004 16:57:41 -0000	1.2
--- declarations.pyx	12 Jul 2004 17:30:08 -0000	1.3
***************
*** 17,20 ****
--- 17,23 ----
      void free(void*)
  
+ cdef extern from "stdio.h":
+     int printf(char*)
+ 
  # Include the basic floating point type -> dReal  (either float or double)
  include "_precision.pyx"
***************
*** 273,276 ****
--- 276,284 ----
      void dHashSpaceSetLevels (dSpaceID space, int minlevel, int maxlevel)
  
+     void dSpaceSetCleanup (dSpaceID space, int mode)
+     int dSpaceGetCleanup (dSpaceID space)
+ 
+     int dSpaceGetNumGeoms (dSpaceID)
+ 
      # Geom
      dGeomID dCreateSphere (dSpaceID space, dReal radius)

Index: ode.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/ode.pyx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ode.pyx	12 Jul 2004 12:36:14 -0000	1.3
--- ode.pyx	12 Jul 2004 17:30:08 -0000	1.4
***************
*** 27,61 ****
  There are the following classes and functions:
  
! - World
! - Body
! - JointGroup
! - Contact
! - Space
! - Mass
  
  Joint classes:
  
! - BallJoint
! - HingeJoint
! - Hinge2Joint
! - SliderJoint
! - UniversalJoint
! - FixedJoint
! - ContactJoint
! - AMotor
  
  Geom classes:
  
! - GeomSphere
! - GeomBox
! - GeomPlane
! - GeomCCylinder
! - GeomRay
! - GeomTransform
  
  Functions:
  
! - CloseODE()
! - collide()
  
  """
--- 27,61 ----
  There are the following classes and functions:
  
!  - World
!  - Body
!  - JointGroup
!  - Contact
!  - Space
!  - Mass
  
  Joint classes:
  
!  - BallJoint
!  - HingeJoint
!  - Hinge2Joint
!  - SliderJoint
!  - UniversalJoint
!  - FixedJoint
!  - ContactJoint
!  - AMotor
  
  Geom classes:
  
!  - GeomSphere
!  - GeomBox
!  - GeomPlane
!  - GeomCCylinder
!  - GeomRay
!  - GeomTransform
  
  Functions:
  
!  - CloseODE()
!  - collide()
  
  """

Index: contact.pyx
===================================================================
RCS file: /cvsroot/pyode/pyode/src/contact.pyx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** contact.pyx	27 Jun 2004 20:46:17 -0000	1.1
--- contact.pyx	12 Jul 2004 17:30:08 -0000	1.2
***************
*** 5,15 ****
  
      A Contact object stores all the input parameters for a ContactJoint.
!     This class wraps the ODE dContact structure which has 3 components:
  
!     struct dContact {
!       dSurfaceParameters surface;
!       dContactGeom geom;
!       dVector3 fdir1;
!     };    
  
      This wrapper class provides methods to get and set the items of those
--- 5,15 ----
  
      A Contact object stores all the input parameters for a ContactJoint.
!     This class wraps the ODE dContact structure which has 3 components::
  
!      struct dContact {
!        dSurfaceParameters surface;
!        dContactGeom geom;
!        dVector3 fdir1;
!      };    
  
      This wrapper class provides methods to get and set the items of those