From: Ethan Glasser-C. <gla...@us...> - 2008-12-24 03:34:04
|
Update of /cvsroot/pyode/pyode/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18311/src Modified Files: body.pyx contact.pyx geomobject.pyx geoms.pyx heightfield.pyx heightfielddata.pyx joints.pyx mass.pyx space.pyx trimesh.pyx trimeshdata.pyx world.pyx Log Message: Rename __new__ to __cinit__ for new Pyrex version. Index: body.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/body.pyx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** body.pyx 6 Jun 2005 13:09:30 -0000 1.6 --- body.pyx 24 Dec 2008 03:33:56 -0000 1.7 *************** *** 44,48 **** cdef object userattribs ! def __new__(self, World world not None): self.bid = dBodyCreate(world.wid) --- 44,48 ---- cdef object userattribs ! def __cinit__(self, World world not None): self.bid = dBodyCreate(world.wid) Index: joints.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/joints.pyx,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** joints.pyx 5 Jun 2007 08:42:17 -0000 1.13 --- joints.pyx 24 Dec 2008 03:33:57 -0000 1.14 *************** *** 48,52 **** cdef object jointlist ! def __new__(self): self.gid = dJointGroupCreate(0) --- 48,52 ---- cdef object jointlist ! def __cinit__(self): self.gid = dJointGroupCreate(0) *************** *** 109,113 **** cdef object userattribs ! def __new__(self, *a, **kw): self.jid = NULL self.world = None --- 109,113 ---- cdef object userattribs ! def __cinit__(self, *a, **kw): self.jid = NULL self.world = None *************** *** 264,268 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 264,268 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 336,340 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 336,340 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 490,494 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 490,494 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 576,580 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 576,580 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 715,719 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 715,719 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 871,875 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 871,875 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 906,910 **** """ ! def __new__(self, World world not None, jointgroup, Contact contact): cdef JointGroup jg cdef dJointGroupID jgid --- 906,910 ---- """ ! def __cinit__(self, World world not None, jointgroup, Contact contact): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 929,933 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 929,933 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 1102,1106 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 1102,1106 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid *************** *** 1191,1195 **** """ ! def __new__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid --- 1191,1195 ---- """ ! def __cinit__(self, World world not None, jointgroup=None): cdef JointGroup jg cdef dJointGroupID jgid Index: mass.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/mass.pyx,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mass.pyx 30 May 2006 14:23:44 -0000 1.7 --- mass.pyx 24 Dec 2008 03:33:57 -0000 1.8 *************** *** 41,45 **** cdef dMass _mass ! def __new__(self): dMassSetZero(&self._mass) --- 41,45 ---- cdef dMass _mass ! def __cinit__(self): dMassSetZero(&self._mass) Index: trimesh.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/trimesh.pyx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** trimesh.pyx 5 Jun 2007 08:42:17 -0000 1.5 --- trimesh.pyx 24 Dec 2008 03:33:57 -0000 1.6 *************** *** 39,43 **** cdef TriMeshData data ! def __new__(self, TriMeshData data not None, space=None): cdef SpaceBase sp cdef dSpaceID sid --- 39,43 ---- cdef TriMeshData data ! def __cinit__(self, TriMeshData data not None, space=None): cdef SpaceBase sp cdef dSpaceID sid Index: heightfield.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/heightfield.pyx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** heightfield.pyx 5 Jun 2007 09:03:10 -0000 1.1 --- heightfield.pyx 24 Dec 2008 03:33:57 -0000 1.2 *************** *** 32,36 **** cdef HeightfieldData data ! def __new__(self, HeightfieldData data not None, placeable=True, space=None): cdef SpaceBase sp --- 32,36 ---- cdef HeightfieldData data ! def __cinit__(self, HeightfieldData data not None, placeable=True, space=None): cdef SpaceBase sp Index: contact.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/contact.pyx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** contact.pyx 15 Nov 2004 20:16:03 -0000 1.4 --- contact.pyx 24 Dec 2008 03:33:56 -0000 1.5 *************** *** 39,43 **** cdef dContact _contact ! def __new__(self): self._contact.surface.mode = ContactBounce self._contact.surface.mu = dInfinity --- 39,43 ---- cdef dContact _contact ! def __cinit__(self): self._contact.surface.mode = ContactBounce self._contact.surface.mu = dInfinity Index: geomobject.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/geomobject.pyx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** geomobject.pyx 5 Jun 2007 08:42:17 -0000 1.5 --- geomobject.pyx 24 Dec 2008 03:33:56 -0000 1.6 *************** *** 55,59 **** cdef object __weakref__ ! def __new__(self, *a, **kw): self.gid = NULL self.space = None --- 55,59 ---- cdef object __weakref__ ! def __cinit__(self, *a, **kw): self.gid = NULL self.space = None Index: space.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/space.pyx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** space.pyx 22 Dec 2008 05:50:30 -0000 1.9 --- space.pyx 24 Dec 2008 03:33:57 -0000 1.10 *************** *** 67,71 **** # cdef object geom_dict ! def __new__(self, *a, **kw): pass --- 67,71 ---- # cdef object geom_dict ! def __cinit__(self, *a, **kw): pass *************** *** 231,235 **** """ ! def __new__(self, space=None): cdef SpaceBase sp cdef dSpaceID parentid --- 231,235 ---- """ ! def __cinit__(self, space=None): cdef SpaceBase sp cdef dSpaceID parentid *************** *** 264,268 **** """ ! def __new__(self, space=None): cdef SpaceBase sp cdef dSpaceID parentid --- 264,268 ---- """ ! def __cinit__(self, space=None): cdef SpaceBase sp cdef dSpaceID parentid *************** *** 323,327 **** """ ! def __new__(self, center, extents, depth, space=None): cdef SpaceBase sp cdef dSpaceID parentid --- 323,327 ---- """ ! def __cinit__(self, center, extents, depth, space=None): cdef SpaceBase sp cdef dSpaceID parentid Index: geoms.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/geoms.pyx,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** geoms.pyx 5 Jun 2007 08:42:17 -0000 1.14 --- geoms.pyx 24 Dec 2008 03:33:56 -0000 1.15 *************** *** 31,35 **** """ ! def __new__(self, space=None, radius=1.0): cdef SpaceBase sp cdef dSpaceID sid --- 31,35 ---- """ ! def __cinit__(self, space=None, radius=1.0): cdef SpaceBase sp cdef dSpaceID sid *************** *** 100,104 **** """ ! def __new__(self, space=None, lengths=(1.0, 1.0, 1.0)): cdef SpaceBase sp cdef dSpaceID sid --- 100,104 ---- """ ! def __cinit__(self, space=None, lengths=(1.0, 1.0, 1.0)): cdef SpaceBase sp cdef dSpaceID sid *************** *** 164,168 **** """ ! def __new__(self, space=None, normal=(0,0,1), dist=0): cdef SpaceBase sp cdef dSpaceID sid --- 164,168 ---- """ ! def __cinit__(self, space=None, normal=(0,0,1), dist=0): cdef SpaceBase sp cdef dSpaceID sid *************** *** 224,228 **** """ ! def __new__(self, space=None, radius=0.5, length=1.0): cdef SpaceBase sp cdef dSpaceID sid --- 224,228 ---- """ ! def __cinit__(self, space=None, radius=0.5, length=1.0): cdef SpaceBase sp cdef dSpaceID sid *************** *** 286,290 **** """ ! def __new__(self, space=None, radius=0.5, length=1.0): cdef SpaceBase sp cdef dSpaceID sid --- 286,290 ---- """ ! def __cinit__(self, space=None, radius=0.5, length=1.0): cdef SpaceBase sp cdef dSpaceID sid *************** *** 338,342 **** """ ! def __new__(self, space=None, rlen=1.0): cdef SpaceBase sp cdef dSpaceID sid --- 338,342 ---- """ ! def __cinit__(self, space=None, rlen=1.0): cdef SpaceBase sp cdef dSpaceID sid *************** *** 418,422 **** cdef object geom ! def __new__(self, space=None): cdef SpaceBase sp cdef dSpaceID sid --- 418,422 ---- cdef object geom ! def __cinit__(self, space=None): cdef SpaceBase sp cdef dSpaceID sid Index: heightfielddata.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/heightfielddata.pyx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** heightfielddata.pyx 14 Jun 2007 19:23:03 -0000 1.3 --- heightfielddata.pyx 24 Dec 2008 03:33:57 -0000 1.4 *************** *** 29,33 **** cdef object calltup ! def __new__(self): self.hfdid = dGeomHeightfieldDataCreate() --- 29,33 ---- cdef object calltup ! def __cinit__(self): self.hfdid = dGeomHeightfieldDataCreate() Index: world.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/world.pyx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** world.pyx 15 Nov 2004 20:16:04 -0000 1.3 --- world.pyx 24 Dec 2008 03:33:57 -0000 1.4 *************** *** 34,38 **** cdef dWorldID wid ! def __new__(self): self.wid = dWorldCreate() --- 34,38 ---- cdef dWorldID wid ! def __cinit__(self): self.wid = dWorldCreate() Index: trimeshdata.pyx =================================================================== RCS file: /cvsroot/pyode/pyode/src/trimeshdata.pyx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** trimeshdata.pyx 15 Nov 2004 20:16:04 -0000 1.4 --- trimeshdata.pyx 24 Dec 2008 03:33:57 -0000 1.5 *************** *** 28,32 **** cdef int* face_buffer ! def __new__(self): self.tmdid = dGeomTriMeshDataCreate() self.vertex_buffer = NULL --- 28,32 ---- cdef int* face_buffer ! def __cinit__(self): self.tmdid = dGeomTriMeshDataCreate() self.vertex_buffer = NULL |