Assorted cleanup of compilation warnings. Also fixed some actual errors:
#include "renderTexture.h"...when the file is actually called 'RenderTexture.h'.
This commit is contained in:
@@ -16,11 +16,11 @@ subject to the following restrictions:
|
||||
#include "btCollisionObject.h"
|
||||
|
||||
btCollisionObject::btCollisionObject()
|
||||
: m_collisionFlags(0),
|
||||
: m_broadphaseHandle(0),
|
||||
m_collisionShape(0),
|
||||
m_collisionFlags(0),
|
||||
m_activationState1(1),
|
||||
m_deactivationTime(0.f),
|
||||
m_broadphaseHandle(0),
|
||||
m_collisionShape(0),
|
||||
m_hitFraction(1.f),
|
||||
m_ccdSweptShereRadius(0.f),
|
||||
m_ccdSquareMotionTreshold(0.f)
|
||||
|
||||
@@ -54,7 +54,6 @@ void btSphereBoxCollisionAlgorithm::processCollision (btBroadphaseProxy*,btBroad
|
||||
return;
|
||||
|
||||
btSphereShape* sphere0 = (btSphereShape*)m_sphereColObj ->m_collisionShape;
|
||||
btBoxShape* box = (btBoxShape*)m_boxColObj->m_collisionShape;
|
||||
|
||||
btVector3 normalOnSurfaceB;
|
||||
btVector3 pOnBox,pOnSphere;
|
||||
|
||||
@@ -61,4 +61,5 @@ public:
|
||||
|
||||
};
|
||||
|
||||
#endif //SPHERE_BOX_COLLISION_ALGORITHM_H
|
||||
#endif //SPHERE_BOX_COLLISION_ALGORITHM_H
|
||||
|
||||
|
||||
Reference in New Issue
Block a user