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

remove some warnings

Browse Source
This commit is contained in:
erwin.coumans
2010-07-20 23:37:11 +00:00
parent f3664551b5
commit 4eddfce03e
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos/OpenGL/DemoApplication.cpp
View File

@@ -77,6 +77,8 @@ m_cameraUp(0,1,0),
m_forwardAxis(2), m_forwardAxis(2),
m_glutScreenWidth(0), m_glutScreenWidth(0),
m_glutScreenHeight(0), m_glutScreenHeight(0),
m_frustumZNear(1.f),
m_frustumZFar(10000.f),
m_ortho(0), m_ortho(0),
m_ShootBoxInitialSpeed(40.f), m_ShootBoxInitialSpeed(40.f),
m_stepping(true), m_stepping(true),
@@ -85,9 +87,7 @@ m_idle(false),
m_enableshadows(false), m_enableshadows(false),
m_sundirection(btVector3(1,-2,1)*1000), m_sundirection(btVector3(1,-2,1)*1000),
m_defaultContactProcessingThreshold(BT_LARGE_FLOAT), m_defaultContactProcessingThreshold(BT_LARGE_FLOAT)
m_frustumZNear(1.f),
m_frustumZFar(10000.f)
{ {
#ifndef BT_NO_PROFILE #ifndef BT_NO_PROFILE
m_profileIterator = CProfileManager::Get_Iterator(); m_profileIterator = CProfileManager::Get_Iterator();

4
Demos/OpenGL/GL_DialogWindow.cpp
View File

@@ -341,8 +341,8 @@ void GL_SliderControl::draw(int& parentHorPos2,int& parentVertPos2,btScalar delt
btVector3 rgb(1,1,1); btVector3 rgb(1,1,1);
btSliderConstraint* pSlider = (btSliderConstraint*)m_constraint; // btSliderConstraint* pSlider = (btSliderConstraint*)m_constraint;
btScalar currPos = pSlider->getLinearPos(); // btScalar currPos = pSlider->getLinearPos();
// if(currPos < pSlider->getLowerLinLimit()) currPos = pSlider->getLowerLinLimit(); // if(currPos < pSlider->getLowerLinLimit()) currPos = pSlider->getLowerLinLimit();
// if(currPos > pSlider->getUpperLinLimit()) currPos = pSlider->getUpperLinLimit(); // if(currPos > pSlider->getUpperLinLimit()) currPos = pSlider->getUpperLinLimit();
// m_fraction = (currPos - pSlider->getLowerLinLimit()) / (pSlider->getUpperLinLimit() - pSlider->getLowerLinLimit()); // m_fraction = (currPos - pSlider->getLowerLinLimit()) / (pSlider->getUpperLinLimit() - pSlider->getLowerLinLimit());

3
Demos/SliderConstraintDemo/SliderConstraintDemo.cpp
View File

@@ -169,7 +169,8 @@ void SliderConstraintDemo::initPhysics()
btTransform groundTransform; btTransform groundTransform;
groundTransform.setIdentity(); groundTransform.setIdentity();
groundTransform.setOrigin(btVector3(0,-76,0)); groundTransform.setOrigin(btVector3(0,-76,0));
btRigidBody* groundBody = localCreateRigidBody(0, groundTransform, groundShape); btRigidBody* groundBody;
groundBody = localCreateRigidBody(0, groundTransform, groundShape);
// add box shape (will be reused for all bodies) // add box shape (will be reused for all bodies)
btCollisionShape* shape = new btBoxShape(btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)); btCollisionShape* shape = new btBoxShape(btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS));

1
src/BulletCollision/CollisionShapes/btCompoundShape.cpp
View File

@@ -52,6 +52,7 @@ void btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio
//m_childTransforms.push_back(localTransform); //m_childTransforms.push_back(localTransform);
//m_childShapes.push_back(shape); //m_childShapes.push_back(shape);
btCompoundShapeChild child; btCompoundShapeChild child;
child.m_node = 0;
child.m_transform = localTransform; child.m_transform = localTransform;
child.m_childShape = shape; child.m_childShape = shape;
child.m_childShapeType = shape->getShapeType(); child.m_childShapeType = shape->getShapeType();

2
src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
View File

@@ -170,7 +170,7 @@ public:
btScalar appliedImpulse = m_pointCache[insertIndex].mConstraintRow[0].mAccumImpulse; btScalar appliedImpulse = m_pointCache[insertIndex].mConstraintRow[0].mAccumImpulse;
btScalar appliedLateralImpulse1 = m_pointCache[insertIndex].mConstraintRow[1].mAccumImpulse; btScalar appliedLateralImpulse1 = m_pointCache[insertIndex].mConstraintRow[1].mAccumImpulse;
btScalar appliedLateralImpulse2 = m_pointCache[insertIndex].mConstraintRow[2].mAccumImpulse; btScalar appliedLateralImpulse2 = m_pointCache[insertIndex].mConstraintRow[2].mAccumImpulse;
bool isLateralFrictionInitialized = m_pointCache[insertIndex].m_lateralFrictionInitialized; // bool isLateralFrictionInitialized = m_pointCache[insertIndex].m_lateralFrictionInitialized;

3
src/BulletDynamics/Character/btKinematicCharacterController.cpp
View File

@@ -348,7 +348,8 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co
if (callback.hasHit()) if (callback.hasHit())
{ {
// we moved only a fraction // we moved only a fraction
btScalar hitDistance = (callback.m_hitPointWorld - m_currentPosition).length(); btScalar hitDistance;
hitDistance = (callback.m_hitPointWorld - m_currentPosition).length();
// m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); // m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction);