[DEV] change all directory and rework some names (step 4)

This commit is contained in:
Edouard DUPIN 2013-08-30 22:33:05 +02:00
parent f89d88e62a
commit 3b874d3786
79 changed files with 215 additions and 229 deletions

View File

@ -6,7 +6,7 @@
* @license BSD v3 (see license file)
*/
#include <ewol/renderer/Light.h>
#include <ewol/Light.h>
#include <ewol/debug.h>
ewol::Light::Light(void) :

View File

@ -12,7 +12,7 @@
#include <etk/types.h>
#include <etk/math/Vector3D.h>
#include <etk/math/Vector4D.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/resources/Program.h>
namespace ewol
{

View File

@ -6,8 +6,8 @@
* @license BSD v3 (see license file)
*/
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/Material.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/Material.h>
#include <ewol/debug.h>
ewol::MaterialGlId::MaterialGlId(void) :

View File

@ -12,8 +12,8 @@
#include <etk/types.h>
#include <etk/math/Vector3D.h>
#include <etk/math/Vector4D.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/renderer/resources/Image.h>
#include <ewol/resources/Program.h>
#include <ewol/resources/Image.h>
namespace ewol
{

View File

@ -10,7 +10,7 @@
#include <ewol/debug.h>
#include <ewol/clipBoard.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/eContext.h>
#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;

View File

@ -11,7 +11,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
namespace ewol
{

View File

@ -13,7 +13,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
namespace ewol

View File

@ -11,7 +11,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
namespace ewol
{

View File

@ -11,7 +11,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
namespace ewol
{

View File

@ -11,7 +11,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/renderer/EventTime.h>
namespace ewol

View File

@ -11,7 +11,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Image.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
namespace ewol
{

View File

@ -8,7 +8,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Text.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/eContext.h>
#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;

View File

@ -14,7 +14,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Compositing.h>
#include <ewol/compositing/Drawing.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
#include <exml/exml.h>
namespace ewol

View File

@ -8,7 +8,7 @@
#include <ewol/ewol.h>
#include <ewol/widget/WidgetManager.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/eContext.h>
#include <ewol/commandLine.h>
#include <etk/os/FSNode.h>
@ -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)

View File

@ -7,7 +7,7 @@
*/
#include <ewol/renderer/ConfigFont.h>
#include <ewol/renderer/resources/FontFreeType.h>
#include <ewol/resources/FontFreeType.h>
#undef __class__
#define __class__ "ConfigFont"

View File

@ -11,22 +11,22 @@
#include <ewol/renderer/eSystem.h>
#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 :");

View File

@ -17,7 +17,7 @@
#include <ewol/renderer/EObject.h>
namespace ewol {
class EObjectMessageMultiCast
class EMultiCast
{
private:
class MessageList {
@ -28,8 +28,8 @@ namespace ewol {
};
etk::Vector<MessageList> 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);

View File

@ -8,9 +8,8 @@
#include <ewol/renderer/EObject.h>
#include <ewol/renderer/EObjectManager.h>
#include <ewol/renderer/EObjectMessageMultiCast.h>
#include <ewol/debug.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/eContext.h>
#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();
}

View File

@ -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.

View File

@ -11,6 +11,7 @@
#include <etk/types.h>
#include <ewol/renderer/EObject.h>
#include <ewol/renderer/EMultiCast.h>
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; };
};
};

View File

@ -17,9 +17,8 @@
#include <ewol/renderer/EObject.h>
#include <ewol/renderer/EObjectManager.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/eSystemInput.h>
#include <ewol/renderer/eContext.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/renderer/openGL.h>
#include <ewol/widget/WidgetManager.h>
@ -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();

View File

@ -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 <etk/types.h>
#include <etk/MessageFifo.h>
#include <ewol/key.h>
#include <ewol/ewol.h>
#include <ewol/clipBoard.h>
#include <ewol/widget/Windows.h>
#include <ewol/renderer/eSystemInput.h>
#include <ewol/renderer/os/Fps.h>
#include <etk/MessageFifo.h>
#include <ewol/renderer/eInput.h>
#include <ewol/renderer/Fps.h>
#include <ewol/widget/WidgetManager.h>
#include <ewol/renderer/ConfigFont.h>
#include <ewol/renderer/EObjectManager.h>
#include <ewol/renderer/EObjectMessageMultiCast.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/ResourceManager.h>
// 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<eSystemMessage> 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

View File

@ -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<MAX_MANAGE_INPUT; iii++) {
if (m_eventInputSaved[iii].curentWidgetEvent == removeObject) {
@ -157,7 +157,7 @@ void ewol::eSystemInput::OnObjectRemove(ewol::EObject * removeObject)
}
}
void ewol::eSystemInput::NewLayerSet(void)
void ewol::eInput::NewLayerSet(void)
{
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
// remove the property of this input ...
@ -168,9 +168,9 @@ void ewol::eSystemInput::NewLayerSet(void)
}
}
ewol::eSystemInput::eSystemInput(ewol::eSystem& _system) :
ewol::eInput::eInput(ewol::eContext& _context) :
m_grabWidget(NULL),
m_system(_system)
m_context(_context)
{
SetDpi(200);
EWOL_INFO("Init (start)");
@ -182,14 +182,14 @@ ewol::eSystemInput::eSystemInput(ewol::eSystem& _system) :
EWOL_INFO("Init (end)");
}
ewol::eSystemInput::~eSystemInput(void)
ewol::eInput::~eInput(void)
{
EWOL_INFO("Un-Init (start)");
EWOL_INFO("Un-Init (end)");
}
int32_t ewol::eSystemInput::localGetDestinationId(ewol::keyEvent::type_te _type, ewol::Widget* _destWidget, int32_t _realInputId)
int32_t ewol::eInput::localGetDestinationId(ewol::keyEvent::type_te _type, ewol::Widget* _destWidget, int32_t _realInputId)
{
if (_type == ewol::keyEvent::typeFinger) {
int32_t lastMinimum = 0;
@ -208,7 +208,7 @@ int32_t ewol::eSystemInput::localGetDestinationId(ewol::keyEvent::type_te _type,
}
// note if id<0 ==> 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);

View File

@ -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 ...

View File

@ -1,7 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/

View File

@ -7,8 +7,8 @@
*/
#include <ewol/debug.h>
#include <ewol/renderer/resources/Colored3DObject.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/Colored3DObject.h>
#include <ewol/resources/ResourceManager.h>
#undef __class__
#define __class__ "Colored3DObject"

View File

@ -10,10 +10,10 @@
#define __COLORED_3D_OBJECT_H__
#include <etk/types.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/renderer/resources/Image.h>
#include <ewol/renderer/resources/Shader.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/resources/Resource.h>
#include <ewol/resources/Image.h>
#include <ewol/resources/Shader.h>
#include <ewol/resources/Program.h>
namespace ewol
{

View File

@ -8,7 +8,7 @@
#include <etk/os/FSNode.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/ConfigFile.h>
#include <ewol/resources/ConfigFile.h>
#undef __class__
#define __class__ "ConfigFile"

View File

@ -11,7 +11,7 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/Resource.h>
namespace ewol
{

View File

@ -13,9 +13,9 @@
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/renderer/resources/FontFreeType.h>
#include <ewol/renderer/resources/font/FontBase.h>
#include <ewol/resources/Texture.h>
#include <ewol/resources/FontFreeType.h>
#include <ewol/resources/font/FontBase.h>
#undef __class__

View File

@ -10,7 +10,7 @@
#define __EWOL_FONT_FREE_TYPE_H__
#include <etk/types.h>
#include <ewol/renderer/resources/font/FontBase.h>
#include <ewol/resources/font/FontBase.h>
extern "C" {
#include <freetype/ft2build.h>

View File

@ -9,9 +9,9 @@
#include <etk/types.h>
#include <egami/egami.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/resources/Image.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/resources/Image.h>
#include <ewol/resources/Texture.h>
#undef __class__

View File

@ -12,8 +12,8 @@
#include <etk/types.h>
#include <etk/UString.h>
#include <egami/Image.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/Texture.h>
#include <ewol/resources/Resource.h>
namespace ewol
{

View File

@ -7,8 +7,8 @@
*/
#include <ewol/debug.h>
#include <ewol/renderer/resources/Mesh.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/Mesh.h>
#include <ewol/resources/ResourceManager.h>
#include <etk/os/FSNode.h>
#undef __class__

View File

@ -11,14 +11,14 @@
#include <etk/types.h>
#include <etk/Hach.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/renderer/resources/Image.h>
#include <ewol/renderer/resources/Shader.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/renderer/resources/VirtualBufferObject.h>
#include <ewol/renderer/Light.h>
#include <ewol/renderer/Material.h>
#include <ewol/renderer/resources/physicsShape/PhysicsShape.h>
#include <ewol/resources/Resource.h>
#include <ewol/resources/Image.h>
#include <ewol/resources/Shader.h>
#include <ewol/resources/Program.h>
#include <ewol/resources/VirtualBufferObject.h>
#include <ewol/Light.h>
#include <ewol/Material.h>
#include <ewol/resources/physicsShape/PhysicsShape.h>
// 3 "float" elements
#define MESH_VBO_VERTICES (0)
// 2 "float" elements

View File

@ -8,8 +8,8 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/resources/Program.h>
#include <ewol/resources/ResourceManager.h>
#include <etk/os/FSNode.h>
#include <ewol/ewol.h>

View File

@ -13,9 +13,9 @@
#include <etk/math/Vector4D.h>
#include <ewol/debug.h>
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/renderer/resources/Shader.h>
#include <ewol/renderer/resources/VirtualBufferObject.h>
#include <ewol/resources/Resource.h>
#include <ewol/resources/Shader.h>
#include <ewol/resources/VirtualBufferObject.h>
namespace ewol
{

View File

@ -8,11 +8,11 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/resources/FontFreeType.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/resources/FontFreeType.h>
#include <ewol/ewol.h>
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/renderer/eContext.h>
// Specific for the resource :

View File

@ -11,16 +11,16 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/renderer/resources/Shader.h>
#include <ewol/renderer/resources/Program.h>
#include <ewol/renderer/resources/VirtualBufferObject.h>
#include <ewol/renderer/resources/ConfigFile.h>
#include <ewol/renderer/resources/TexturedFont.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/renderer/resources/Image.h>
#include <ewol/renderer/resources/Mesh.h>
#include <ewol/renderer/resources/Colored3DObject.h>
#include <ewol/resources/Resource.h>
#include <ewol/resources/Shader.h>
#include <ewol/resources/Program.h>
#include <ewol/resources/VirtualBufferObject.h>
#include <ewol/resources/ConfigFile.h>
#include <ewol/resources/TexturedFont.h>
#include <ewol/resources/Texture.h>
#include <ewol/resources/Image.h>
#include <ewol/resources/Mesh.h>
#include <ewol/resources/Colored3DObject.h>
namespace ewol
{

View File

@ -9,7 +9,7 @@
#include <etk/types.h>
#include <etk/os/FSNode.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/Shader.h>
#include <ewol/resources/Shader.h>
#undef __class__

View File

@ -12,7 +12,7 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/Resource.h>
namespace ewol
{

View File

@ -9,8 +9,8 @@
#include <etk/types.h>
#include <ewol/ewol.h>
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/resources/Texture.h>
#undef __class__
#define __class__ "Texture"

View File

@ -13,7 +13,7 @@
#include <ewol/debug.h>
#include <egami/Image.h>
#include <ewol/renderer/openGL.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/Resource.h>
namespace ewol {
class Texture : public ewol::Resource {

View File

@ -9,11 +9,11 @@
#include <etk/types.h>
#include <etk/os/FSNode.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/eSystem.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/renderer/eContext.h>
#include <ewol/renderer/resources/font/FontBase.h>
#include <ewol/renderer/resources/TexturedFont.h>
#include <ewol/resources/font/FontBase.h>
#include <ewol/resources/TexturedFont.h>
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::font::mode_te& _obj)

View File

@ -9,9 +9,9 @@
#ifndef __EWOL_TEXTURED_FONT_H__
#define __EWOL_TEXTURED_FONT_H__
#include <ewol/renderer/resources/font/FontBase.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/font/FontBase.h>
#include <ewol/resources/Texture.h>
#include <ewol/resources/Resource.h>
namespace ewol
{

View File

@ -8,8 +8,8 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/ResourceManager.h>
#include <ewol/renderer/resources/VirtualBufferObject.h>
#include <ewol/resources/ResourceManager.h>
#include <ewol/resources/VirtualBufferObject.h>
#undef __class__
#define __class__ "VirtualBufferObject"

View File

@ -12,7 +12,7 @@
#include <etk/types.h>
#include <etk/math/Vector2D.h>
#include <ewol/debug.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/resources/Resource.h>
#include <ewol/renderer/openGL.h>
#define NB_VBO_MAX (4)

View File

@ -12,9 +12,9 @@
#include <etk/types.h>
#include <ewol/debug.h>
#include <egami/Image.h>
#include <ewol/renderer/resources/Texture.h>
#include <ewol/renderer/resources/Resource.h>
#include <ewol/renderer/resources/font/GlyphProperty.h>
#include <ewol/resources/Texture.h>
#include <ewol/resources/Resource.h>
#include <ewol/resources/font/GlyphProperty.h>
namespace ewol

View File

@ -9,7 +9,7 @@
#ifndef __EWOL_FONT_GLYPH_PROPERTY_H__
#define __EWOL_FONT_GLYPH_PROPERTY_H__
#include <ewol/renderer/resources/font/Kerning.h>
#include <ewol/resources/font/Kerning.h>
namespace ewol

View File

@ -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([