source:
downloads/ogreode/fix_and_remove_demos.patch
@
22
Last change on this file since 22 was 22, checked in by nicolasc, 17 years ago | |
---|---|
File size: 4.5 KB |
-
Makefile.am
diff -upNr ogreode/Makefile.am ogreode-patched/Makefile.am
old new 1 SUBDIRS = include src prefab loader demos1 SUBDIRS = include src prefab loader 2 2 3 3 pkgconfigdir = $(libdir)/pkgconfig 4 4 pkgconfig_DATA = OgreOde_Core.pc OgreOde_Prefab.pc OgreOde_Loader.pc -
src/OgreOdeBody.cpp
diff -upNr ogreode/src/OgreOdeBody.cpp ogreode-patched/src/OgreOdeBody.cpp
old new int Body::getJointCount() 520 520 //----------------------------------------------------------------------- 521 521 Joint* Body::getJoint(int index) 522 522 { 523 return (Joint*)_world->getJointList().findItem(( unsigned int)dBodyGetJoint(_body,index));523 return (Joint*)_world->getJointList().findItem((long unsigned int)dBodyGetJoint(_body,index)); 524 524 } 525 525 //----------------------------------------------------------------------- 526 526 size_t Body::getGeometryCount() … … Body::~Body() 717 717 destroyDebugNode(); 718 718 delete _mass; 719 719 720 _world->getBodyList().unregisterItem(( unsigned int)_body);720 _world->getBodyList().unregisterItem((long unsigned int)_body); 721 721 dBodyDestroy(_body); 722 722 } 723 723 … … bool Body::collidePlaneBounds(void* data 852 852 853 853 } 854 854 return collided; 855 } 856 No newline at end of file 855 } -
src/OgreOdeGeometry.cpp
diff -upNr ogreode/src/OgreOdeGeometry.cpp ogreode-patched/src/OgreOdeGeometry.cpp
old new void Geometry::setDebugContact(const boo 211 211 { 212 212 _debug_contacts = new DebugContact*[_max_contacts]; 213 213 for (unsigned int i = 0; i < _max_contacts; i++) 214 _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString( (int)_geom) +214 _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) + 215 215 "_Contact_" + 216 216 Ogre::StringConverter::toString(i), 217 217 _world); … … const AxisAlignedBox& Geometry::getAxisA 273 273 //------------------------------------------------------------------------------------------------ 274 274 Space* Geometry::getSpace() 275 275 { 276 return (Space*)_world->getSpaceList().findItem(( unsigned int)dGeomGetSpace(_geom));276 return (Space*)_world->getSpaceList().findItem((long unsigned int)dGeomGetSpace(_geom)); 277 277 } 278 278 279 279 … … void Geometry::setMaxContacts(unsigned i 425 425 } 426 426 _debug_contacts = new DebugContact*[max_contacts]; 427 427 for (unsigned int i = 0; i < max_contacts; i++) 428 _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString( (int)_geom) + + "_Contact_" + Ogre::StringConverter::toString(i),428 _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString(_geom) + + "_Contact_" + Ogre::StringConverter::toString(i), 429 429 _world); 430 430 } 431 431 _max_contacts = max_contacts; -
src/OgreOdeJoint.cpp
diff -upNr ogreode/src/OgreOdeJoint.cpp ogreode-patched/src/OgreOdeJoint.cpp
old new dJointGroupID JointGroup::getJointGroupI 25 25 26 26 unsigned long JointGroup::getID() 27 27 { 28 return ( unsigned long)_joint_group;28 return (long unsigned long)_joint_group; 29 29 } 30 30 31 31 void JointGroup::empty() … … void JointGroup::empty() 35 35 36 36 JointGroup::~JointGroup() 37 37 { 38 _world->getJointGroupList().unregisterItem(( unsigned int)_joint_group);38 _world->getJointGroupList().unregisterItem((long unsigned int)_joint_group); 39 39 dJointGroupDestroy(_joint_group); 40 40 } 41 41 -
src/OgreOdeSpace.cpp
diff -upNr ogreode/src/OgreOdeSpace.cpp ogreode-patched/src/OgreOdeSpace.cpp
old new int Space::getGeometryCount() 62 62 //------------------------------------------------------------------------------------------------ 63 63 Geometry* Space::getGeometry(int index) 64 64 { 65 return (Geometry*) _world->getGeometryList().findItem(( unsigned int)dSpaceGetGeom(_space,index));65 return (Geometry*) _world->getGeometryList().findItem((long unsigned int)dSpaceGetGeom(_space,index)); 66 66 } 67 67 //------------------------------------------------------------------------------------------------ 68 68 void Space::registerSpace()
Note: See TracBrowser
for help on using the repository browser.