From 2b9be54e3744dfad2b00b117632d227457eb2778 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 16 May 2017 22:50:31 +0200 Subject: [PATCH] [DEV] plop --- ege/Environement.hpp | 37 ++++++++++++------- .../Engine.cpp} | 0 .../Engine.hpp} | 0 ege/{ => particule}/Particule.cpp | 0 ege/{ => particule}/Particule.hpp | 0 .../Simple.cpp} | 0 .../Simple.hpp} | 0 7 files changed, 23 insertions(+), 14 deletions(-) rename ege/{ParticuleEngine.cpp => particule/Engine.cpp} (100%) rename ege/{ParticuleEngine.hpp => particule/Engine.hpp} (100%) rename ege/{ => particule}/Particule.cpp (100%) rename ege/{ => particule}/Particule.hpp (100%) rename ege/{ParticuleSimple.cpp => particule/Simple.cpp} (100%) rename ege/{ParticuleSimple.hpp => particule/Simple.hpp} (100%) diff --git a/ege/Environement.hpp b/ege/Environement.hpp index cc439fb..d7ab446 100644 --- a/ege/Environement.hpp +++ b/ege/Environement.hpp @@ -80,8 +80,30 @@ namespace ege { eproperty::List propertyStatus; //!< the display is running (not in pause) eproperty::Value propertyRatio; //!< Speed ratio private: - //ememory::SharedPtr m_dynamicsWorld; //!< curent system world description ege::physics::Engine m_physicEngine; //!< EGE physic engine interface. + public: + ege::physics::Engine& getPhysicEngine() { + return m_physicEngine; + } + private: + ege::render::Engine m_renderEngine; //!< EGE rendering engine interface. + public: + ege::render::Engine& getRenderEngine() { + return m_renderEngine; + } + private: + ege::particule::Engine m_particuleEngine; //!< EGE particule engine interface. + public: + ege::particule::Engine& getParticuleEngine() { + return m_particuleEngine; + } + private: + ege::ia::Engine m_iaEngine; //!< EGE Artificial inteligence engine interface. + public: + ege::ia::Engine& getIAEngine() { + return m_iaEngine; + } + private: std::vector> m_listElement; //!< List of all element added in the Game protected: Environement(); @@ -157,9 +179,6 @@ namespace ege { return m_dynamicsWorld; }; #endif - ege::physics::Engine& getPhysicEngine() { - return m_physicEngine; - } /** * @breif get a reference on the curent list of element games * @return all element list @@ -203,16 +222,6 @@ namespace ege { * @param[in] _event event that might be apply ... */ void generateInteraction(ege::ElementInteraction& _event); - private: - ege::ParticuleEngine m_particuleEngine; //!< Particule engine properties - public: - /** - * @brief get the particule engine reference. - * @return The requested reference on the engine - */ - ege::ParticuleEngine& getParticuleEngine() { - return m_particuleEngine; - }; protected: int64_t m_gameTime; //!< time of the game running public: diff --git a/ege/ParticuleEngine.cpp b/ege/particule/Engine.cpp similarity index 100% rename from ege/ParticuleEngine.cpp rename to ege/particule/Engine.cpp diff --git a/ege/ParticuleEngine.hpp b/ege/particule/Engine.hpp similarity index 100% rename from ege/ParticuleEngine.hpp rename to ege/particule/Engine.hpp diff --git a/ege/Particule.cpp b/ege/particule/Particule.cpp similarity index 100% rename from ege/Particule.cpp rename to ege/particule/Particule.cpp diff --git a/ege/Particule.hpp b/ege/particule/Particule.hpp similarity index 100% rename from ege/Particule.hpp rename to ege/particule/Particule.hpp diff --git a/ege/ParticuleSimple.cpp b/ege/particule/Simple.cpp similarity index 100% rename from ege/ParticuleSimple.cpp rename to ege/particule/Simple.cpp diff --git a/ege/ParticuleSimple.hpp b/ege/particule/Simple.hpp similarity index 100% rename from ege/ParticuleSimple.hpp rename to ege/particule/Simple.hpp