From 4a685a1c8fd650a6a10ab389e93a17b6b05b3ffe Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 11 Feb 2016 21:45:21 +0100 Subject: [PATCH] [DEV] update externalisation of signal and property --- ege/Environement.cpp | 2 +- ege/Environement.h | 10 +++++----- ege/widget/Mesh.h | 2 +- ege/widget/Scene.cpp | 4 ++-- ege/widget/Scene.h | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ege/Environement.cpp b/ege/Environement.cpp index 36ff84d..bfee620 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -388,7 +388,7 @@ std::shared_ptr 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 (m_status.get() == gameStart) { getObjectManager().periodicCall.bind(shared_from_this(), &ege::Environement::periodicCall); diff --git a/ege/Environement.h b/ege/Environement.h index 3097fcd..02645eb 100644 --- a/ege/Environement.h +++ b/ege/Environement.h @@ -23,7 +23,7 @@ class btDynamicsWorld; #include #include #include -#include +#include #include #include #include @@ -89,7 +89,7 @@ namespace ege { class Environement : public ewol::Object { public: // extern event - ewol::Signal signalPlayTimeChange; + esignal::Signal signalPlayTimeChange; private: //std::shared_ptr m_dynamicsWorld; //!< curent system world description ege::physics::Engine m_physicEngine; //!< EGE physic engine interface. @@ -101,7 +101,7 @@ namespace ege { DECLARE_FACTORY(Environement); virtual ~Environement() { }; protected: - ewol::parameter::List m_status; //!< the display is running (not in pause) + eproperty::List m_status; //!< the display is running (not in pause) public: /** * @brief Get the game status. @@ -118,7 +118,7 @@ namespace ege { m_status.set(_value); } protected: - ewol::parameter::Value m_ratio; //!< Speed ratio + eproperty::Value m_ratio; //!< Speed ratio public: /** * @brief Get the game speed ratio. @@ -272,7 +272,7 @@ namespace ege { const std::vector>& getStaticMeshToDraw() { return m_listMeshToDrawFirst; } - virtual void onParameterChangeValue(const ewol::parameter::Ref& _paramPointer); + virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); }; } diff --git a/ege/widget/Mesh.h b/ege/widget/Mesh.h index d0be3d6..2876a68 100644 --- a/ege/widget/Mesh.h +++ b/ege/widget/Mesh.h @@ -18,7 +18,7 @@ namespace ege { */ class Mesh :public ewol::Widget { public: - ewol::Signal signalPressed; + esignal::Signal signalPressed; private: // mesh name : std::string m_meshName; diff --git a/ege/widget/Scene.cpp b/ege/widget/Scene.cpp index 4e29662..7ad0d06 100644 --- a/ege/widget/Scene.cpp +++ b/ege/widget/Scene.cpp @@ -185,8 +185,8 @@ void ege::widget::Scene::systemDraw(const ewol::DrawProperty& _displayProp) { #endif } -void ege::widget::Scene::onParameterChangeValue(const ewol::parameter::Ref& _paramPointer) { - ewol::Widget::onParameterChangeValue(_paramPointer); +void ege::widget::Scene::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { + ewol::Widget::onPropertyChangeValue(_paramPointer); /* if (_paramPointer == m_isRunning) { // nothing to do ... diff --git a/ege/widget/Scene.h b/ege/widget/Scene.h index 896cb45..8a9e917 100644 --- a/ege/widget/Scene.h +++ b/ege/widget/Scene.h @@ -30,7 +30,7 @@ class btDynamicsWorld; #include class btVector3; #include -#include +#include namespace ege { namespace widget { @@ -39,7 +39,7 @@ namespace ege { std::shared_ptr m_env; std::shared_ptr m_debugDrawProperty; public: - ewol::Signal/*, std::shared_ptr*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic) + esignal::Signal/*, std::shared_ptr*/> signalDisplayDebug; //!< emit a signal to the application to draw the debug (@ref setDebugPhysic) protected: /** * @brief Constructor of the widget classes @@ -73,14 +73,14 @@ namespace ege { std::vector m_displayElementOrdered; protected: // Derived function virtual void onDraw(); - virtual void onParameterChangeValue(const ewol::parameter::Ref& _paramPointer); + virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(); virtual void periodicCall(const ewol::event::Time& _event); virtual void calculateSize(const vec2& _available); protected: - ewol::parameter::Value m_debugPhysic; //!< display Physic Debug + eproperty::Value m_debugPhysic; //!< display Physic Debug public: /** * @brief Set the debug display of the physic engine @@ -97,7 +97,7 @@ namespace ege { return m_debugPhysic.get(); } protected: - ewol::parameter::Value m_debugApplication; //!< display Application Debug + eproperty::Value m_debugApplication; //!< display Application Debug public: /** * @brief Set the debug display of the application