diff --git a/Demos/ConstraintDemo/ConstraintDemo.cpp b/Demos/ConstraintDemo/ConstraintDemo.cpp index 454161d7e..7dbab285f 100644 --- a/Demos/ConstraintDemo/ConstraintDemo.cpp +++ b/Demos/ConstraintDemo/ConstraintDemo.cpp @@ -107,7 +107,7 @@ void ConstraintDemo::initPhysics() (body1->getCenterOfMassTransform().getBasis().inverse()*(body1->getCenterOfMassTransform().getBasis() * axisInA)) : body0->getCenterOfMassTransform().getBasis() * axisInA; - btTypedConstraint* p2p = new btPoint2PointConstraint(*body0,*body1,pivotInA,pivotInB); + //btTypedConstraint* p2p = new btPoint2PointConstraint(*body0,*body1,pivotInA,pivotInB); btTypedConstraint* hinge = new btHingeConstraint(*body0,*body1,pivotInA,pivotInB,axisInA,axisInB); m_dynamicsWorld->addConstraint(hinge);//p2p); diff --git a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp index 64e883c16..d30a59e75 100644 --- a/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp @@ -1643,8 +1643,6 @@ void ConcaveDemo::initPhysics() dispatcher->registerCollisionCreateFunc(STATIC_PLANE_PROXYTYPE,GIMPACT_SHAPE_PROXYTYPE,m_gimpactCollisionCreateFunc); dispatcher->registerCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE,STATIC_PLANE_PROXYTYPE,m_gimpactCollisionCreateFunc); - - bool isDynamic = false; float mass = 0.f; btTransform startTransform; startTransform.setIdentity(); @@ -1842,7 +1840,6 @@ void ConcaveDemo::shootTrimesh(const btVector3& destination) if (m_dynamicsWorld) { - bool isDynamic = true; float mass = 4.f; btTransform startTransform; startTransform.setIdentity(); diff --git a/Extras/GIMPACT/include/GIMPACT/gim_geometry.h b/Extras/GIMPACT/include/GIMPACT/gim_geometry.h index 67b4c332a..5cf277b5c 100644 --- a/Extras/GIMPACT/include/GIMPACT/gim_geometry.h +++ b/Extras/GIMPACT/include/GIMPACT/gim_geometry.h @@ -1339,7 +1339,7 @@ Last column is added as the position */ #define COFACTOR_4X4(a,m) \ { \ - int i,j; \ + unsigned int i,j; \ \ for (i=0; i<4; i++) { \ for (j=0; j<4; j++) { \ @@ -1389,11 +1389,11 @@ Last column is added as the position */ #define ADJOINT_4X4(a,m) \ { \ - int _i_,_j_; \ + unsigned int _i_,_j_; \ \ for (_i_=0; _i_<4; _i_++) { \ - for (_j_=0; _j_<4; _j_++) { \ - COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \ + for (_j_=0; _j_<4; _j_++) { \ + COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \ } \ } \ }\ @@ -1438,11 +1438,11 @@ Last column is added as the position */ #define SCALE_ADJOINT_4X4(a,s,m) \ { \ - char _i_,_j_; \ + unsigned int _i_,_j_; \ for (_i_=0; _i_<4; _i_++) { \ - for (_j_=0; _j_<4; _j_++) { \ - COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \ - a[_j_][_i_] *= s; \ + for (_j_=0; _j_<4; _j_++) { \ + COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \ + a[_j_][_i_] *= s; \ } \ } \ }\