From 9450ebc57417fb8652df94feadd8eb79916a28c1 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 11 Mar 2016 21:43:51 +0100 Subject: [PATCH] [DEV] build again --- ege/Environement.cpp | 5 ----- ege/Environement.h | 1 - ege/widget/Mesh.cpp | 8 ++++---- ege/widget/Mesh.h | 2 +- ege/widget/Scene.cpp | 3 +-- ege/widget/Scene.h | 6 +++++- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ege/Environement.cpp b/ege/Environement.cpp index 8da9e6b..7c3478c 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -305,11 +305,6 @@ ege::Environement::Environement() : propertyStatus.add(gameStop, "stop", "Scene is stopped"); } -void ege::Environement::init(const std::string& _name) { - ewol::Object::init(_name); - -} - void ege::Environement::clear() { m_listElement.clear(); } diff --git a/ege/Environement.h b/ege/Environement.h index 9e70f2e..9479faa 100644 --- a/ege/Environement.h +++ b/ege/Environement.h @@ -99,7 +99,6 @@ namespace ege { std::vector> m_listElement; //!< List of all element added in the Game protected: Environement(); - void init(const std::string& _name="NoName"); public: DECLARE_FACTORY(Environement); virtual ~Environement() { }; diff --git a/ege/widget/Mesh.cpp b/ege/widget/Mesh.cpp index c626a6c..e8fd1b8 100644 --- a/ege/widget/Mesh.cpp +++ b/ege/widget/Mesh.cpp @@ -25,12 +25,12 @@ ege::widget::Mesh::Mesh(): addObjectType("ege::widget::Mesh"); } -void ege::widget::Mesh::init(const std::string& _filename) { - ewol::Widget::init(_filename); - m_meshName = _filename; +void ege::widget::Mesh::init() { + ewol::Widget::init(); + m_meshName = *propertyName; // Limit event at 1: setMouseLimit(1); - if (_filename!="") { + if (*propertyName!="") { m_object = ege::resource::Mesh::create(m_meshName); if (nullptr == m_object) { EGE_ERROR("Can not load the resource : \"" << m_meshName << "\""); diff --git a/ege/widget/Mesh.h b/ege/widget/Mesh.h index 5b54245..8038b21 100644 --- a/ege/widget/Mesh.h +++ b/ege/widget/Mesh.h @@ -30,7 +30,7 @@ namespace ege { float m_cameraDistance; protected: Mesh(); - void init(const std::string& _filename); // automatic considering in the appl Data older + void init(); // automatic considering in the appl Data older public: virtual ~Mesh(); public: // Derived function diff --git a/ege/widget/Scene.cpp b/ege/widget/Scene.cpp index 4574cf5..675f49b 100644 --- a/ege/widget/Scene.cpp +++ b/ege/widget/Scene.cpp @@ -47,8 +47,7 @@ ege::widget::Scene::Scene() : addObjectType("ege::widget::Scene"); } -void ege::widget::Scene::init(std::shared_ptr _env) { - m_env = _env; +void ege::widget::Scene::init() { ewol::Widget::init(); setKeyboardRepeate(false); propertyCanFocus.set(true); diff --git a/ege/widget/Scene.h b/ege/widget/Scene.h index 6a5992d..086f21a 100644 --- a/ege/widget/Scene.h +++ b/ege/widget/Scene.h @@ -51,7 +51,11 @@ namespace ege { * @return (no execption generated (not managed in embended platform)) */ Scene(); - void init(std::shared_ptr _env); + void init(); + public: + void setEnv(std::shared_ptr _env) { + m_env = _env; + } public: DECLARE_FACTORY(Scene); /**