fix many warnings
remove btMultiSapBroadphase.* make collisionFilterGroup/collisionFilterMark int (instead of short int)
This commit is contained in:
@@ -56,7 +56,7 @@ class AllConstraintDemo : public CommonRigidBodyBase
|
||||
m_guiHelper->resetCamera(dist,pitch,yaw,targetPos[0],targetPos[1],targetPos[2]);
|
||||
}
|
||||
|
||||
virtual void keyboardCallback(unsigned char key, int x, int y);
|
||||
virtual bool keyboardCallback(int key, int state);
|
||||
|
||||
// for cone-twist motor driving
|
||||
float m_Time;
|
||||
@@ -66,7 +66,6 @@ class AllConstraintDemo : public CommonRigidBodyBase
|
||||
|
||||
|
||||
|
||||
const int numObjects = 3;
|
||||
|
||||
#define ENABLE_ALL_DEMOS 1
|
||||
|
||||
@@ -839,10 +838,11 @@ void AllConstraintDemo::displayCallback(void) {
|
||||
}
|
||||
#endif
|
||||
|
||||
void AllConstraintDemo::keyboardCallback(unsigned char key, int x, int y)
|
||||
bool AllConstraintDemo::keyboardCallback(int key, int state)
|
||||
{
|
||||
(void)x;
|
||||
(void)y;
|
||||
|
||||
bool handled = false;
|
||||
|
||||
switch (key)
|
||||
{
|
||||
case 'O' :
|
||||
@@ -870,6 +870,7 @@ void AllConstraintDemo::keyboardCallback(unsigned char key, int x, int y)
|
||||
printf("Slider6Dof %s frame offset\n", offectOnOff ? "uses" : "does not use");
|
||||
}
|
||||
}
|
||||
handled = true;
|
||||
break;
|
||||
default :
|
||||
{
|
||||
@@ -877,6 +878,8 @@ void AllConstraintDemo::keyboardCallback(unsigned char key, int x, int y)
|
||||
}
|
||||
break;
|
||||
}
|
||||
return handled;
|
||||
|
||||
}
|
||||
|
||||
class CommonExampleInterface* AllConstraintCreateFunc(struct CommonExampleOptions& options)
|
||||
|
||||
Reference in New Issue
Block a user