diff --git a/sources/ewol/renderer/Light.cpp b/sources/ewol/Light.cpp similarity index 97% rename from sources/ewol/renderer/Light.cpp rename to sources/ewol/Light.cpp index 9b009cba..501cbb24 100644 --- a/sources/ewol/renderer/Light.cpp +++ b/sources/ewol/Light.cpp @@ -6,7 +6,7 @@ * @license BSD v3 (see license file) */ -#include +#include #include ewol::Light::Light(void) : diff --git a/sources/ewol/renderer/Light.h b/sources/ewol/Light.h similarity index 96% rename from sources/ewol/renderer/Light.h rename to sources/ewol/Light.h index 657e8bb6..532d1568 100644 --- a/sources/ewol/renderer/Light.h +++ b/sources/ewol/Light.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/renderer/Material.cpp b/sources/ewol/Material.cpp similarity index 96% rename from sources/ewol/renderer/Material.cpp rename to sources/ewol/Material.cpp index d5b3ad8d..fd07932d 100644 --- a/sources/ewol/renderer/Material.cpp +++ b/sources/ewol/Material.cpp @@ -6,8 +6,8 @@ * @license BSD v3 (see license file) */ -#include -#include +#include +#include #include ewol::MaterialGlId::MaterialGlId(void) : diff --git a/sources/ewol/renderer/Material.h b/sources/ewol/Material.h similarity index 95% rename from sources/ewol/renderer/Material.h rename to sources/ewol/Material.h index 5711aa6d..5b40d0cb 100644 --- a/sources/ewol/renderer/Material.h +++ b/sources/ewol/Material.h @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include namespace ewol { diff --git a/sources/ewol/clipBoard.cpp b/sources/ewol/clipBoard.cpp index 33693eb1..0da163ad 100644 --- a/sources/ewol/clipBoard.cpp +++ b/sources/ewol/clipBoard.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #undef __class__ #define __class__ "ClipBoard" @@ -123,10 +123,10 @@ void ewol::clipBoard::SetSystem(ewol::clipBoard::clipboardListe_te _clipboardID, mesCopy[_clipboardID] = _data; } -const etk::UString emptyString(""); const etk::UString& ewol::clipBoard::Get(ewol::clipBoard::clipboardListe_te _clipboardID) { + static const etk::UString emptyString(""); if(_clipboardID >= ewol::clipBoard::clipboardCount) { EWOL_WARNING("request ClickBoard id error"); return emptyString; diff --git a/sources/ewol/compositing/Area.h b/sources/ewol/compositing/Area.h index 759d6816..1fe64ce3 100644 --- a/sources/ewol/compositing/Area.h +++ b/sources/ewol/compositing/Area.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/compositing/Drawing.h b/sources/ewol/compositing/Drawing.h index bddaa381..a9ae807e 100644 --- a/sources/ewol/compositing/Drawing.h +++ b/sources/ewol/compositing/Drawing.h @@ -13,7 +13,7 @@ #include #include -#include +#include namespace ewol diff --git a/sources/ewol/compositing/Image.h b/sources/ewol/compositing/Image.h index 0e293b03..f132cec4 100644 --- a/sources/ewol/compositing/Image.h +++ b/sources/ewol/compositing/Image.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/compositing/Mesh.h b/sources/ewol/compositing/Mesh.h index 52c4c374..6f2e0049 100644 --- a/sources/ewol/compositing/Mesh.h +++ b/sources/ewol/compositing/Mesh.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/compositing/Shaper.h b/sources/ewol/compositing/Shaper.h index 4ff72f24..4c4640c1 100644 --- a/sources/ewol/compositing/Shaper.h +++ b/sources/ewol/compositing/Shaper.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include namespace ewol diff --git a/sources/ewol/compositing/Sprite.h b/sources/ewol/compositing/Sprite.h index a435b5d6..36dcee0f 100644 --- a/sources/ewol/compositing/Sprite.h +++ b/sources/ewol/compositing/Sprite.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index df86db59..4dd73ffa 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #undef __class__ #define __class__ "ewol::Text" @@ -320,10 +320,10 @@ void ewol::Text::SetFont(etk::UString _fontName, int32_t _fontSize) m_font = NULL; } if (_fontSize <= 0) { - _fontSize = ewol::eSystem::GetSystem().GetFontDefault().GetSize(); + _fontSize = ewol::GetContext().GetFontDefault().GetSize(); } if (_fontName == "") { - _fontName = ewol::eSystem::GetSystem().GetFontDefault().GetName(); + _fontName = ewol::GetContext().GetFontDefault().GetName(); } _fontName += ":"; _fontName += _fontSize; diff --git a/sources/ewol/compositing/Text.h b/sources/ewol/compositing/Text.h index 2d179a11..1e09ab61 100644 --- a/sources/ewol/compositing/Text.h +++ b/sources/ewol/compositing/Text.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include namespace ewol diff --git a/sources/ewol/ewol.cpp b/sources/ewol/ewol.cpp index c9ffb000..87c5760e 100644 --- a/sources/ewol/ewol.cpp +++ b/sources/ewol/ewol.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ int32_t ewol::Run(int32_t _argc, const char* _argv[]) } } // call standard RUN ... - int32_t error = ewol::eSystem::main(_argc, _argv); + int32_t error = ewol::eContext::main(_argc, _argv); ewol::commandLine::Clean(); @@ -154,7 +154,7 @@ etk::UString ewol::GetVersion(void) int64_t ewol::GetTime(void) { - return ewol::eSystem::GetTime(); + return ewol::eContext::GetTime(); } /* void ewol::InputEventTransfertWidget(ewol::Widget* _source, ewol::Widget* _destination) diff --git a/sources/ewol/renderer/os/gui.Android.cpp b/sources/ewol/renderer/Android/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.Android.cpp rename to sources/ewol/renderer/Android/Context.cpp diff --git a/sources/ewol/renderer/ConfigFont.cpp b/sources/ewol/renderer/ConfigFont.cpp index 3f40f683..414707f5 100644 --- a/sources/ewol/renderer/ConfigFont.cpp +++ b/sources/ewol/renderer/ConfigFont.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include #undef __class__ #define __class__ "ConfigFont" diff --git a/sources/ewol/renderer/EObjectMessageMultiCast.cpp b/sources/ewol/renderer/EMultiCast.cpp similarity index 80% rename from sources/ewol/renderer/EObjectMessageMultiCast.cpp rename to sources/ewol/renderer/EMultiCast.cpp index 80788d68..b9d08664 100644 --- a/sources/ewol/renderer/EObjectMessageMultiCast.cpp +++ b/sources/ewol/renderer/EMultiCast.cpp @@ -11,22 +11,22 @@ #include #undef __class__ -#define __class__ "EObjectMessageMultiCast" +#define __class__ "EMultiCast" -ewol::EObjectMessageMultiCast::EObjectMessageMultiCast(void) +ewol::EMultiCast::EMultiCast(void) { EWOL_INFO("EObject message Multi-Cast"); } -ewol::EObjectMessageMultiCast::~EObjectMessageMultiCast(void) +ewol::EMultiCast::~EMultiCast(void) { EWOL_INFO("EObject message Multi-Cast"); m_messageList.Clear(); } -void ewol::EObjectMessageMultiCast::Add(ewol::EObject* _object, const char* const _message) +void ewol::EMultiCast::Add(ewol::EObject* _object, const char* const _message) { if (NULL == _object) { EWOL_ERROR("Add with NULL object"); @@ -41,7 +41,7 @@ void ewol::EObjectMessageMultiCast::Add(ewol::EObject* _object, const char* cons } -void ewol::EObjectMessageMultiCast::Rm(ewol::EObject* _object) +void ewol::EMultiCast::Rm(ewol::EObject* _object) { if (NULL == _object) { EWOL_ERROR("Rm with NULL object"); @@ -58,7 +58,7 @@ void ewol::EObjectMessageMultiCast::Rm(ewol::EObject* _object) } } -void ewol::EObjectMessageMultiCast::Send(ewol::EObject* _object, const char* const _message, const etk::UString& _data) +void ewol::EMultiCast::Send(ewol::EObject* _object, const char* const _message, const etk::UString& _data) { EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :"); diff --git a/sources/ewol/renderer/EObjectMessageMultiCast.h b/sources/ewol/renderer/EMultiCast.h similarity index 91% rename from sources/ewol/renderer/EObjectMessageMultiCast.h rename to sources/ewol/renderer/EMultiCast.h index 0f0a104c..df476b09 100644 --- a/sources/ewol/renderer/EObjectMessageMultiCast.h +++ b/sources/ewol/renderer/EMultiCast.h @@ -17,7 +17,7 @@ #include namespace ewol { - class EObjectMessageMultiCast + class EMultiCast { private: class MessageList { @@ -28,8 +28,8 @@ namespace ewol { }; etk::Vector m_messageList; //!< List of all message ... public: - EObjectMessageMultiCast(void); - ~EObjectMessageMultiCast(void); + EMultiCast(); + ~EMultiCast(void); void AnonymousSend(const char* const _messageId, const etk::UString& _data) { Send(NULL, _messageId, _data); }; void Send(ewol::EObject* _object, const char* const _message, const etk::UString& _data); void Rm(ewol::EObject* _object); diff --git a/sources/ewol/renderer/EObject.cpp b/sources/ewol/renderer/EObject.cpp index 5313fcaf..66f353cd 100644 --- a/sources/ewol/renderer/EObject.cpp +++ b/sources/ewol/renderer/EObject.cpp @@ -8,9 +8,8 @@ #include #include -#include #include -#include +#include #undef __class__ #define __class__ "ewol::EObject" @@ -309,15 +308,15 @@ bool ewol::EObject::SetConfigNamed(const etk::UString& _name, const etk::UString ewol::EObjectManager& ewol::EObject::GetEObjectManager(void) { - return ewol::eSystem::GetSystem().GetEObjectManager(); + return ewol::GetContext().GetEObjectManager(); } -ewol::EObjectMessageMultiCast& ewol::EObject::GetEObjectMessageMultiCast(void) +ewol::EMultiCast& ewol::EObject::GetEObjectMessageMultiCast(void) { - return ewol::eSystem::GetSystem().GetEObjectMessageMultiCast(); + return ewol::GetContext().GetEObjectManager().MultiCast(); } ewol::eSystem& ewol::EObject::GetSystem(void) { - return ewol::eSystem::GetSystem(); + return ewol::GetContext(); } diff --git a/sources/ewol/renderer/EObject.h b/sources/ewol/renderer/EObject.h index 946f3ad3..c2c65021 100644 --- a/sources/ewol/renderer/EObject.h +++ b/sources/ewol/renderer/EObject.h @@ -17,7 +17,7 @@ namespace ewol { // some class need to define element befor other ... class EObject; class EObjectManager; - class EObjectMessageMultiCast; + class EMultiCast; class eSystem; }; @@ -228,7 +228,7 @@ namespace ewol { * @breif Get the current EObject Message Multicast manager. * @return the requested object manager. */ - ewol::EObjectMessageMultiCast& GetEObjectMessageMultiCast(void); + ewol::EMultiCast& GetEObjectMessageMultiCast(void); /** * @brief Get the curent the system inteface. * @return current reference on the instance. diff --git a/sources/ewol/renderer/EObjectManager.h b/sources/ewol/renderer/EObjectManager.h index 262ce8b9..b81038d7 100644 --- a/sources/ewol/renderer/EObjectManager.h +++ b/sources/ewol/renderer/EObjectManager.h @@ -11,6 +11,7 @@ #include #include +#include namespace ewol { @@ -32,6 +33,10 @@ namespace ewol ewol::EObject* Get(const etk::UString& _name); private: void informOneObjectIsRemoved(ewol::EObject* _object); + private: + ewol::EMultiCast m_multiCast; //!< muticast manager + public: + ewol::EMultiCast MultiCast(void) { return m_multiCast; }; }; }; diff --git a/sources/ewol/renderer/os/Fps.h b/sources/ewol/renderer/Fps.h similarity index 100% rename from sources/ewol/renderer/os/Fps.h rename to sources/ewol/renderer/Fps.h diff --git a/sources/ewol/renderer/os/gui.IOs.cpp b/sources/ewol/renderer/IOs/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.IOs.cpp rename to sources/ewol/renderer/IOs/Context.cpp diff --git a/sources/ewol/renderer/os/gui.MacOs.AppDelegate.h b/sources/ewol/renderer/MacOs/AppDelegate.h similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.AppDelegate.h rename to sources/ewol/renderer/MacOs/AppDelegate.h diff --git a/sources/ewol/renderer/os/gui.MacOs.AppDelegate.mm b/sources/ewol/renderer/MacOs/AppDelegate.mm similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.AppDelegate.mm rename to sources/ewol/renderer/MacOs/AppDelegate.mm diff --git a/sources/ewol/renderer/os/gui.MacOs.cpp b/sources/ewol/renderer/MacOs/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.cpp rename to sources/ewol/renderer/MacOs/Context.cpp diff --git a/sources/ewol/renderer/os/gui.MacOs.Interface.h b/sources/ewol/renderer/MacOs/Interface.h similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.Interface.h rename to sources/ewol/renderer/MacOs/Interface.h diff --git a/sources/ewol/renderer/os/gui.MacOs.Interface.mm b/sources/ewol/renderer/MacOs/Interface.mm similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.Interface.mm rename to sources/ewol/renderer/MacOs/Interface.mm diff --git a/sources/ewol/renderer/os/gui.MacOs.OpenglView.h b/sources/ewol/renderer/MacOs/OpenglView.h similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.OpenglView.h rename to sources/ewol/renderer/MacOs/OpenglView.h diff --git a/sources/ewol/renderer/os/gui.MacOs.OpenglView.mm b/sources/ewol/renderer/MacOs/OpenglView.mm similarity index 100% rename from sources/ewol/renderer/os/gui.MacOs.OpenglView.mm rename to sources/ewol/renderer/MacOs/OpenglView.mm diff --git a/sources/ewol/renderer/os/gui.Windows.cpp b/sources/ewol/renderer/Windows/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.Windows.cpp rename to sources/ewol/renderer/Windows/Context.cpp diff --git a/sources/ewol/renderer/os/gui.X11.cpp b/sources/ewol/renderer/X11/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.X11.cpp rename to sources/ewol/renderer/X11/Context.cpp diff --git a/sources/ewol/renderer/os/gui.directFB.cpp b/sources/ewol/renderer/directFB/Context.cpp similarity index 100% rename from sources/ewol/renderer/os/gui.directFB.cpp rename to sources/ewol/renderer/directFB/Context.cpp diff --git a/sources/ewol/renderer/eSystem.cpp b/sources/ewol/renderer/eContext.cpp similarity index 83% rename from sources/ewol/renderer/eSystem.cpp rename to sources/ewol/renderer/eContext.cpp index bc56930c..5dad3dc2 100644 --- a/sources/ewol/renderer/eSystem.cpp +++ b/sources/ewol/renderer/eContext.cpp @@ -17,9 +17,8 @@ #include #include -#include -#include -#include +#include +#include #include #include @@ -41,8 +40,8 @@ static etk::Mutex& MutexInterface(void) } -static ewol::eSystem* l_curentInterface=NULL; -ewol::eSystem& ewol::eSystem::GetSystem(void) +static ewol::eContext* l_curentInterface=NULL; +ewol::eContext& ewol::GetContext(void) { #if DEBUG_LEVEL > 2 if(NULL == l_curentInterface){ @@ -56,7 +55,7 @@ ewol::eSystem& ewol::eSystem::GetSystem(void) * @brief Set the curent interface. * @note this lock the main mutex */ -void ewol::eSystem::SetSystem(void) +void ewol::eContext::LockContext(void) { MutexInterface().Lock(); l_curentInterface = this; @@ -66,29 +65,29 @@ void ewol::eSystem::SetSystem(void) * @brief Set the curent interface at NULL. * @note this un-lock the main mutex */ -void ewol::eSystem::ReleaseSystem(void) +void ewol::eContext::UnLockContext(void) { l_curentInterface = NULL; MutexInterface().UnLock(); } -void ewol::eSystem::InputEventTransfertWidget(ewol::Widget* source, ewol::Widget* destination) +void ewol::eContext::InputEventTransfertWidget(ewol::Widget* source, ewol::Widget* destination) { - m_managementInput.TransfertEvent(source, destination); + m_input.TransfertEvent(source, destination); } -void ewol::eSystem::InputEventGrabPointer(ewol::Widget* widget) +void ewol::eContext::InputEventGrabPointer(ewol::Widget* widget) { - m_managementInput.GrabPointer(widget); + m_input.GrabPointer(widget); } -void ewol::eSystem::InputEventUnGrabPointer(void) +void ewol::eContext::InputEventUnGrabPointer(void) { - m_managementInput.UnGrabPointer(); + m_input.UnGrabPointer(); } -void ewol::eSystem::ProcessEvents(void) +void ewol::eContext::ProcessEvents(void) { int32_t nbEvent = 0; //EWOL_DEBUG(" ******** Event"); @@ -114,11 +113,11 @@ void ewol::eSystem::ProcessEvents(void) break; case THREAD_INPUT_MOTION: //EWOL_DEBUG("Receive MSG : THREAD_INPUT_MOTION"); - m_managementInput.Motion(data.inputType, data.inputId, data.dimention); + m_input.Motion(data.inputType, data.inputId, data.dimention); break; case THREAD_INPUT_STATE: //EWOL_DEBUG("Receive MSG : THREAD_INPUT_STATE"); - m_managementInput.State(data.inputType, data.inputId, data.stateIsDown, data.dimention); + m_input.State(data.inputType, data.inputId, data.stateIsDown, data.dimention); break; case THREAD_KEYBORAD_KEY: case THREAD_KEYBORAD_MOVE: @@ -194,7 +193,7 @@ void ewol::eSystem::ProcessEvents(void) } } -void ewol::eSystem::SetArchiveDir(int mode, const char* str) +void ewol::eContext::SetArchiveDir(int mode, const char* str) { switch(mode) { @@ -221,7 +220,7 @@ void ewol::eSystem::SetArchiveDir(int mode, const char* str) -ewol::eSystem::eSystem(void) : +ewol::eContext::eSystem(void) : m_previousDisplayTime(0), m_managementInput(*this), m_FpsSystemEvent( "Event ", false), @@ -258,7 +257,7 @@ ewol::eSystem::eSystem(void) : EWOL_INFO("==> Ewol System Init (END)"); } -ewol::eSystem::~eSystem(void) +ewol::eContext::~eSystem(void) { EWOL_INFO("==> Ewol System Un-Init (BEGIN)"); // set the curent interface : @@ -277,14 +276,14 @@ ewol::eSystem::~eSystem(void) } -void ewol::eSystem::RequestUpdateSize(void) +void ewol::eContext::RequestUpdateSize(void) { eSystemMessage data; data.TypeMessage = THREAD_RECALCULATE_SIZE; m_msgSystem.Post(data); } -void ewol::eSystem::OS_Resize(const vec2& _size) +void ewol::eContext::OS_Resize(const vec2& _size) { // TODO : Better in the thread ... ==> but generate some init error ... ewol::dimension::SetPixelWindowsSize(_size); @@ -293,7 +292,7 @@ void ewol::eSystem::OS_Resize(const vec2& _size) data.dimention = _size; m_msgSystem.Post(data); } -void ewol::eSystem::OS_Move(const vec2& _pos) +void ewol::eContext::OS_Move(const vec2& _pos) { /* eSystemMessage data; @@ -304,7 +303,7 @@ void ewol::eSystem::OS_Move(const vec2& _pos) */ } -void ewol::eSystem::OS_SetInputMotion(int _pointerID, const vec2& _pos ) +void ewol::eContext::OS_SetInputMotion(int _pointerID, const vec2& _pos ) { eSystemMessage data; data.TypeMessage = THREAD_INPUT_MOTION; @@ -315,7 +314,7 @@ void ewol::eSystem::OS_SetInputMotion(int _pointerID, const vec2& _pos ) } -void ewol::eSystem::OS_SetInputState(int _pointerID, bool _isDown, const vec2& _pos ) +void ewol::eContext::OS_SetInputState(int _pointerID, bool _isDown, const vec2& _pos ) { eSystemMessage data; data.TypeMessage = THREAD_INPUT_STATE; @@ -327,7 +326,7 @@ void ewol::eSystem::OS_SetInputState(int _pointerID, bool _isDown, const vec2& _ } -void ewol::eSystem::OS_SetMouseMotion(int _pointerID, const vec2& _pos ) +void ewol::eContext::OS_SetMouseMotion(int _pointerID, const vec2& _pos ) { eSystemMessage data; data.TypeMessage = THREAD_INPUT_MOTION; @@ -338,7 +337,7 @@ void ewol::eSystem::OS_SetMouseMotion(int _pointerID, const vec2& _pos ) } -void ewol::eSystem::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _pos ) +void ewol::eContext::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _pos ) { eSystemMessage data; data.TypeMessage = THREAD_INPUT_STATE; @@ -350,10 +349,10 @@ void ewol::eSystem::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _ } -void ewol::eSystem::OS_SetKeyboard(ewol::SpecialKey& _special, - uniChar_t _myChar, - bool _isDown, - bool _isARepeateKey) +void ewol::eContext::OS_SetKeyboard(ewol::SpecialKey& _special, + uniChar_t _myChar, + bool _isDown, + bool _isARepeateKey) { eSystemMessage data; data.TypeMessage = THREAD_KEYBORAD_KEY; @@ -364,10 +363,10 @@ void ewol::eSystem::OS_SetKeyboard(ewol::SpecialKey& _special, m_msgSystem.Post(data); } -void ewol::eSystem::OS_SetKeyboardMove(ewol::SpecialKey& _special, - ewol::keyEvent::keyboard_te _move, - bool _isDown, - bool _isARepeateKey) +void ewol::eContext::OS_SetKeyboardMove(ewol::SpecialKey& _special, + ewol::keyEvent::keyboard_te _move, + bool _isDown, + bool _isARepeateKey) { eSystemMessage data; data.TypeMessage = THREAD_KEYBORAD_MOVE; @@ -379,14 +378,14 @@ void ewol::eSystem::OS_SetKeyboardMove(ewol::SpecialKey& _special, } -void ewol::eSystem::OS_Hide(void) +void ewol::eContext::OS_Hide(void) { eSystemMessage data; data.TypeMessage = THREAD_HIDE; m_msgSystem.Post(data); } -void ewol::eSystem::OS_Show(void) +void ewol::eContext::OS_Show(void) { eSystemMessage data; data.TypeMessage = THREAD_SHOW; @@ -394,7 +393,7 @@ void ewol::eSystem::OS_Show(void) } -void ewol::eSystem::OS_ClipBoardArrive(ewol::clipBoard::clipboardListe_te _clipboardID) +void ewol::eContext::OS_ClipBoardArrive(ewol::clipBoard::clipboardListe_te _clipboardID) { eSystemMessage data; data.TypeMessage = THREAD_CLIPBOARD_ARRIVE; @@ -402,7 +401,7 @@ void ewol::eSystem::OS_ClipBoardArrive(ewol::clipBoard::clipboardListe_te _clipb m_msgSystem.Post(data); } -bool ewol::eSystem::OS_Draw(bool _displayEveryTime) +bool ewol::eContext::OS_Draw(bool _displayEveryTime) { int64_t currentTime = ewol::GetTime(); // this is to prevent the multiple display at the a high frequency ... @@ -487,19 +486,19 @@ void ewol::eSystem::OnObjectRemove(ewol::EObject * removeObject) } */ -void ewol::eSystem::ResetIOEvent(void) +void ewol::eContext::ResetIOEvent(void) { - m_managementInput.NewLayerSet(); + m_input.NewLayerSet(); } -void ewol::eSystem::OS_OpenGlContextDestroy(void) +void ewol::eContext::OS_OpenGlContextDestroy(void) { m_resourceManager.ContextHasBeenDestroyed(); } -void ewol::eSystem::SetWindows(ewol::Windows* _windows) +void ewol::eContext::SetWindows(ewol::Windows* _windows) { // set the new pointer as windows system m_windowsCurrent = _windows; @@ -508,7 +507,7 @@ void ewol::eSystem::SetWindows(ewol::Windows* _windows) } -void ewol::eSystem::ForceRedrawAll(void) +void ewol::eContext::ForceRedrawAll(void) { if (NULL != m_windowsCurrent) { m_windowsCurrent->CalculateSize(vec2(m_windowsSize.x(), m_windowsSize.y())); @@ -516,7 +515,7 @@ void ewol::eSystem::ForceRedrawAll(void) } -void ewol::eSystem::OS_Stop(void) +void ewol::eContext::OS_Stop(void) { if (NULL != m_windowsCurrent) { m_windowsCurrent->SysOnKill(); diff --git a/sources/ewol/renderer/eSystem.h b/sources/ewol/renderer/eContext.h similarity index 92% rename from sources/ewol/renderer/eSystem.h rename to sources/ewol/renderer/eContext.h index 905b94a2..6feb9df1 100644 --- a/sources/ewol/renderer/eSystem.h +++ b/sources/ewol/renderer/eContext.h @@ -6,22 +6,21 @@ * @license BSD v3 (see license file) */ -#ifndef __EWOL_SYSTEM_H__ -#define __EWOL_SYSTEM_H__ +#ifndef __EWOL_CONTEXT_H__ +#define __EWOL_CONTEXT_H__ #include +#include #include #include #include #include -#include -#include -#include +#include +#include #include #include #include -#include -#include +#include // TODO : Remove this from here ... @@ -77,8 +76,7 @@ class eSystemMessage { namespace ewol { - // TODO : Rename this Context - class eSystem + class eContext { private: ewol::ConfigFont m_configFont; //!< global font configuration @@ -92,37 +90,27 @@ namespace ewol ewol::EObjectManager m_EObjectManager; //!< eObject Manager main instance public: ewol::EObjectManager& GetEObjectManager(void) { return m_EObjectManager; }; - private: - ewol::EObjectMessageMultiCast m_MessageMulticast; //!< global message multicastiong system - public: - ewol::EObjectMessageMultiCast& GetEObjectMessageMultiCast(void) { return m_MessageMulticast; }; private: ewol::ResourceManager m_resourceManager; //!< global resources Manager public: ewol::ResourceManager& GetResourcesManager(void) { return m_resourceManager; }; public: - eSystem(void); - virtual ~eSystem(void); - public: - /** - * @brief From everyware in the program, we can get the system inteface. - * @return current reference on the instance. - */ - static eSystem& GetSystem(void); + eContext(void); + virtual ~eContext(void); protected: /** * @brief Set the curent interface. * @note this lock the main mutex */ - void SetSystem(void); + void LockContext(void); /** * @brief Set the curent interface at NULL. * @note this un-lock the main mutex */ - void ReleaseSystem(void); + void UnLockContext(void); private: int64_t m_previousDisplayTime; // this is to limit framerate ... in case... - ewol::eSystemInput m_managementInput; + ewol::eInput m_input; etk::MessageFifo m_msgSystem; ewol::Fps m_FpsSystemEvent; ewol::Fps m_FpsSystemContext; @@ -335,6 +323,11 @@ namespace ewol */ static int main(int _argc, const char *_argv[]); }; + /** + * @brief From everyware in the program, we can get the context inteface. + * @return current reference on the instance. + */ + eContext& GetContext(void); }; //!< must be define in CPP by the application ... this are the main init and unInit of the Application diff --git a/sources/ewol/renderer/eSystemInput.cpp b/sources/ewol/renderer/eInput.cpp similarity index 92% rename from sources/ewol/renderer/eSystemInput.cpp rename to sources/ewol/renderer/eInput.cpp index f0b52b4d..a4bd0e1f 100644 --- a/sources/ewol/renderer/eSystemInput.cpp +++ b/sources/ewol/renderer/eInput.cpp @@ -28,7 +28,7 @@ #define EVENT_DEBUG EWOL_VERBOSE //#define EVENT_DEBUG EWOL_DEBUG -void ewol::eSystemInput::CalculateLimit(void) +void ewol::eInput::CalculateLimit(void) { m_eventInputLimit.sepatateTime = 300000; // µs m_eventInputLimit.DpiOffset = m_dpi*100; @@ -36,14 +36,14 @@ void ewol::eSystemInput::CalculateLimit(void) m_eventMouseLimit.DpiOffset = (float)m_dpi*(float)0.1; } -void ewol::eSystemInput::SetDpi(int32_t newDPI) +void ewol::eInput::SetDpi(int32_t newDPI) { m_dpi = newDPI; // recalculate the DPI system ... CalculateLimit(); } -bool ewol::eSystemInput::localEventInput(ewol::keyEvent::type_te _type, +bool ewol::eInput::localEventInput(ewol::keyEvent::type_te _type, ewol::Widget* _destWidget, int32_t _IdInput, ewol::keyEvent::status_te _status, @@ -62,7 +62,7 @@ bool ewol::eSystemInput::localEventInput(ewol::keyEvent::type_te _type, return false; } -void ewol::eSystemInput::AbortElement(InputPoperty_ts *_eventTable, int32_t _idInput, ewol::keyEvent::type_te _type) +void ewol::eInput::AbortElement(InputPoperty_ts *_eventTable, int32_t _idInput, ewol::keyEvent::type_te _type) { if (NULL==_eventTable) { return; @@ -76,7 +76,7 @@ void ewol::eSystemInput::AbortElement(InputPoperty_ts *_eventTable, int32_t _idI } } -void ewol::eSystemInput::CleanElement(InputPoperty_ts *_eventTable, int32_t _idInput) +void ewol::eInput::CleanElement(InputPoperty_ts *_eventTable, int32_t _idInput) { if (NULL==_eventTable) { return; @@ -97,7 +97,7 @@ void ewol::eSystemInput::CleanElement(InputPoperty_ts *_eventTable, int32_t _idI -void ewol::eSystemInput::TransfertEvent(ewol::Widget* source, ewol::Widget* destination) +void ewol::eInput::TransfertEvent(ewol::Widget* source, ewol::Widget* destination) { if( NULL == source || NULL == destination) { @@ -128,22 +128,22 @@ void ewol::eSystemInput::TransfertEvent(ewol::Widget* source, ewol::Widget* dest } } -void ewol::eSystemInput::GrabPointer(ewol::Widget* widget) +void ewol::eInput::GrabPointer(ewol::Widget* widget) { if(NULL==widget) { return; } m_grabWidget = widget; - m_system.GrabPointerEvents(true, widget->GetOrigin() + ivec2(widget->GetSize().x()/2.0f, widget->GetSize().y()/2.0f) ); + m_context.GrabPointerEvents(true, widget->GetOrigin() + ivec2(widget->GetSize().x()/2.0f, widget->GetSize().y()/2.0f) ); } -void ewol::eSystemInput::UnGrabPointer(void) +void ewol::eInput::UnGrabPointer(void) { m_grabWidget = NULL; - m_system.GrabPointerEvents(false, vec2(0,0)); + m_context.GrabPointerEvents(false, vec2(0,0)); } -void ewol::eSystemInput::OnObjectRemove(ewol::EObject * removeObject) +void ewol::eInput::OnObjectRemove(ewol::EObject * removeObject) { for(int32_t iii=0; iii the it was finger event ... -void ewol::eSystemInput::Motion(ewol::keyEvent::type_te type, int pointerID, vec2 pos) +void ewol::eInput::Motion(ewol::keyEvent::type_te type, int pointerID, vec2 pos) { EVENT_DEBUG("motion event : " << type << " " << pointerID << " " << pos); if (MAX_MANAGE_INPUT<=pointerID) { @@ -229,7 +229,7 @@ void ewol::eSystemInput::Motion(ewol::keyEvent::type_te type, int pointerID, vec // not manage input return; } - ewol::Windows* tmpWindows = m_system.GetWindows(); + ewol::Windows* tmpWindows = m_context.GetWindows(); // special case for the mouse event 0 that represent the hover event of the system : if (type == ewol::keyEvent::typeMouse && pointerID == 0) { // this event is all time on the good widget ... and manage the enter and leave ... @@ -302,7 +302,7 @@ void ewol::eSystemInput::Motion(ewol::keyEvent::type_te type, int pointerID, vec } } -void ewol::eSystemInput::State(ewol::keyEvent::type_te type, int pointerID, bool isDown, vec2 pos) +void ewol::eInput::State(ewol::keyEvent::type_te type, int pointerID, bool isDown, vec2 pos) { if (MAX_MANAGE_INPUT<=pointerID) { // reject pointer ==> out of IDs... @@ -329,7 +329,7 @@ void ewol::eSystemInput::State(ewol::keyEvent::type_te type, int pointerID, bool } // get the curent time ... int64_t currentTime = ewol::GetTime(); - ewol::Windows* tmpWindows = m_system.GetWindows(); + ewol::Windows* tmpWindows = m_context.GetWindows(); if (true == isDown) { EWOL_VERBOSE("GUI : Input ID=" << pointerID << "==>" << eventTable[pointerID].destinationInputId << " [DOWN] " << pos); diff --git a/sources/ewol/renderer/eSystemInput.h b/sources/ewol/renderer/eInput.h similarity index 96% rename from sources/ewol/renderer/eSystemInput.h rename to sources/ewol/renderer/eInput.h index 75f427e3..b646ec10 100644 --- a/sources/ewol/renderer/eSystemInput.h +++ b/sources/ewol/renderer/eInput.h @@ -35,8 +35,8 @@ namespace ewol int32_t sepatateTime; int32_t DpiOffset; } inputLimit_ts; - class eSystem; - class eSystemInput + class eContext; + class eInput { // special grab pointer mode : private: @@ -76,10 +76,10 @@ namespace ewol ewol::Widget* destWidget, int32_t realInputId); private: - ewol::eSystem& m_system; + ewol::eContext& m_system; public: - eSystemInput(ewol::eSystem& _system); - ~eSystemInput(void); + eInput(ewol::eContext& _context); + ~eInput(void); void SetDpi(int32_t newDPI); // note if id<0 ==> the it was finger event ... diff --git a/sources/ewol/renderer/os/gui.Example.cpp b/sources/ewol/renderer/os/gui.Example.cpp deleted file mode 100644 index 4b6d4347..00000000 --- a/sources/ewol/renderer/os/gui.Example.cpp +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license BSD v3 (see license file) - */ diff --git a/sources/ewol/renderer/resources/Colored3DObject.cpp b/sources/ewol/resources/Colored3DObject.cpp similarity index 98% rename from sources/ewol/renderer/resources/Colored3DObject.cpp rename to sources/ewol/resources/Colored3DObject.cpp index a4744c63..9416c693 100644 --- a/sources/ewol/renderer/resources/Colored3DObject.cpp +++ b/sources/ewol/resources/Colored3DObject.cpp @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #undef __class__ #define __class__ "Colored3DObject" diff --git a/sources/ewol/renderer/resources/Colored3DObject.h b/sources/ewol/resources/Colored3DObject.h similarity index 88% rename from sources/ewol/renderer/resources/Colored3DObject.h rename to sources/ewol/resources/Colored3DObject.h index d419313c..7680dac0 100644 --- a/sources/ewol/renderer/resources/Colored3DObject.h +++ b/sources/ewol/resources/Colored3DObject.h @@ -10,10 +10,10 @@ #define __COLORED_3D_OBJECT_H__ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/ConfigFile.cpp b/sources/ewol/resources/ConfigFile.cpp similarity index 98% rename from sources/ewol/renderer/resources/ConfigFile.cpp rename to sources/ewol/resources/ConfigFile.cpp index b1434c36..f42e8288 100644 --- a/sources/ewol/renderer/resources/ConfigFile.cpp +++ b/sources/ewol/resources/ConfigFile.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #undef __class__ #define __class__ "ConfigFile" diff --git a/sources/ewol/renderer/resources/ConfigFile.h b/sources/ewol/resources/ConfigFile.h similarity index 97% rename from sources/ewol/renderer/resources/ConfigFile.h rename to sources/ewol/resources/ConfigFile.h index 67a66e61..c9373b61 100644 --- a/sources/ewol/renderer/resources/ConfigFile.h +++ b/sources/ewol/resources/ConfigFile.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/FontFreeType.cpp b/sources/ewol/resources/FontFreeType.cpp similarity index 98% rename from sources/ewol/renderer/resources/FontFreeType.cpp rename to sources/ewol/resources/FontFreeType.cpp index 2a8a6438..eb297ef4 100644 --- a/sources/ewol/renderer/resources/FontFreeType.cpp +++ b/sources/ewol/resources/FontFreeType.cpp @@ -13,9 +13,9 @@ #include -#include -#include -#include +#include +#include +#include #undef __class__ diff --git a/sources/ewol/renderer/resources/FontFreeType.h b/sources/ewol/resources/FontFreeType.h similarity index 96% rename from sources/ewol/renderer/resources/FontFreeType.h rename to sources/ewol/resources/FontFreeType.h index 73e68ce5..794c464f 100644 --- a/sources/ewol/renderer/resources/FontFreeType.h +++ b/sources/ewol/resources/FontFreeType.h @@ -10,7 +10,7 @@ #define __EWOL_FONT_FREE_TYPE_H__ #include -#include +#include extern "C" { #include diff --git a/sources/ewol/renderer/resources/Image.cpp b/sources/ewol/resources/Image.cpp similarity index 83% rename from sources/ewol/renderer/resources/Image.cpp rename to sources/ewol/resources/Image.cpp index 0fc24396..38964e1d 100644 --- a/sources/ewol/renderer/resources/Image.cpp +++ b/sources/ewol/resources/Image.cpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include #undef __class__ diff --git a/sources/ewol/renderer/resources/Image.h b/sources/ewol/resources/Image.h similarity index 88% rename from sources/ewol/renderer/resources/Image.h rename to sources/ewol/resources/Image.h index 0dfdcdcc..d85ff625 100644 --- a/sources/ewol/renderer/resources/Image.h +++ b/sources/ewol/resources/Image.h @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/Mesh.cpp b/sources/ewol/resources/Mesh.cpp similarity index 99% rename from sources/ewol/renderer/resources/Mesh.cpp rename to sources/ewol/resources/Mesh.cpp index 5351152e..06423f9f 100644 --- a/sources/ewol/renderer/resources/Mesh.cpp +++ b/sources/ewol/resources/Mesh.cpp @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #include #undef __class__ diff --git a/sources/ewol/renderer/resources/Mesh.h b/sources/ewol/resources/Mesh.h similarity index 91% rename from sources/ewol/renderer/resources/Mesh.h rename to sources/ewol/resources/Mesh.h index 6b89dd7d..6df6930a 100644 --- a/sources/ewol/renderer/resources/Mesh.h +++ b/sources/ewol/resources/Mesh.h @@ -11,14 +11,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // 3 "float" elements #define MESH_VBO_VERTICES (0) // 2 "float" elements diff --git a/sources/ewol/renderer/resources/Program.cpp b/sources/ewol/resources/Program.cpp similarity index 99% rename from sources/ewol/renderer/resources/Program.cpp rename to sources/ewol/resources/Program.cpp index 132dbb08..6e9536aa 100644 --- a/sources/ewol/renderer/resources/Program.cpp +++ b/sources/ewol/resources/Program.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/sources/ewol/renderer/resources/Program.h b/sources/ewol/resources/Program.h similarity index 98% rename from sources/ewol/renderer/resources/Program.h rename to sources/ewol/resources/Program.h index 8c7d79c3..2cf0def6 100644 --- a/sources/ewol/renderer/resources/Program.h +++ b/sources/ewol/resources/Program.h @@ -13,9 +13,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/Resource.h b/sources/ewol/resources/Resource.h similarity index 100% rename from sources/ewol/renderer/resources/Resource.h rename to sources/ewol/resources/Resource.h diff --git a/sources/ewol/renderer/ResourceManager.cpp b/sources/ewol/resources/ResourceManager.cpp similarity index 99% rename from sources/ewol/renderer/ResourceManager.cpp rename to sources/ewol/resources/ResourceManager.cpp index 26b5818b..c0e54dd4 100644 --- a/sources/ewol/renderer/ResourceManager.cpp +++ b/sources/ewol/resources/ResourceManager.cpp @@ -8,11 +8,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include // Specific for the resource : diff --git a/sources/ewol/renderer/ResourceManager.h b/sources/ewol/resources/ResourceManager.h similarity index 90% rename from sources/ewol/renderer/ResourceManager.h rename to sources/ewol/resources/ResourceManager.h index ff8df358..26355605 100644 --- a/sources/ewol/renderer/ResourceManager.h +++ b/sources/ewol/resources/ResourceManager.h @@ -11,16 +11,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/Shader.cpp b/sources/ewol/resources/Shader.cpp similarity index 98% rename from sources/ewol/renderer/resources/Shader.cpp rename to sources/ewol/resources/Shader.cpp index d08bfe41..5e4d0f64 100644 --- a/sources/ewol/renderer/resources/Shader.cpp +++ b/sources/ewol/resources/Shader.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #undef __class__ diff --git a/sources/ewol/renderer/resources/Shader.h b/sources/ewol/resources/Shader.h similarity index 97% rename from sources/ewol/renderer/resources/Shader.h rename to sources/ewol/resources/Shader.h index f8c2653d..50500055 100644 --- a/sources/ewol/renderer/resources/Shader.h +++ b/sources/ewol/resources/Shader.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/Texture.cpp b/sources/ewol/resources/Texture.cpp similarity index 96% rename from sources/ewol/renderer/resources/Texture.cpp rename to sources/ewol/resources/Texture.cpp index 872e8ae7..915796c2 100644 --- a/sources/ewol/renderer/resources/Texture.cpp +++ b/sources/ewol/resources/Texture.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #undef __class__ #define __class__ "Texture" diff --git a/sources/ewol/renderer/resources/Texture.h b/sources/ewol/resources/Texture.h similarity index 96% rename from sources/ewol/renderer/resources/Texture.h rename to sources/ewol/resources/Texture.h index e8dac666..cedcb204 100644 --- a/sources/ewol/renderer/resources/Texture.h +++ b/sources/ewol/resources/Texture.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace ewol { class Texture : public ewol::Resource { diff --git a/sources/ewol/renderer/resources/TexturedFont.cpp b/sources/ewol/resources/TexturedFont.cpp similarity index 98% rename from sources/ewol/renderer/resources/TexturedFont.cpp rename to sources/ewol/resources/TexturedFont.cpp index 8fe8d637..7058afe5 100644 --- a/sources/ewol/renderer/resources/TexturedFont.cpp +++ b/sources/ewol/resources/TexturedFont.cpp @@ -9,11 +9,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::font::mode_te& _obj) diff --git a/sources/ewol/renderer/resources/TexturedFont.h b/sources/ewol/resources/TexturedFont.h similarity index 95% rename from sources/ewol/renderer/resources/TexturedFont.h rename to sources/ewol/resources/TexturedFont.h index 1eac54b9..62130120 100644 --- a/sources/ewol/renderer/resources/TexturedFont.h +++ b/sources/ewol/resources/TexturedFont.h @@ -9,9 +9,9 @@ #ifndef __EWOL_TEXTURED_FONT_H__ #define __EWOL_TEXTURED_FONT_H__ -#include -#include -#include +#include +#include +#include namespace ewol { diff --git a/sources/ewol/renderer/resources/VirtualBufferObject.cpp b/sources/ewol/resources/VirtualBufferObject.cpp similarity index 97% rename from sources/ewol/renderer/resources/VirtualBufferObject.cpp rename to sources/ewol/resources/VirtualBufferObject.cpp index 259e7f55..f40e6e13 100644 --- a/sources/ewol/renderer/resources/VirtualBufferObject.cpp +++ b/sources/ewol/resources/VirtualBufferObject.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #undef __class__ #define __class__ "VirtualBufferObject" diff --git a/sources/ewol/renderer/resources/VirtualBufferObject.h b/sources/ewol/resources/VirtualBufferObject.h similarity index 98% rename from sources/ewol/renderer/resources/VirtualBufferObject.h rename to sources/ewol/resources/VirtualBufferObject.h index d599a1f1..d42f606d 100644 --- a/sources/ewol/renderer/resources/VirtualBufferObject.h +++ b/sources/ewol/resources/VirtualBufferObject.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #define NB_VBO_MAX (4) diff --git a/sources/ewol/renderer/resources/font/FontBase.h b/sources/ewol/resources/font/FontBase.h similarity index 89% rename from sources/ewol/renderer/resources/font/FontBase.h rename to sources/ewol/resources/font/FontBase.h index 911326f4..fb3bd6ed 100644 --- a/sources/ewol/renderer/resources/font/FontBase.h +++ b/sources/ewol/resources/font/FontBase.h @@ -12,9 +12,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace ewol diff --git a/sources/ewol/renderer/resources/font/GlyphProperty.h b/sources/ewol/resources/font/GlyphProperty.h similarity index 98% rename from sources/ewol/renderer/resources/font/GlyphProperty.h rename to sources/ewol/resources/font/GlyphProperty.h index e69a39bf..739b4fc4 100644 --- a/sources/ewol/renderer/resources/font/GlyphProperty.h +++ b/sources/ewol/resources/font/GlyphProperty.h @@ -9,7 +9,7 @@ #ifndef __EWOL_FONT_GLYPH_PROPERTY_H__ #define __EWOL_FONT_GLYPH_PROPERTY_H__ -#include +#include namespace ewol diff --git a/sources/ewol/renderer/resources/font/Kerning.h b/sources/ewol/resources/font/Kerning.h similarity index 100% rename from sources/ewol/renderer/resources/font/Kerning.h rename to sources/ewol/resources/font/Kerning.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsBox.cpp b/sources/ewol/resources/physicsShape/PhysicsBox.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsBox.cpp rename to sources/ewol/resources/physicsShape/PhysicsBox.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsBox.h b/sources/ewol/resources/physicsShape/PhysicsBox.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsBox.h rename to sources/ewol/resources/physicsShape/PhysicsBox.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCapsule.cpp b/sources/ewol/resources/physicsShape/PhysicsCapsule.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCapsule.cpp rename to sources/ewol/resources/physicsShape/PhysicsCapsule.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCapsule.h b/sources/ewol/resources/physicsShape/PhysicsCapsule.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCapsule.h rename to sources/ewol/resources/physicsShape/PhysicsCapsule.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCone.cpp b/sources/ewol/resources/physicsShape/PhysicsCone.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCone.cpp rename to sources/ewol/resources/physicsShape/PhysicsCone.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCone.h b/sources/ewol/resources/physicsShape/PhysicsCone.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCone.h rename to sources/ewol/resources/physicsShape/PhysicsCone.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsConvexHull.cpp b/sources/ewol/resources/physicsShape/PhysicsConvexHull.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsConvexHull.cpp rename to sources/ewol/resources/physicsShape/PhysicsConvexHull.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsConvexHull.h b/sources/ewol/resources/physicsShape/PhysicsConvexHull.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsConvexHull.h rename to sources/ewol/resources/physicsShape/PhysicsConvexHull.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCylinder.cpp b/sources/ewol/resources/physicsShape/PhysicsCylinder.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCylinder.cpp rename to sources/ewol/resources/physicsShape/PhysicsCylinder.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsCylinder.h b/sources/ewol/resources/physicsShape/PhysicsCylinder.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsCylinder.h rename to sources/ewol/resources/physicsShape/PhysicsCylinder.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsShape.cpp b/sources/ewol/resources/physicsShape/PhysicsShape.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsShape.cpp rename to sources/ewol/resources/physicsShape/PhysicsShape.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsShape.h b/sources/ewol/resources/physicsShape/PhysicsShape.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsShape.h rename to sources/ewol/resources/physicsShape/PhysicsShape.h diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsSphere.cpp b/sources/ewol/resources/physicsShape/PhysicsSphere.cpp similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsSphere.cpp rename to sources/ewol/resources/physicsShape/PhysicsSphere.cpp diff --git a/sources/ewol/renderer/resources/physicsShape/PhysicsSphere.h b/sources/ewol/resources/physicsShape/PhysicsSphere.h similarity index 100% rename from sources/ewol/renderer/resources/physicsShape/PhysicsSphere.h rename to sources/ewol/resources/physicsShape/PhysicsSphere.h diff --git a/sources/lutin_ewol.py b/sources/lutin_ewol.py index 7c3be2ee..14f4caef 100755 --- a/sources/lutin_ewol.py +++ b/sources/lutin_ewol.py @@ -18,10 +18,9 @@ def Create(target): 'ewol/commandLine.cpp', 'ewol/key.cpp', 'ewol/cursor.cpp', - 'ewol/Dimension.cpp']) - - # Basic Eobject of EWOL - myModule.AddSrcFile([]) + 'ewol/Dimension.cpp', + 'ewol/Light.cpp', + 'ewol/Material.cpp']) #openGl Basic access abstraction (for the model matrix and include myModule.AddSrcFile([ @@ -35,31 +34,29 @@ def Create(target): 'ewol/renderer/EventInput.cpp', 'ewol/renderer/EventEntry.cpp', 'ewol/renderer/EventTime.cpp', - 'ewol/renderer/Light.cpp', - 'ewol/renderer/Material.cpp', - 'ewol/renderer/eSystem.cpp', - 'ewol/renderer/eSystemInput.cpp']) + 'ewol/renderer/eContext.cpp', + 'ewol/renderer/eInput.cpp']) # renderer : myModule.AddSrcFile([ - 'ewol/renderer/resources/Shader.cpp', - 'ewol/renderer/resources/Program.cpp', - 'ewol/renderer/resources/VirtualBufferObject.cpp', - 'ewol/renderer/resources/ConfigFile.cpp', - 'ewol/renderer/resources/FontFreeType.cpp', - 'ewol/renderer/resources/TexturedFont.cpp', - 'ewol/renderer/resources/Mesh.cpp', - 'ewol/renderer/resources/Texture.cpp', - 'ewol/renderer/resources/Colored3DObject.cpp', - 'ewol/renderer/resources/Image.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsShape.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsBox.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsCapsule.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsCone.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsConvexHull.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsCylinder.cpp', - 'ewol/renderer/resources/physicsShape/PhysicsSphere.cpp', - 'ewol/renderer/ResourceManager.cpp']) + 'ewol/resources/Shader.cpp', + 'ewol/resources/Program.cpp', + 'ewol/resources/VirtualBufferObject.cpp', + 'ewol/resources/ConfigFile.cpp', + 'ewol/resources/FontFreeType.cpp', + 'ewol/resources/TexturedFont.cpp', + 'ewol/resources/Mesh.cpp', + 'ewol/resources/Texture.cpp', + 'ewol/resources/Colored3DObject.cpp', + 'ewol/resources/Image.cpp', + 'ewol/resources/physicsShape/PhysicsShape.cpp', + 'ewol/resources/physicsShape/PhysicsBox.cpp', + 'ewol/resources/physicsShape/PhysicsCapsule.cpp', + 'ewol/resources/physicsShape/PhysicsCone.cpp', + 'ewol/resources/physicsShape/PhysicsConvexHull.cpp', + 'ewol/resources/physicsShape/PhysicsCylinder.cpp', + 'ewol/resources/physicsShape/PhysicsSphere.cpp', + 'ewol/resources/ResourceManager.cpp']) # Audio system myModule.AddSrcFile([