Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
sjbaker
2006-11-20 06:48:45 +00:00
parent 04d41b7a0a
commit 6bb806d26b
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/ConstraintDemo/ConstraintDemo.cpp
View File

@@ -107,7 +107,7 @@ void ConstraintDemo::initPhysics()
(body1->getCenterOfMassTransform().getBasis().inverse()*(body1->getCenterOfMassTransform().getBasis() * axisInA)) : (body1->getCenterOfMassTransform().getBasis().inverse()*(body1->getCenterOfMassTransform().getBasis() * axisInA)) :
body0->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); btTypedConstraint* hinge = new btHingeConstraint(*body0,*body1,pivotInA,pivotInB,axisInA,axisInB);
m_dynamicsWorld->addConstraint(hinge);//p2p); m_dynamicsWorld->addConstraint(hinge);//p2p);

3
Demos/MovingConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -1643,8 +1643,6 @@ void ConcaveDemo::initPhysics()
dispatcher->registerCollisionCreateFunc(STATIC_PLANE_PROXYTYPE,GIMPACT_SHAPE_PROXYTYPE,m_gimpactCollisionCreateFunc); dispatcher->registerCollisionCreateFunc(STATIC_PLANE_PROXYTYPE,GIMPACT_SHAPE_PROXYTYPE,m_gimpactCollisionCreateFunc);
dispatcher->registerCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE,STATIC_PLANE_PROXYTYPE,m_gimpactCollisionCreateFunc); dispatcher->registerCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE,STATIC_PLANE_PROXYTYPE,m_gimpactCollisionCreateFunc);
bool isDynamic = false;
float mass = 0.f; float mass = 0.f;
btTransform startTransform; btTransform startTransform;
startTransform.setIdentity(); startTransform.setIdentity();
@@ -1842,7 +1840,6 @@ void ConcaveDemo::shootTrimesh(const btVector3& destination)
if (m_dynamicsWorld) if (m_dynamicsWorld)
{ {
bool isDynamic = true;
float mass = 4.f; float mass = 4.f;
btTransform startTransform; btTransform startTransform;
startTransform.setIdentity(); startTransform.setIdentity();

16
Extras/GIMPACT/include/GIMPACT/gim_geometry.h
View File

@@ -1339,7 +1339,7 @@ Last column is added as the position
*/ */
#define COFACTOR_4X4(a,m) \ #define COFACTOR_4X4(a,m) \
{ \ { \
int i,j; \ unsigned int i,j; \
\ \
for (i=0; i<4; i++) { \ for (i=0; i<4; i++) { \
for (j=0; j<4; j++) { \ for (j=0; j<4; j++) { \
@@ -1389,11 +1389,11 @@ Last column is added as the position
*/ */
#define ADJOINT_4X4(a,m) \ #define ADJOINT_4X4(a,m) \
{ \ { \
int _i_,_j_; \ unsigned int _i_,_j_; \
\ \
for (_i_=0; _i_<4; _i_++) { \ for (_i_=0; _i_<4; _i_++) { \
for (_j_=0; _j_<4; _j_++) { \ for (_j_=0; _j_<4; _j_++) { \
COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _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) \ #define SCALE_ADJOINT_4X4(a,s,m) \
{ \ { \
char _i_,_j_; \ unsigned int _i_,_j_; \
for (_i_=0; _i_<4; _i_++) { \ for (_i_=0; _i_<4; _i_++) { \
for (_j_=0; _j_<4; _j_++) { \ for (_j_=0; _j_<4; _j_++) { \
COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \ COFACTOR_4X4_IJ (a[_j_][_i_], m, _i_, _j_); \
a[_j_][_i_] *= s; \ a[_j_][_i_] *= s; \
} \ } \
} \ } \
}\ }\