atria-soft/ege
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update externalisation of signal and property

Browse Source
This commit is contained in:
Edouard DUPIN 2016-02-11 21:45:21 +01:00
parent 15ada13bf8
commit 4a685a1c8f
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ege/Environement.cpp
View File

@ -388,7 +388,7 @@ std::shared_ptr<ege::Camera> ege::Environement::getCamera(const std::string& _na
} }
void ege::Environement::onParameterChangeValue(const ewol::parameter::Ref& _paramPointer) { void ege::Environement::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
if (_paramPointer == m_status) { if (_paramPointer == m_status) {
if (m_status.get() == gameStart) { if (m_status.get() == gameStart) {
getObjectManager().periodicCall.bind(shared_from_this(), &ege::Environement::periodicCall); getObjectManager().periodicCall.bind(shared_from_this(), &ege::Environement::periodicCall);

10
ege/Environement.h
View File

@ -23,7 +23,7 @@ class btDynamicsWorld;
#include <exml/exml.h> #include <exml/exml.h>
#include <ege/ParticuleEngine.h> #include <ege/ParticuleEngine.h>
#include <ewol/object/Object.h> #include <ewol/object/Object.h>
#include <ewol/signal/Signal.h> #include <esignal/Signal.h>
#include <ewol/event/Time.h> #include <ewol/event/Time.h>
#include <ewol/parameter/Value.h> #include <ewol/parameter/Value.h>
#include <ege/resource/Mesh.h> #include <ege/resource/Mesh.h>
@ -89,7 +89,7 @@ namespace ege {
class Environement : public ewol::Object { class Environement : public ewol::Object {
public: public:
// extern event // extern event
ewol::Signal<float> signalPlayTimeChange; esignal::Signal<float> signalPlayTimeChange;
private: private:
//std::shared_ptr<btDynamicsWorld> m_dynamicsWorld; //!< curent system world description //std::shared_ptr<btDynamicsWorld> m_dynamicsWorld; //!< curent system world description
ege::physics::Engine m_physicEngine; //!< EGE physic engine interface. ege::physics::Engine m_physicEngine; //!< EGE physic engine interface.
@ -101,7 +101,7 @@ namespace ege {
DECLARE_FACTORY(Environement); DECLARE_FACTORY(Environement);
virtual ~Environement() { }; virtual ~Environement() { };
protected: protected:
ewol::parameter::List<enum gameStatus> m_status; //!< the display is running (not in pause) eproperty::List<enum gameStatus> m_status; //!< the display is running (not in pause)
public: public:
/** /**
* @brief Get the game status. * @brief Get the game status.
@ -118,7 +118,7 @@ namespace ege {
m_status.set(_value); m_status.set(_value);
} }
protected: protected:
ewol::parameter::Value<float> m_ratio; //!< Speed ratio eproperty::Value<float> m_ratio; //!< Speed ratio
public: public:
/** /**
* @brief Get the game speed ratio. * @brief Get the game speed ratio.
@ -272,7 +272,7 @@ namespace ege {
const std::vector<std::shared_ptr<ege::resource::Mesh>>& getStaticMeshToDraw() { const std::vector<std::shared_ptr<ege::resource::Mesh>>& getStaticMeshToDraw() {
return m_listMeshToDrawFirst; return m_listMeshToDrawFirst;
} }
virtual void onParameterChangeValue(const ewol::parameter::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
} }

2
ege/widget/Mesh.h
View File

@ -18,7 +18,7 @@ namespace ege {
*/ */
class Mesh :public ewol::Widget { class Mesh :public ewol::Widget {
public: public:
ewol::Signal<void> signalPressed; esignal::Signal<void> signalPressed;
private: private:
// mesh name : // mesh name :
std::string m_meshName; std::string m_meshName;

4
ege/widget/Scene.cpp
View File

@ -185,8 +185,8 @@ void ege::widget::Scene::systemDraw(const ewol::DrawProperty& _displayProp) {
#endif #endif
} }
void ege::widget::Scene::onParameterChangeValue(const ewol::parameter::Ref& _paramPointer) { void ege::widget::Scene::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onParameterChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
/* /*
if (_paramPointer == m_isRunning) { if (_paramPointer == m_isRunning) {
// nothing to do ... // nothing to do ...

10
ege/widget/Scene.h
View File

@ -30,7 +30,7 @@ class btDynamicsWorld;
#include <LinearMath/btScalar.h> #include <LinearMath/btScalar.h>
class btVector3; class btVector3;
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/signal/Signal.h> #include <esignal/Signal.h>
namespace ege { namespace ege {
namespace widget { namespace widget {
@ -39,7 +39,7 @@ namespace ege {
std::shared_ptr<ege::Environement> m_env; std::shared_ptr<ege::Environement> m_env;
std::shared_ptr<ewol::resource::Colored3DObject> m_debugDrawProperty; std::shared_ptr<ewol::resource::Colored3DObject> m_debugDrawProperty;
public: public:
ewol::Signal<std::shared_ptr<ewol::resource::Colored3DObject>/*, std::shared_ptr<ege::Camera>*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic) esignal::Signal<std::shared_ptr<ewol::resource::Colored3DObject>/*, std::shared_ptr<ege::Camera>*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic)
protected: protected:
/** /**
* @brief Constructor of the widget classes * @brief Constructor of the widget classes
@ -73,14 +73,14 @@ namespace ege {
std::vector<ege::Environement::ResultNearestElement> m_displayElementOrdered; std::vector<ege::Environement::ResultNearestElement> m_displayElementOrdered;
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
virtual void onParameterChangeValue(const ewol::parameter::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
public: // Derived function public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual void periodicCall(const ewol::event::Time& _event); virtual void periodicCall(const ewol::event::Time& _event);
virtual void calculateSize(const vec2& _available); virtual void calculateSize(const vec2& _available);
protected: protected:
ewol::parameter::Value<bool> m_debugPhysic; //!< display Physic Debug eproperty::Value<bool> m_debugPhysic; //!< display Physic Debug
public: public:
/** /**
* @brief Set the debug display of the physic engine * @brief Set the debug display of the physic engine
@ -97,7 +97,7 @@ namespace ege {
return m_debugPhysic.get(); return m_debugPhysic.get();
} }
protected: protected:
ewol::parameter::Value<bool> m_debugApplication; //!< display Application Debug eproperty::Value<bool> m_debugApplication; //!< display Application Debug
public: public:
/** /**
* @brief Set the debug display of the application * @brief Set the debug display of the application