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

remove SimpleOpenGL3 demo, it breaks some builds

Browse Source 
reset callback to 0 after exiting a demo to avoid issues
This commit is contained in:
Erwin Coumans
2016-03-17 16:11:53 -07:00
parent 937b6d84e5
commit 7e4dfb7207
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/multibody.bullet
View File

Binary file not shown.

2
examples/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
SUBDIRS( HelloWorld BasicDemo ) SUBDIRS( HelloWorld BasicDemo )
IF(BUILD_BULLET3) IF(BUILD_BULLET3)
SUBDIRS( ExampleBrowser SimpleOpenGL3 ThirdPartyLibs/Gwen OpenGLWindow) SUBDIRS( ExampleBrowser ThirdPartyLibs/Gwen OpenGLWindow)
ENDIF() ENDIF()

6
examples/MultiBody/MultiBodySoftContact.cpp
View File

@@ -36,6 +36,9 @@ public:
}; };
extern ContactAddedCallback gContactAddedCallback;
MultiBodySoftContact::MultiBodySoftContact(struct GUIHelperInterface* helper) MultiBodySoftContact::MultiBodySoftContact(struct GUIHelperInterface* helper)
:CommonMultiBodyBase(helper), :CommonMultiBodyBase(helper),
m_once(true) m_once(true)
@@ -44,11 +47,10 @@ m_once(true)
MultiBodySoftContact::~MultiBodySoftContact() MultiBodySoftContact::~MultiBodySoftContact()
{ {
gContactAddedCallback = 0;
} }
extern ContactAddedCallback gContactAddedCallback;
static bool btMultiBodySoftContactCallback(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1) static bool btMultiBodySoftContactCallback(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1)
{ {
cp.m_contactCFM = 0.3; cp.m_contactCFM = 0.3;

9
examples/RigidBody/RigidBodySoftContact.cpp
View File

@@ -29,6 +29,8 @@ subject to the following restrictions:
#include "BulletDynamics/MLCPSolvers/btMLCPSolver.h" #include "BulletDynamics/MLCPSolvers/btMLCPSolver.h"
#include "BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h" #include "BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h"
extern ContactAddedCallback gContactAddedCallback;
struct RigidBodySoftContact : public CommonRigidBodyBase struct RigidBodySoftContact : public CommonRigidBodyBase
{ {
@@ -36,7 +38,10 @@ struct RigidBodySoftContact : public CommonRigidBodyBase
:CommonRigidBodyBase(helper) :CommonRigidBodyBase(helper)
{ {
} }
virtual ~RigidBodySoftContact(){} virtual ~RigidBodySoftContact()
{
gContactAddedCallback = 0;
}
virtual void initPhysics(); virtual void initPhysics();
virtual void renderScene(); virtual void renderScene();
void resetCamera() void resetCamera()
@@ -49,7 +54,7 @@ struct RigidBodySoftContact : public CommonRigidBodyBase
} }
}; };
extern ContactAddedCallback gContactAddedCallback;
static bool btRigidBodySoftContactCallback(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1) static bool btRigidBodySoftContactCallback(btManifoldPoint& cp, const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1)
{ {
cp.m_contactCFM = 0.3; cp.m_contactCFM = 0.3;

2
examples/SharedMemory/SharedMemoryCommands.h
View File

@@ -150,7 +150,7 @@ struct SendDesiredStateArgs
//or the maximum applied force/torque for the PD/motor/constraint to reach the desired velocity in CONTROL_MODE_VELOCITY and CONTROL_MODE_POSITION_VELOCITY_PD mode //or the maximum applied force/torque for the PD/motor/constraint to reach the desired velocity in CONTROL_MODE_VELOCITY and CONTROL_MODE_POSITION_VELOCITY_PD mode
//indexed by degree of freedom, 6 dof base, and then dofs for each link //indexed by degree of freedom, 6 dof base, and then dofs for each link
double m_desiredStateForceTorque[MAX_DEGREE_OF_FREEDOM]; double m_desiredStateForceTorque[MAX_DEGREE_OF_FREEDOM];
}; };