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

Add missing m_callback call in SliderMove().

Browse Source 
-------
The MySliderEventHandler is missing the m_callback whereas the SliderParams contains the m_callback field. Therefore, the m_callback is never called if the slider position is changed. This commit adds the missing m_callback field and call in SliderMove().
Fixes #613.
This commit is contained in:
Benjamin Ellenberger
2016-05-08 20:26:05 +02:00
parent d26ee33433
commit 4f169b4d8f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp
View File

@@ -27,17 +27,19 @@ struct MyButtonEventHandler : public Gwen::Event::Handler
template<typename T> template<typename T>
struct MySliderEventHandler : public Gwen::Event::Handler struct MySliderEventHandler : public Gwen::Event::Handler
{ {
SliderParamChangedCallback m_callback;
Gwen::Controls::TextBox* m_label; Gwen::Controls::TextBox* m_label;
Gwen::Controls::Slider* m_pSlider; Gwen::Controls::Slider* m_pSlider;
char m_variableName[1024]; char m_variableName[1024];
T* m_targetValue; T* m_targetValue;
bool m_showValue; bool m_showValue;
MySliderEventHandler(const char* varName, Gwen::Controls::TextBox* label, Gwen::Controls::Slider* pSlider,T* target) MySliderEventHandler(const char* varName, Gwen::Controls::TextBox* label, Gwen::Controls::Slider* pSlider,T* target,SliderParamChangedCallback callback)
:m_label(label), :m_label(label),
m_pSlider(pSlider), m_pSlider(pSlider),
m_targetValue(target), m_targetValue(target),
m_showValue(true) m_showValue(true),
m_callback(callback)
{ {
memcpy(m_variableName,varName,strlen(varName)+1); memcpy(m_variableName,varName,strlen(varName)+1);
} }
@@ -51,6 +53,11 @@ struct MySliderEventHandler : public Gwen::Event::Handler
T v = T(bla); T v = T(bla);
SetValue(v); SetValue(v);
if (m_callback)
{
(*m_callback)(v);
}
} }
void SetValue(T v) void SetValue(T v)
@@ -219,7 +226,7 @@ void GwenParameterInterface::registerSliderFloatParameter(SliderParams& params)
pSlider->SetValue( *params.m_paramValuePointer);//dimensions[i] ); pSlider->SetValue( *params.m_paramValuePointer);//dimensions[i] );
char labelName[1024]; char labelName[1024];
sprintf(labelName,"%s",params.m_name);//axisNames[0]); sprintf(labelName,"%s",params.m_name);//axisNames[0]);
MySliderEventHandler<btScalar>* handler = new MySliderEventHandler<btScalar>(labelName,label,pSlider,params.m_paramValuePointer); MySliderEventHandler<btScalar>* handler = new MySliderEventHandler<btScalar>(labelName,label,pSlider,params.m_paramValuePointer,params.m_callback);
handler->m_showValue = params.m_showValues; handler->m_showValue = params.m_showValues;
m_paramInternalData->m_sliderEventHandlers.push_back(handler); m_paramInternalData->m_sliderEventHandlers.push_back(handler);