diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index b09680d0a..03c3442f0 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -77,6 +77,8 @@ m_cameraUp(0,1,0), m_forwardAxis(2), m_glutScreenWidth(0), m_glutScreenHeight(0), +m_frustumZNear(1.f), +m_frustumZFar(10000.f), m_ortho(0), m_ShootBoxInitialSpeed(40.f), m_stepping(true), @@ -85,9 +87,7 @@ m_idle(false), m_enableshadows(false), m_sundirection(btVector3(1,-2,1)*1000), -m_defaultContactProcessingThreshold(BT_LARGE_FLOAT), -m_frustumZNear(1.f), -m_frustumZFar(10000.f) +m_defaultContactProcessingThreshold(BT_LARGE_FLOAT) { #ifndef BT_NO_PROFILE m_profileIterator = CProfileManager::Get_Iterator(); diff --git a/Demos/OpenGL/GL_DialogWindow.cpp b/Demos/OpenGL/GL_DialogWindow.cpp index d47f33109..b3ecae8fb 100644 --- a/Demos/OpenGL/GL_DialogWindow.cpp +++ b/Demos/OpenGL/GL_DialogWindow.cpp @@ -341,8 +341,8 @@ void GL_SliderControl::draw(int& parentHorPos2,int& parentVertPos2,btScalar delt btVector3 rgb(1,1,1); - btSliderConstraint* pSlider = (btSliderConstraint*)m_constraint; - btScalar currPos = pSlider->getLinearPos(); +// btSliderConstraint* pSlider = (btSliderConstraint*)m_constraint; +// btScalar currPos = pSlider->getLinearPos(); // if(currPos < pSlider->getLowerLinLimit()) currPos = pSlider->getLowerLinLimit(); // if(currPos > pSlider->getUpperLinLimit()) currPos = pSlider->getUpperLinLimit(); // m_fraction = (currPos - pSlider->getLowerLinLimit()) / (pSlider->getUpperLinLimit() - pSlider->getLowerLinLimit()); diff --git a/Demos/SliderConstraintDemo/SliderConstraintDemo.cpp b/Demos/SliderConstraintDemo/SliderConstraintDemo.cpp index 9b6db8a21..15e392f09 100755 --- a/Demos/SliderConstraintDemo/SliderConstraintDemo.cpp +++ b/Demos/SliderConstraintDemo/SliderConstraintDemo.cpp @@ -169,7 +169,8 @@ void SliderConstraintDemo::initPhysics() btTransform groundTransform; groundTransform.setIdentity(); 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) btCollisionShape* shape = new btBoxShape(btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)); diff --git a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp index ec26f12e8..c4f3dffac 100644 --- a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp @@ -52,6 +52,7 @@ void btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio //m_childTransforms.push_back(localTransform); //m_childShapes.push_back(shape); btCompoundShapeChild child; + child.m_node = 0; child.m_transform = localTransform; child.m_childShape = shape; child.m_childShapeType = shape->getShapeType(); diff --git a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index 9206129ed..705f81822 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -170,7 +170,7 @@ public: btScalar appliedImpulse = m_pointCache[insertIndex].mConstraintRow[0].mAccumImpulse; btScalar appliedLateralImpulse1 = m_pointCache[insertIndex].mConstraintRow[1].mAccumImpulse; btScalar appliedLateralImpulse2 = m_pointCache[insertIndex].mConstraintRow[2].mAccumImpulse; - bool isLateralFrictionInitialized = m_pointCache[insertIndex].m_lateralFrictionInitialized; +// bool isLateralFrictionInitialized = m_pointCache[insertIndex].m_lateralFrictionInitialized; diff --git a/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/src/BulletDynamics/Character/btKinematicCharacterController.cpp index bae4cd64e..3f4b6d7ec 100644 --- a/src/BulletDynamics/Character/btKinematicCharacterController.cpp +++ b/src/BulletDynamics/Character/btKinematicCharacterController.cpp @@ -348,7 +348,8 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co if (callback.hasHit()) { // 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);