[22] | 1 | diff -upNr ogreode/Makefile.am ogreode-patched/Makefile.am |
---|
| 2 | --- ogreode/Makefile.am 2006-12-20 14:09:22.000000000 +0100 |
---|
| 3 | +++ ogreode-patched/Makefile.am 2008-03-02 16:17:31.000000000 +0100 |
---|
| 4 | @@ -1,4 +1,4 @@ |
---|
| 5 | -SUBDIRS = include src prefab loader demos |
---|
| 6 | +SUBDIRS = include src prefab loader |
---|
| 7 | |
---|
| 8 | pkgconfigdir = $(libdir)/pkgconfig |
---|
| 9 | pkgconfig_DATA = OgreOde_Core.pc OgreOde_Prefab.pc OgreOde_Loader.pc |
---|
| 10 | diff -upNr ogreode/src/OgreOdeBody.cpp ogreode-patched/src/OgreOdeBody.cpp |
---|
| 11 | --- ogreode/src/OgreOdeBody.cpp 2007-10-19 16:19:08.000000000 +0200 |
---|
| 12 | +++ ogreode-patched/src/OgreOdeBody.cpp 2008-03-02 16:16:49.000000000 +0100 |
---|
| 13 | @@ -520,7 +520,7 @@ int Body::getJointCount() |
---|
| 14 | //----------------------------------------------------------------------- |
---|
| 15 | Joint* Body::getJoint(int index) |
---|
| 16 | { |
---|
| 17 | - return (Joint*)_world->getJointList().findItem((unsigned int)dBodyGetJoint(_body,index)); |
---|
| 18 | + return (Joint*)_world->getJointList().findItem((long unsigned int)dBodyGetJoint(_body,index)); |
---|
| 19 | } |
---|
| 20 | //----------------------------------------------------------------------- |
---|
| 21 | size_t Body::getGeometryCount() |
---|
| 22 | @@ -717,7 +717,7 @@ Body::~Body() |
---|
| 23 | destroyDebugNode(); |
---|
| 24 | delete _mass; |
---|
| 25 | |
---|
| 26 | - _world->getBodyList().unregisterItem((unsigned int)_body); |
---|
| 27 | + _world->getBodyList().unregisterItem((long unsigned int)_body); |
---|
| 28 | dBodyDestroy(_body); |
---|
| 29 | } |
---|
| 30 | |
---|
| 31 | @@ -852,4 +852,4 @@ bool Body::collidePlaneBounds(void* data |
---|
| 32 | |
---|
| 33 | } |
---|
| 34 | return collided; |
---|
| 35 | -} |
---|
| 36 | \ No newline at end of file |
---|
| 37 | +} |
---|
| 38 | diff -upNr ogreode/src/OgreOdeGeometry.cpp ogreode-patched/src/OgreOdeGeometry.cpp |
---|
| 39 | --- ogreode/src/OgreOdeGeometry.cpp 2006-12-18 14:33:21.000000000 +0100 |
---|
| 40 | +++ ogreode-patched/src/OgreOdeGeometry.cpp 2008-03-02 16:16:49.000000000 +0100 |
---|
| 41 | @@ -211,7 +211,7 @@ void Geometry::setDebugContact(const boo |
---|
| 42 | { |
---|
| 43 | _debug_contacts = new DebugContact*[_max_contacts]; |
---|
| 44 | for (unsigned int i = 0; i < _max_contacts; i++) |
---|
| 45 | - _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) + |
---|
| 46 | + _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) + |
---|
| 47 | "_Contact_" + |
---|
| 48 | Ogre::StringConverter::toString(i), |
---|
| 49 | _world); |
---|
| 50 | @@ -273,7 +273,7 @@ const AxisAlignedBox& Geometry::getAxisA |
---|
| 51 | //------------------------------------------------------------------------------------------------ |
---|
| 52 | Space* Geometry::getSpace() |
---|
| 53 | { |
---|
| 54 | - return (Space*)_world->getSpaceList().findItem((unsigned int)dGeomGetSpace(_geom)); |
---|
| 55 | + return (Space*)_world->getSpaceList().findItem((long unsigned int)dGeomGetSpace(_geom)); |
---|
| 56 | } |
---|
| 57 | |
---|
| 58 | |
---|
| 59 | @@ -425,7 +425,7 @@ void Geometry::setMaxContacts(unsigned i |
---|
| 60 | } |
---|
| 61 | _debug_contacts = new DebugContact*[max_contacts]; |
---|
| 62 | for (unsigned int i = 0; i < max_contacts; i++) |
---|
| 63 | - _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) + + "_Contact_" + Ogre::StringConverter::toString(i), |
---|
| 64 | + _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) + + "_Contact_" + Ogre::StringConverter::toString(i), |
---|
| 65 | _world); |
---|
| 66 | } |
---|
| 67 | _max_contacts = max_contacts; |
---|
| 68 | diff -upNr ogreode/src/OgreOdeJoint.cpp ogreode-patched/src/OgreOdeJoint.cpp |
---|
| 69 | --- ogreode/src/OgreOdeJoint.cpp 2007-10-26 14:17:36.000000000 +0200 |
---|
| 70 | +++ ogreode-patched/src/OgreOdeJoint.cpp 2008-03-02 16:16:49.000000000 +0100 |
---|
| 71 | @@ -25,7 +25,7 @@ dJointGroupID JointGroup::getJointGroupI |
---|
| 72 | |
---|
| 73 | unsigned long JointGroup::getID() |
---|
| 74 | { |
---|
| 75 | - return (unsigned long)_joint_group; |
---|
| 76 | + return (long unsigned long)_joint_group; |
---|
| 77 | } |
---|
| 78 | |
---|
| 79 | void JointGroup::empty() |
---|
| 80 | @@ -35,7 +35,7 @@ void JointGroup::empty() |
---|
| 81 | |
---|
| 82 | JointGroup::~JointGroup() |
---|
| 83 | { |
---|
| 84 | - _world->getJointGroupList().unregisterItem((unsigned int)_joint_group); |
---|
| 85 | + _world->getJointGroupList().unregisterItem((long unsigned int)_joint_group); |
---|
| 86 | dJointGroupDestroy(_joint_group); |
---|
| 87 | } |
---|
| 88 | |
---|
| 89 | diff -upNr ogreode/src/OgreOdeSpace.cpp ogreode-patched/src/OgreOdeSpace.cpp |
---|
| 90 | --- ogreode/src/OgreOdeSpace.cpp 2007-10-19 16:19:08.000000000 +0200 |
---|
| 91 | +++ ogreode-patched/src/OgreOdeSpace.cpp 2008-03-02 16:16:49.000000000 +0100 |
---|
| 92 | @@ -62,7 +62,7 @@ int Space::getGeometryCount() |
---|
| 93 | //------------------------------------------------------------------------------------------------ |
---|
| 94 | Geometry* Space::getGeometry(int index) |
---|
| 95 | { |
---|
| 96 | - return (Geometry*) _world->getGeometryList().findItem((unsigned int)dSpaceGetGeom(_space,index)); |
---|
| 97 | + return (Geometry*) _world->getGeometryList().findItem((long unsigned int)dSpaceGetGeom(_space,index)); |
---|
| 98 | } |
---|
| 99 | //------------------------------------------------------------------------------------------------ |
---|
| 100 | void Space::registerSpace() |
---|