Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-06-14 03:09:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

pybullet removeAllParameters (sliders, buttons)

Browse Source 
pybullet addUserDebugParameter adds button instead of slider, if min > max.
This commit is contained in:
Erwin Coumans
2020-03-16 21:29:30 -07:00
parent b105764470
commit 27fbbfee7f
7 changed files with 106 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -128,6 +128,7 @@ enum MultiThreadedGUIHelperCommunicationEnums
eGUIHelperRemoveTexture,
eGUIHelperSetVisualizerFlagCheckRenderedFrame,
eGUIHelperUpdateShape,
eGUIUserDebugRemoveAllParameters,
};
#include <stdio.h>
@@ -494,6 +495,13 @@ struct UserDebugParameter
int m_itemUniqueId;
};
static void UserButtonToggle(int buttonId, bool buttonState, void* userPointer)
{
UserDebugParameter* param = (UserDebugParameter*)userPointer;
param->m_value += 1;
}
struct UserDebugText
{
char m_text[1024];
@@ -1328,6 +1336,16 @@ public:
workerThreadWait();
}
virtual void removeAllUserParameters()
{
m_cs->lock();
m_cs->setSharedParam(1, eGUIUserDebugRemoveAllParameters);
workerThreadWait();
}
const char* m_mp4FileName;
virtual void dumpFramesToVideo(const char* mp4FileName)
{
@@ -2359,6 +2377,7 @@ void PhysicsServerExample::updateGraphics()
UserDebugParameter* param = new UserDebugParameter(m_multiThreadedHelper->m_tmpParam);
m_multiThreadedHelper->m_userDebugParams.push_back(param);
if (param->m_rangeMin<= param->m_rangeMax)
{
SliderParams slider(param->m_text, &param->m_value);
slider.m_minVal = param->m_rangeMin;
@@ -2367,6 +2386,19 @@ void PhysicsServerExample::updateGraphics()
if (m_multiThreadedHelper->m_childGuiHelper->getParameterInterface())
m_multiThreadedHelper->m_childGuiHelper->getParameterInterface()->registerSliderFloatParameter(slider);
}
else
{
int buttonId = -1;
bool isTrigger = false;
ButtonParams button(param->m_text, buttonId, isTrigger);
button.m_callback = UserButtonToggle;
button.m_userPointer = param;
button.m_initialState = false;
//create a button
if (m_multiThreadedHelper->m_childGuiHelper->getParameterInterface())
m_multiThreadedHelper->m_childGuiHelper->getParameterInterface()->registerButtonParameter(button);
}
m_multiThreadedHelper->m_userDebugParamUid = (*m_multiThreadedHelper->m_userDebugParams[m_multiThreadedHelper->m_userDebugParams.size() - 1]).m_itemUniqueId;
@@ -2424,10 +2456,23 @@ void PhysicsServerExample::updateGraphics()
m_multiThreadedHelper->mainThreadRelease();
break;
}
case eGUIUserDebugRemoveAllParameters:
{
B3_PROFILE("eGUIUserDebugRemoveAllParameters");
if (m_multiThreadedHelper->m_childGuiHelper->getParameterInterface())
m_multiThreadedHelper->m_childGuiHelper->getParameterInterface()->removeAllParameters();
for (int i = 0; i < m_multiThreadedHelper->m_userDebugParams.size(); i++)
{
delete m_multiThreadedHelper->m_userDebugParams[i];
}
m_multiThreadedHelper->m_userDebugParams.clear();
m_multiThreadedHelper->mainThreadRelease();
break;
}
case eGUIUserDebugRemoveAllItems:
{
B3_PROFILE("eGUIUserDebugRemoveAllItems");
m_multiThreadedHelper->m_userDebugLines.clear();
m_multiThreadedHelper->m_userDebugText.clear();
m_multiThreadedHelper->m_uidGenerator = 0;