diff --git a/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp b/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp index a1d0ba177..5032a1cdb 100644 --- a/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp +++ b/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp @@ -214,7 +214,7 @@ void GwenParameterInterface::registerSliderFloatParameter(SliderParams& params) pSlider->SetPos( 10, m_gwenInternalData->m_curYposition ); pSlider->SetSize( 200, 20 ); pSlider->SetRange( params.m_minVal, params.m_maxVal); - pSlider->SetNotchCount(128);//float(params.m_maxVal-params.m_minVal)/100.f); + pSlider->SetNotchCount(16);//float(params.m_maxVal-params.m_minVal)/100.f); pSlider->SetClampToNotches( params.m_clampToNotches ); pSlider->SetValue( *params.m_paramValuePointer);//dimensions[i] ); char labelName[1024]; diff --git a/examples/InverseDynamics/InverseDynamicsExample.cpp b/examples/InverseDynamics/InverseDynamicsExample.cpp index de5204213..0ff239fd1 100644 --- a/examples/InverseDynamics/InverseDynamicsExample.cpp +++ b/examples/InverseDynamics/InverseDynamicsExample.cpp @@ -48,6 +48,20 @@ static std::vector qd; static std::vector qd_name; static std::vector q_name; +static btVector4 sJointCurveColors[8] = +{ + btVector4(1,0.3,0.3,1), + btVector4(0.3,1,0.3,1), + btVector4(0.3,0.3,1,1), + btVector4(0.3,1,1,1), + btVector4(1,0.3,1,1), + btVector4(1,1,0.3,1), + btVector4(1,0.7,0.7,1), + btVector4(0.7,1,1,1), + +}; + + void toggleUseInverseModel(int buttonId, bool buttonState, void* userPointer){ useInverseModel=!useInverseModel; // todo(thomas) is there a way to get a toggle button with changing text? @@ -175,7 +189,7 @@ void InverseDynamicsExample::initPhysics() if(m_multiBody) { { - m_timeSeriesCanvas = new TimeSeriesCanvas(m_guiHelper->getAppInterface()->m_2dCanvasInterface,512,230, "q time series"); + m_timeSeriesCanvas = new TimeSeriesCanvas(m_guiHelper->getAppInterface()->m_2dCanvasInterface,512,230, "Joint Space Trajectory"); m_timeSeriesCanvas ->setupTimeSeries(3,100, 0); } @@ -202,7 +216,8 @@ void InverseDynamicsExample::initPhysics() sprintf(tmp,"q[%zu]",dof); q_name[dof] = tmp; m_guiHelper->getParameterInterface()->registerSliderFloatParameter(slider); - m_timeSeriesCanvas->addDataSource(q_name[dof].c_str(), 255,0,0); + btVector4 color = sJointCurveColors[dof&7]; + m_timeSeriesCanvas->addDataSource(q_name[dof].c_str(), color[0]*255,color[1]*255,color[2]*255); }