From: <dan...@us...> - 2008-08-07 21:14:10
|
Revision: 1537 http://opende.svn.sourceforge.net/opende/?rev=1537&view=rev Author: danielosmari Date: 2008-08-07 21:14:19 +0000 (Thu, 07 Aug 2008) Log Message: ----------- removed static functions, to fix static build issues with drawstuff Modified Paths: -------------- trunk/include/ode/mass.h trunk/ode/src/mass.cpp Modified: trunk/include/ode/mass.h =================================================================== --- trunk/include/ode/mass.h 2008-07-24 22:18:40 UTC (rev 1536) +++ trunk/include/ode/mass.h 2008-08-07 21:14:19 UTC (rev 1537) @@ -81,15 +81,10 @@ // Backwards compatible API -ODE_API_DEPRECATED static void dMassSetCappedCylinder( - dMass *a, dReal b, int c, dReal d, dReal e) -{ return dMassSetCapsule(a,b,c,d,e); } +ODE_API ODE_API_DEPRECATED void dMassSetCappedCylinder(dMass *a, dReal b, int c, dReal d, dReal e); +ODE_API ODE_API_DEPRECATED void dMassSetCappedCylinderTotal(dMass *a, dReal b, int c, dReal d, dReal e); -ODE_API_DEPRECATED static void dMassSetCappedCylinderTotal( - dMass *a, dReal b, int c, dReal d, dReal e) -{ return dMassSetCapsuleTotal(a,b,c,d,e); } - struct dMass { dReal mass; dVector4 c; Modified: trunk/ode/src/mass.cpp =================================================================== --- trunk/ode/src/mass.cpp 2008-07-24 22:18:40 UTC (rev 1536) +++ trunk/ode/src/mass.cpp 2008-08-07 21:14:19 UTC (rev 1537) @@ -539,3 +539,16 @@ a->mass += b->mass; for (i=0; i<12; i++) a->I[i] += b->I[i]; } + + +// Backwards compatible API +void dMassSetCappedCylinder(dMass *a, dReal b, int c, dReal d, dReal e) +{ + return dMassSetCapsule(a,b,c,d,e); +} + +void dMassSetCappedCylinderTotal(dMass *a, dReal b, int c, dReal d, dReal e) +{ + return dMassSetCapsuleTotal(a,b,c,d,e); +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |