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

Added some helper methods for constraints and btMatrix3x3,

Browse Source 
Thanks to  francois, See Issue 466

Prevent crash in SoftBodyDemo, when picking constraints and demo-mode switches to next demo.
This commit is contained in:
erwin.coumans
2011-02-27 03:28:53 +00:00
parent e5b5126876
commit 4e8596eef5
14 changed files with 217 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Demos/OpenGL/DemoApplication.cpp
View File

@@ -851,19 +851,7 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y)
} else
{
if (m_pickConstraint && m_dynamicsWorld)
{
m_dynamicsWorld->removeConstraint(m_pickConstraint);
delete m_pickConstraint;
//printf("removed constraint %i",gPickingConstraintId);
m_pickConstraint = 0;
pickedBody->forceActivationState(ACTIVE_TAG);
pickedBody->setDeactivationTime( 0.f );
pickedBody = 0;
}
removePickingConstraint();
}
break;
@@ -876,6 +864,20 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y)
}
void DemoApplication::removePickingConstraint()
{
if (m_pickConstraint && m_dynamicsWorld)
{
m_dynamicsWorld->removeConstraint(m_pickConstraint);
delete m_pickConstraint;
//printf("removed constraint %i",gPickingConstraintId);
m_pickConstraint = 0;
pickedBody->forceActivationState(ACTIVE_TAG);
pickedBody->setDeactivationTime( 0.f );
pickedBody = 0;
}
}
void DemoApplication::mouseMotionFunc(int x,int y)
{
@@ -1330,6 +1332,8 @@ void DemoApplication::renderme()
void DemoApplication::clientResetScene()
{
removePickingConstraint();
#ifdef SHOW_NUM_DEEP_PENETRATIONS
gNumDeepPenetrationChecks = 0;
gNumGjkChecks = 0;