diff --git a/Demos/BulletDinoDemo/BulletDino.c b/Demos/BulletDinoDemo/BulletDino.c index 65898b7e6..a9619f2a4 100644 --- a/Demos/BulletDinoDemo/BulletDino.c +++ b/Demos/BulletDinoDemo/BulletDino.c @@ -385,7 +385,7 @@ static GLfloat floorShadow[4][4]; static void redraw(void) { - int start, end; + int start = 0, end = 0 ; if (reportSpeed) { start = glutGet(GLUT_ELAPSED_TIME); diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp index 7989a40cd..0bceeb51f 100644 --- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp +++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp @@ -138,7 +138,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename) std::vector vertices; if ( 1 ) { - const unsigned int *src = result.mHullIndices; + //const unsigned int *src = result.mHullIndices; for (unsigned int i=0; im_angularComponentB,-normalImpulse); } -#else USE_INTERNAL_APPLY_IMPULSE +#else //USE_INTERNAL_APPLY_IMPULSE body1.applyImpulse(normal*(normalImpulse), rel_pos1); body2.applyImpulse(-normal*(normalImpulse), rel_pos2); #endif //USE_INTERNAL_APPLY_IMPULSE @@ -215,7 +215,7 @@ float resolveSingleFriction( body2.internalApplyImpulse(cpd->m_frictionWorldTangential0*body2.getInvMass(),cpd->m_frictionAngularComponent0B,-j1); body2.internalApplyImpulse(cpd->m_frictionWorldTangential1*body2.getInvMass(),cpd->m_frictionAngularComponent1B,-j2); } -#else USE_INTERNAL_APPLY_IMPULSE +#else //USE_INTERNAL_APPLY_IMPULSE body1.applyImpulse((j1 * cpd->m_frictionWorldTangential0)+(j2 * cpd->m_frictionWorldTangential1), rel_pos1); body2.applyImpulse((j1 * -cpd->m_frictionWorldTangential0)+(j2 * -cpd->m_frictionWorldTangential1), rel_pos2); #endif //USE_INTERNAL_APPLY_IMPULSE @@ -317,7 +317,7 @@ float resolveSingleCollisionCombined( btScalar Kfps = 1.f / solverInfo.m_timeStep ; - float damping = solverInfo.m_damping ; + //float damping = solverInfo.m_damping ; float Kerp = solverInfo.m_erp; float Kcor = Kerp *Kfps; @@ -350,7 +350,7 @@ float resolveSingleCollisionCombined( { body2.internalApplyImpulse(contactPoint.m_normalWorldOnB*body2.getInvMass(),cpd->m_angularComponentB,-normalImpulse); } -#else USE_INTERNAL_APPLY_IMPULSE +#else //USE_INTERNAL_APPLY_IMPULSE body1.applyImpulse(normal*(normalImpulse), rel_pos1); body2.applyImpulse(-normal*(normalImpulse), rel_pos2); #endif //USE_INTERNAL_APPLY_IMPULSE diff --git a/src/LinearMath/btGeometryUtil.cpp b/src/LinearMath/btGeometryUtil.cpp index c351ecf17..80264f9dd 100644 --- a/src/LinearMath/btGeometryUtil.cpp +++ b/src/LinearMath/btGeometryUtil.cpp @@ -165,4 +165,5 @@ void btGeometryUtil::getVerticesFromPlaneEquations(const std::vector& } } } -} \ No newline at end of file +} + diff --git a/src/LinearMath/btGeometryUtil.h b/src/LinearMath/btGeometryUtil.h index 17498fd87..714cd7a2e 100644 --- a/src/LinearMath/btGeometryUtil.h +++ b/src/LinearMath/btGeometryUtil.h @@ -36,4 +36,5 @@ class btGeometryUtil }; -#endif //BT_GEOMETRY_UTIL_H \ No newline at end of file +#endif //BT_GEOMETRY_UTIL_H +