remove SimpleOpenGL3 demo, it breaks some builds

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

View File

@@ -36,6 +36,9 @@ public:
};
extern ContactAddedCallback gContactAddedCallback;
MultiBodySoftContact::MultiBodySoftContact(struct GUIHelperInterface* helper)
:CommonMultiBodyBase(helper),
m_once(true)
@@ -44,11 +47,10 @@ m_once(true)
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)
{
cp.m_contactCFM = 0.3;