export btHeightfieldTerrainShape to PyBullet. Note that tinyrenderer doesn't support rendering it (it would be too slow on CPU)

fix rare getKeyboardEvents threading issue
change texture color to default plane.urdf blue
This commit is contained in:
Erwin Coumans
2019-07-29 20:23:38 -07:00
parent 36f3adc03f
commit 51fba6f78d
14 changed files with 286 additions and 71 deletions

View File

@@ -1499,6 +1499,7 @@ public:
{
//printf("key=%d, state=%d\n", key,state);
{
m_args[0].m_csGUI->lock();
int keyIndex = -1;
//is already there?
for (int i = 0; i < m_args[0].m_keyboardEvents.size(); i++)
@@ -1515,7 +1516,7 @@ public:
b3KeyboardEvent ev;
ev.m_keyCode = key;
ev.m_keyState = eButtonIsDown + eButtonTriggered;
m_args[0].m_csGUI->lock();
if (keyIndex >= 0)
{
if (0 == (m_args[0].m_keyboardEvents[keyIndex].m_keyState & eButtonIsDown))
@@ -1527,11 +1528,10 @@ public:
{
m_args[0].m_keyboardEvents.push_back(ev);
}
m_args[0].m_csGUI->unlock();
}
else
{
m_args[0].m_csGUI->lock();
b3KeyboardEvent ev;
ev.m_keyCode = key;
ev.m_keyState = eButtonReleased;
@@ -1543,8 +1543,9 @@ public:
{
m_args[0].m_keyboardEvents.push_back(ev);
}
m_args[0].m_csGUI->unlock();
}
m_args[0].m_csGUI->unlock();
}
/*printf("m_args[0].m_keyboardEvents.size()=%d\n", m_args[0].m_keyboardEvents.size());
for (int i=0;i<m_args[0].m_keyboardEvents.size();i++)