[DEV] change all directory and rework some names (step 4)
This commit is contained in:
parent
f89d88e62a
commit
3b874d3786
@ -6,7 +6,7 @@
|
|||||||
* @license BSD v3 (see license file)
|
* @license BSD v3 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ewol/renderer/Light.h>
|
#include <ewol/Light.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
|
|
||||||
ewol::Light::Light(void) :
|
ewol::Light::Light(void) :
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/math/Vector3D.h>
|
#include <etk/math/Vector3D.h>
|
||||||
#include <etk/math/Vector4D.h>
|
#include <etk/math/Vector4D.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -6,8 +6,8 @@
|
|||||||
* @license BSD v3 (see license file)
|
* @license BSD v3 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/Material.h>
|
#include <ewol/Material.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
|
|
||||||
ewol::MaterialGlId::MaterialGlId(void) :
|
ewol::MaterialGlId::MaterialGlId(void) :
|
@ -12,8 +12,8 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/math/Vector3D.h>
|
#include <etk/math/Vector3D.h>
|
||||||
#include <etk/math/Vector4D.h>
|
#include <etk/math/Vector4D.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
#include <ewol/renderer/resources/Image.h>
|
#include <ewol/resources/Image.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/clipBoard.h>
|
#include <ewol/clipBoard.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "ClipBoard"
|
#define __class__ "ClipBoard"
|
||||||
@ -123,10 +123,10 @@ void ewol::clipBoard::SetSystem(ewol::clipBoard::clipboardListe_te _clipboardID,
|
|||||||
mesCopy[_clipboardID] = _data;
|
mesCopy[_clipboardID] = _data;
|
||||||
}
|
}
|
||||||
|
|
||||||
const etk::UString emptyString("");
|
|
||||||
|
|
||||||
const etk::UString& ewol::clipBoard::Get(ewol::clipBoard::clipboardListe_te _clipboardID)
|
const etk::UString& ewol::clipBoard::Get(ewol::clipBoard::clipboardListe_te _clipboardID)
|
||||||
{
|
{
|
||||||
|
static const etk::UString emptyString("");
|
||||||
if(_clipboardID >= ewol::clipBoard::clipboardCount) {
|
if(_clipboardID >= ewol::clipBoard::clipboardCount) {
|
||||||
EWOL_WARNING("request ClickBoard id error");
|
EWOL_WARNING("request ClickBoard id error");
|
||||||
return emptyString;
|
return emptyString;
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/EventTime.h>
|
#include <ewol/renderer/EventTime.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Image.h>
|
#include <ewol/compositing/Image.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Text.h>
|
#include <ewol/compositing/Text.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "ewol::Text"
|
#define __class__ "ewol::Text"
|
||||||
@ -320,10 +320,10 @@ void ewol::Text::SetFont(etk::UString _fontName, int32_t _fontSize)
|
|||||||
m_font = NULL;
|
m_font = NULL;
|
||||||
}
|
}
|
||||||
if (_fontSize <= 0) {
|
if (_fontSize <= 0) {
|
||||||
_fontSize = ewol::eSystem::GetSystem().GetFontDefault().GetSize();
|
_fontSize = ewol::GetContext().GetFontDefault().GetSize();
|
||||||
}
|
}
|
||||||
if (_fontName == "") {
|
if (_fontName == "") {
|
||||||
_fontName = ewol::eSystem::GetSystem().GetFontDefault().GetName();
|
_fontName = ewol::GetContext().GetFontDefault().GetName();
|
||||||
}
|
}
|
||||||
_fontName += ":";
|
_fontName += ":";
|
||||||
_fontName += _fontSize;
|
_fontName += _fontSize;
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/compositing/Compositing.h>
|
#include <ewol/compositing/Compositing.h>
|
||||||
#include <ewol/compositing/Drawing.h>
|
#include <ewol/compositing/Drawing.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <exml/exml.h>
|
#include <exml/exml.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <ewol/ewol.h>
|
#include <ewol/ewol.h>
|
||||||
#include <ewol/widget/WidgetManager.h>
|
#include <ewol/widget/WidgetManager.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
#include <ewol/commandLine.h>
|
#include <ewol/commandLine.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
@ -52,7 +52,7 @@ int32_t ewol::Run(int32_t _argc, const char* _argv[])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// call standard RUN ...
|
// call standard RUN ...
|
||||||
int32_t error = ewol::eSystem::main(_argc, _argv);
|
int32_t error = ewol::eContext::main(_argc, _argv);
|
||||||
|
|
||||||
ewol::commandLine::Clean();
|
ewol::commandLine::Clean();
|
||||||
|
|
||||||
@ -154,7 +154,7 @@ etk::UString ewol::GetVersion(void)
|
|||||||
|
|
||||||
int64_t ewol::GetTime(void)
|
int64_t ewol::GetTime(void)
|
||||||
{
|
{
|
||||||
return ewol::eSystem::GetTime();
|
return ewol::eContext::GetTime();
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
void ewol::InputEventTransfertWidget(ewol::Widget* _source, ewol::Widget* _destination)
|
void ewol::InputEventTransfertWidget(ewol::Widget* _source, ewol::Widget* _destination)
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ewol/renderer/ConfigFont.h>
|
#include <ewol/renderer/ConfigFont.h>
|
||||||
#include <ewol/renderer/resources/FontFreeType.h>
|
#include <ewol/resources/FontFreeType.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "ConfigFont"
|
#define __class__ "ConfigFont"
|
||||||
|
@ -11,22 +11,22 @@
|
|||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eSystem.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "EObjectMessageMultiCast"
|
#define __class__ "EMultiCast"
|
||||||
|
|
||||||
ewol::EObjectMessageMultiCast::EObjectMessageMultiCast(void)
|
ewol::EMultiCast::EMultiCast(void)
|
||||||
{
|
{
|
||||||
EWOL_INFO("EObject message Multi-Cast");
|
EWOL_INFO("EObject message Multi-Cast");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ewol::EObjectMessageMultiCast::~EObjectMessageMultiCast(void)
|
ewol::EMultiCast::~EMultiCast(void)
|
||||||
{
|
{
|
||||||
EWOL_INFO("EObject message Multi-Cast");
|
EWOL_INFO("EObject message Multi-Cast");
|
||||||
m_messageList.Clear();
|
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) {
|
if (NULL == _object) {
|
||||||
EWOL_ERROR("Add with 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) {
|
if (NULL == _object) {
|
||||||
EWOL_ERROR("Rm with 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 :");
|
EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :");
|
||||||
|
|
@ -17,7 +17,7 @@
|
|||||||
#include <ewol/renderer/EObject.h>
|
#include <ewol/renderer/EObject.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
class EObjectMessageMultiCast
|
class EMultiCast
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
class MessageList {
|
class MessageList {
|
||||||
@ -28,8 +28,8 @@ namespace ewol {
|
|||||||
};
|
};
|
||||||
etk::Vector<MessageList> m_messageList; //!< List of all message ...
|
etk::Vector<MessageList> m_messageList; //!< List of all message ...
|
||||||
public:
|
public:
|
||||||
EObjectMessageMultiCast(void);
|
EMultiCast();
|
||||||
~EObjectMessageMultiCast(void);
|
~EMultiCast(void);
|
||||||
void AnonymousSend(const char* const _messageId, const etk::UString& _data) { Send(NULL, _messageId, _data); };
|
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 Send(ewol::EObject* _object, const char* const _message, const etk::UString& _data);
|
||||||
void Rm(ewol::EObject* _object);
|
void Rm(ewol::EObject* _object);
|
@ -8,9 +8,8 @@
|
|||||||
|
|
||||||
#include <ewol/renderer/EObject.h>
|
#include <ewol/renderer/EObject.h>
|
||||||
#include <ewol/renderer/EObjectManager.h>
|
#include <ewol/renderer/EObjectManager.h>
|
||||||
#include <ewol/renderer/EObjectMessageMultiCast.h>
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "ewol::EObject"
|
#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)
|
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)
|
ewol::eSystem& ewol::EObject::GetSystem(void)
|
||||||
{
|
{
|
||||||
return ewol::eSystem::GetSystem();
|
return ewol::GetContext();
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ namespace ewol {
|
|||||||
// some class need to define element befor other ...
|
// some class need to define element befor other ...
|
||||||
class EObject;
|
class EObject;
|
||||||
class EObjectManager;
|
class EObjectManager;
|
||||||
class EObjectMessageMultiCast;
|
class EMultiCast;
|
||||||
class eSystem;
|
class eSystem;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -228,7 +228,7 @@ namespace ewol {
|
|||||||
* @breif Get the current EObject Message Multicast manager.
|
* @breif Get the current EObject Message Multicast manager.
|
||||||
* @return the requested object manager.
|
* @return the requested object manager.
|
||||||
*/
|
*/
|
||||||
ewol::EObjectMessageMultiCast& GetEObjectMessageMultiCast(void);
|
ewol::EMultiCast& GetEObjectMessageMultiCast(void);
|
||||||
/**
|
/**
|
||||||
* @brief Get the curent the system inteface.
|
* @brief Get the curent the system inteface.
|
||||||
* @return current reference on the instance.
|
* @return current reference on the instance.
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/renderer/EObject.h>
|
#include <ewol/renderer/EObject.h>
|
||||||
|
#include <ewol/renderer/EMultiCast.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
@ -32,6 +33,10 @@ namespace ewol
|
|||||||
ewol::EObject* Get(const etk::UString& _name);
|
ewol::EObject* Get(const etk::UString& _name);
|
||||||
private:
|
private:
|
||||||
void informOneObjectIsRemoved(ewol::EObject* _object);
|
void informOneObjectIsRemoved(ewol::EObject* _object);
|
||||||
|
private:
|
||||||
|
ewol::EMultiCast m_multiCast; //!< muticast manager
|
||||||
|
public:
|
||||||
|
ewol::EMultiCast MultiCast(void) { return m_multiCast; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -17,9 +17,8 @@
|
|||||||
#include <ewol/renderer/EObject.h>
|
#include <ewol/renderer/EObject.h>
|
||||||
#include <ewol/renderer/EObjectManager.h>
|
#include <ewol/renderer/EObjectManager.h>
|
||||||
|
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/eSystemInput.h>
|
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
|
|
||||||
#include <ewol/widget/WidgetManager.h>
|
#include <ewol/widget/WidgetManager.h>
|
||||||
@ -41,8 +40,8 @@ static etk::Mutex& MutexInterface(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static ewol::eSystem* l_curentInterface=NULL;
|
static ewol::eContext* l_curentInterface=NULL;
|
||||||
ewol::eSystem& ewol::eSystem::GetSystem(void)
|
ewol::eContext& ewol::GetContext(void)
|
||||||
{
|
{
|
||||||
#if DEBUG_LEVEL > 2
|
#if DEBUG_LEVEL > 2
|
||||||
if(NULL == l_curentInterface){
|
if(NULL == l_curentInterface){
|
||||||
@ -56,7 +55,7 @@ ewol::eSystem& ewol::eSystem::GetSystem(void)
|
|||||||
* @brief Set the curent interface.
|
* @brief Set the curent interface.
|
||||||
* @note this lock the main mutex
|
* @note this lock the main mutex
|
||||||
*/
|
*/
|
||||||
void ewol::eSystem::SetSystem(void)
|
void ewol::eContext::LockContext(void)
|
||||||
{
|
{
|
||||||
MutexInterface().Lock();
|
MutexInterface().Lock();
|
||||||
l_curentInterface = this;
|
l_curentInterface = this;
|
||||||
@ -66,29 +65,29 @@ void ewol::eSystem::SetSystem(void)
|
|||||||
* @brief Set the curent interface at NULL.
|
* @brief Set the curent interface at NULL.
|
||||||
* @note this un-lock the main mutex
|
* @note this un-lock the main mutex
|
||||||
*/
|
*/
|
||||||
void ewol::eSystem::ReleaseSystem(void)
|
void ewol::eContext::UnLockContext(void)
|
||||||
{
|
{
|
||||||
l_curentInterface = NULL;
|
l_curentInterface = NULL;
|
||||||
MutexInterface().UnLock();
|
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;
|
int32_t nbEvent = 0;
|
||||||
//EWOL_DEBUG(" ******** Event");
|
//EWOL_DEBUG(" ******** Event");
|
||||||
@ -114,11 +113,11 @@ void ewol::eSystem::ProcessEvents(void)
|
|||||||
break;
|
break;
|
||||||
case THREAD_INPUT_MOTION:
|
case THREAD_INPUT_MOTION:
|
||||||
//EWOL_DEBUG("Receive MSG : 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;
|
break;
|
||||||
case THREAD_INPUT_STATE:
|
case THREAD_INPUT_STATE:
|
||||||
//EWOL_DEBUG("Receive MSG : 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;
|
break;
|
||||||
case THREAD_KEYBORAD_KEY:
|
case THREAD_KEYBORAD_KEY:
|
||||||
case THREAD_KEYBORAD_MOVE:
|
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)
|
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_previousDisplayTime(0),
|
||||||
m_managementInput(*this),
|
m_managementInput(*this),
|
||||||
m_FpsSystemEvent( "Event ", false),
|
m_FpsSystemEvent( "Event ", false),
|
||||||
@ -258,7 +257,7 @@ ewol::eSystem::eSystem(void) :
|
|||||||
EWOL_INFO("==> Ewol System Init (END)");
|
EWOL_INFO("==> Ewol System Init (END)");
|
||||||
}
|
}
|
||||||
|
|
||||||
ewol::eSystem::~eSystem(void)
|
ewol::eContext::~eSystem(void)
|
||||||
{
|
{
|
||||||
EWOL_INFO("==> Ewol System Un-Init (BEGIN)");
|
EWOL_INFO("==> Ewol System Un-Init (BEGIN)");
|
||||||
// set the curent interface :
|
// set the curent interface :
|
||||||
@ -277,14 +276,14 @@ ewol::eSystem::~eSystem(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ewol::eSystem::RequestUpdateSize(void)
|
void ewol::eContext::RequestUpdateSize(void)
|
||||||
{
|
{
|
||||||
eSystemMessage data;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_RECALCULATE_SIZE;
|
data.TypeMessage = THREAD_RECALCULATE_SIZE;
|
||||||
m_msgSystem.Post(data);
|
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 ...
|
// TODO : Better in the thread ... ==> but generate some init error ...
|
||||||
ewol::dimension::SetPixelWindowsSize(_size);
|
ewol::dimension::SetPixelWindowsSize(_size);
|
||||||
@ -293,7 +292,7 @@ void ewol::eSystem::OS_Resize(const vec2& _size)
|
|||||||
data.dimention = _size;
|
data.dimention = _size;
|
||||||
m_msgSystem.Post(data);
|
m_msgSystem.Post(data);
|
||||||
}
|
}
|
||||||
void ewol::eSystem::OS_Move(const vec2& _pos)
|
void ewol::eContext::OS_Move(const vec2& _pos)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
eSystemMessage data;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_INPUT_MOTION;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_INPUT_STATE;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_INPUT_MOTION;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_INPUT_STATE;
|
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,
|
void ewol::eContext::OS_SetKeyboard(ewol::SpecialKey& _special,
|
||||||
uniChar_t _myChar,
|
uniChar_t _myChar,
|
||||||
bool _isDown,
|
bool _isDown,
|
||||||
bool _isARepeateKey)
|
bool _isARepeateKey)
|
||||||
{
|
{
|
||||||
eSystemMessage data;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_KEYBORAD_KEY;
|
data.TypeMessage = THREAD_KEYBORAD_KEY;
|
||||||
@ -364,10 +363,10 @@ void ewol::eSystem::OS_SetKeyboard(ewol::SpecialKey& _special,
|
|||||||
m_msgSystem.Post(data);
|
m_msgSystem.Post(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ewol::eSystem::OS_SetKeyboardMove(ewol::SpecialKey& _special,
|
void ewol::eContext::OS_SetKeyboardMove(ewol::SpecialKey& _special,
|
||||||
ewol::keyEvent::keyboard_te _move,
|
ewol::keyEvent::keyboard_te _move,
|
||||||
bool _isDown,
|
bool _isDown,
|
||||||
bool _isARepeateKey)
|
bool _isARepeateKey)
|
||||||
{
|
{
|
||||||
eSystemMessage data;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_KEYBORAD_MOVE;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_HIDE;
|
data.TypeMessage = THREAD_HIDE;
|
||||||
m_msgSystem.Post(data);
|
m_msgSystem.Post(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ewol::eSystem::OS_Show(void)
|
void ewol::eContext::OS_Show(void)
|
||||||
{
|
{
|
||||||
eSystemMessage data;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_SHOW;
|
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;
|
eSystemMessage data;
|
||||||
data.TypeMessage = THREAD_CLIPBOARD_ARRIVE;
|
data.TypeMessage = THREAD_CLIPBOARD_ARRIVE;
|
||||||
@ -402,7 +401,7 @@ void ewol::eSystem::OS_ClipBoardArrive(ewol::clipBoard::clipboardListe_te _clipb
|
|||||||
m_msgSystem.Post(data);
|
m_msgSystem.Post(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ewol::eSystem::OS_Draw(bool _displayEveryTime)
|
bool ewol::eContext::OS_Draw(bool _displayEveryTime)
|
||||||
{
|
{
|
||||||
int64_t currentTime = ewol::GetTime();
|
int64_t currentTime = ewol::GetTime();
|
||||||
// this is to prevent the multiple display at the a high frequency ...
|
// 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();
|
m_resourceManager.ContextHasBeenDestroyed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ewol::eSystem::SetWindows(ewol::Windows* _windows)
|
void ewol::eContext::SetWindows(ewol::Windows* _windows)
|
||||||
{
|
{
|
||||||
// set the new pointer as windows system
|
// set the new pointer as windows system
|
||||||
m_windowsCurrent = _windows;
|
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) {
|
if (NULL != m_windowsCurrent) {
|
||||||
m_windowsCurrent->CalculateSize(vec2(m_windowsSize.x(), m_windowsSize.y()));
|
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) {
|
if (NULL != m_windowsCurrent) {
|
||||||
m_windowsCurrent->SysOnKill();
|
m_windowsCurrent->SysOnKill();
|
@ -6,22 +6,21 @@
|
|||||||
* @license BSD v3 (see license file)
|
* @license BSD v3 (see license file)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __EWOL_SYSTEM_H__
|
#ifndef __EWOL_CONTEXT_H__
|
||||||
#define __EWOL_SYSTEM_H__
|
#define __EWOL_CONTEXT_H__
|
||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
|
#include <etk/MessageFifo.h>
|
||||||
#include <ewol/key.h>
|
#include <ewol/key.h>
|
||||||
#include <ewol/ewol.h>
|
#include <ewol/ewol.h>
|
||||||
#include <ewol/clipBoard.h>
|
#include <ewol/clipBoard.h>
|
||||||
#include <ewol/widget/Windows.h>
|
#include <ewol/widget/Windows.h>
|
||||||
#include <ewol/renderer/eSystemInput.h>
|
#include <ewol/renderer/eInput.h>
|
||||||
#include <ewol/renderer/os/Fps.h>
|
#include <ewol/renderer/Fps.h>
|
||||||
#include <etk/MessageFifo.h>
|
|
||||||
#include <ewol/widget/WidgetManager.h>
|
#include <ewol/widget/WidgetManager.h>
|
||||||
#include <ewol/renderer/ConfigFont.h>
|
#include <ewol/renderer/ConfigFont.h>
|
||||||
#include <ewol/renderer/EObjectManager.h>
|
#include <ewol/renderer/EObjectManager.h>
|
||||||
#include <ewol/renderer/EObjectMessageMultiCast.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
|
||||||
|
|
||||||
|
|
||||||
// TODO : Remove this from here ...
|
// TODO : Remove this from here ...
|
||||||
@ -77,8 +76,7 @@ class eSystemMessage {
|
|||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
||||||
// TODO : Rename this Context
|
class eContext
|
||||||
class eSystem
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
ewol::ConfigFont m_configFont; //!< global font configuration
|
ewol::ConfigFont m_configFont; //!< global font configuration
|
||||||
@ -92,37 +90,27 @@ namespace ewol
|
|||||||
ewol::EObjectManager m_EObjectManager; //!< eObject Manager main instance
|
ewol::EObjectManager m_EObjectManager; //!< eObject Manager main instance
|
||||||
public:
|
public:
|
||||||
ewol::EObjectManager& GetEObjectManager(void) { return m_EObjectManager; };
|
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:
|
private:
|
||||||
ewol::ResourceManager m_resourceManager; //!< global resources Manager
|
ewol::ResourceManager m_resourceManager; //!< global resources Manager
|
||||||
public:
|
public:
|
||||||
ewol::ResourceManager& GetResourcesManager(void) { return m_resourceManager; };
|
ewol::ResourceManager& GetResourcesManager(void) { return m_resourceManager; };
|
||||||
public:
|
public:
|
||||||
eSystem(void);
|
eContext(void);
|
||||||
virtual ~eSystem(void);
|
virtual ~eContext(void);
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* @brief From everyware in the program, we can get the system inteface.
|
|
||||||
* @return current reference on the instance.
|
|
||||||
*/
|
|
||||||
static eSystem& GetSystem(void);
|
|
||||||
protected:
|
protected:
|
||||||
/**
|
/**
|
||||||
* @brief Set the curent interface.
|
* @brief Set the curent interface.
|
||||||
* @note this lock the main mutex
|
* @note this lock the main mutex
|
||||||
*/
|
*/
|
||||||
void SetSystem(void);
|
void LockContext(void);
|
||||||
/**
|
/**
|
||||||
* @brief Set the curent interface at NULL.
|
* @brief Set the curent interface at NULL.
|
||||||
* @note this un-lock the main mutex
|
* @note this un-lock the main mutex
|
||||||
*/
|
*/
|
||||||
void ReleaseSystem(void);
|
void UnLockContext(void);
|
||||||
private:
|
private:
|
||||||
int64_t m_previousDisplayTime; // this is to limit framerate ... in case...
|
int64_t m_previousDisplayTime; // this is to limit framerate ... in case...
|
||||||
ewol::eSystemInput m_managementInput;
|
ewol::eInput m_input;
|
||||||
etk::MessageFifo<eSystemMessage> m_msgSystem;
|
etk::MessageFifo<eSystemMessage> m_msgSystem;
|
||||||
ewol::Fps m_FpsSystemEvent;
|
ewol::Fps m_FpsSystemEvent;
|
||||||
ewol::Fps m_FpsSystemContext;
|
ewol::Fps m_FpsSystemContext;
|
||||||
@ -335,6 +323,11 @@ namespace ewol
|
|||||||
*/
|
*/
|
||||||
static int main(int _argc, const char *_argv[]);
|
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
|
//!< must be define in CPP by the application ... this are the main init and unInit of the Application
|
@ -28,7 +28,7 @@
|
|||||||
#define EVENT_DEBUG EWOL_VERBOSE
|
#define EVENT_DEBUG EWOL_VERBOSE
|
||||||
//#define EVENT_DEBUG EWOL_DEBUG
|
//#define EVENT_DEBUG EWOL_DEBUG
|
||||||
|
|
||||||
void ewol::eSystemInput::CalculateLimit(void)
|
void ewol::eInput::CalculateLimit(void)
|
||||||
{
|
{
|
||||||
m_eventInputLimit.sepatateTime = 300000; // µs
|
m_eventInputLimit.sepatateTime = 300000; // µs
|
||||||
m_eventInputLimit.DpiOffset = m_dpi*100;
|
m_eventInputLimit.DpiOffset = m_dpi*100;
|
||||||
@ -36,14 +36,14 @@ void ewol::eSystemInput::CalculateLimit(void)
|
|||||||
m_eventMouseLimit.DpiOffset = (float)m_dpi*(float)0.1;
|
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;
|
m_dpi = newDPI;
|
||||||
// recalculate the DPI system ...
|
// recalculate the DPI system ...
|
||||||
CalculateLimit();
|
CalculateLimit();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ewol::eSystemInput::localEventInput(ewol::keyEvent::type_te _type,
|
bool ewol::eInput::localEventInput(ewol::keyEvent::type_te _type,
|
||||||
ewol::Widget* _destWidget,
|
ewol::Widget* _destWidget,
|
||||||
int32_t _IdInput,
|
int32_t _IdInput,
|
||||||
ewol::keyEvent::status_te _status,
|
ewol::keyEvent::status_te _status,
|
||||||
@ -62,7 +62,7 @@ bool ewol::eSystemInput::localEventInput(ewol::keyEvent::type_te _type,
|
|||||||
return false;
|
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) {
|
if (NULL==_eventTable) {
|
||||||
return;
|
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) {
|
if (NULL==_eventTable) {
|
||||||
return;
|
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
|
if( NULL == source
|
||||||
|| NULL == destination) {
|
|| 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) {
|
if(NULL==widget) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_grabWidget = widget;
|
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_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++) {
|
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
|
||||||
if (m_eventInputSaved[iii].curentWidgetEvent == removeObject) {
|
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++) {
|
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
|
||||||
// remove the property of this input ...
|
// 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_grabWidget(NULL),
|
||||||
m_system(_system)
|
m_context(_context)
|
||||||
{
|
{
|
||||||
SetDpi(200);
|
SetDpi(200);
|
||||||
EWOL_INFO("Init (start)");
|
EWOL_INFO("Init (start)");
|
||||||
@ -182,14 +182,14 @@ ewol::eSystemInput::eSystemInput(ewol::eSystem& _system) :
|
|||||||
EWOL_INFO("Init (end)");
|
EWOL_INFO("Init (end)");
|
||||||
}
|
}
|
||||||
|
|
||||||
ewol::eSystemInput::~eSystemInput(void)
|
ewol::eInput::~eInput(void)
|
||||||
{
|
{
|
||||||
EWOL_INFO("Un-Init (start)");
|
EWOL_INFO("Un-Init (start)");
|
||||||
EWOL_INFO("Un-Init (end)");
|
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) {
|
if (_type == ewol::keyEvent::typeFinger) {
|
||||||
int32_t lastMinimum = 0;
|
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 ...
|
// 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);
|
EVENT_DEBUG("motion event : " << type << " " << pointerID << " " << pos);
|
||||||
if (MAX_MANAGE_INPUT<=pointerID) {
|
if (MAX_MANAGE_INPUT<=pointerID) {
|
||||||
@ -229,7 +229,7 @@ void ewol::eSystemInput::Motion(ewol::keyEvent::type_te type, int pointerID, vec
|
|||||||
// not manage input
|
// not manage input
|
||||||
return;
|
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 :
|
// special case for the mouse event 0 that represent the hover event of the system :
|
||||||
if (type == ewol::keyEvent::typeMouse && pointerID == 0) {
|
if (type == ewol::keyEvent::typeMouse && pointerID == 0) {
|
||||||
// this event is all time on the good widget ... and manage the enter and leave ...
|
// 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) {
|
if (MAX_MANAGE_INPUT<=pointerID) {
|
||||||
// reject pointer ==> out of IDs...
|
// 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 ...
|
// get the curent time ...
|
||||||
int64_t currentTime = ewol::GetTime();
|
int64_t currentTime = ewol::GetTime();
|
||||||
ewol::Windows* tmpWindows = m_system.GetWindows();
|
ewol::Windows* tmpWindows = m_context.GetWindows();
|
||||||
|
|
||||||
if (true == isDown) {
|
if (true == isDown) {
|
||||||
EWOL_VERBOSE("GUI : Input ID=" << pointerID << "==>" << eventTable[pointerID].destinationInputId << " [DOWN] " << pos);
|
EWOL_VERBOSE("GUI : Input ID=" << pointerID << "==>" << eventTable[pointerID].destinationInputId << " [DOWN] " << pos);
|
@ -35,8 +35,8 @@ namespace ewol
|
|||||||
int32_t sepatateTime;
|
int32_t sepatateTime;
|
||||||
int32_t DpiOffset;
|
int32_t DpiOffset;
|
||||||
} inputLimit_ts;
|
} inputLimit_ts;
|
||||||
class eSystem;
|
class eContext;
|
||||||
class eSystemInput
|
class eInput
|
||||||
{
|
{
|
||||||
// special grab pointer mode :
|
// special grab pointer mode :
|
||||||
private:
|
private:
|
||||||
@ -76,10 +76,10 @@ namespace ewol
|
|||||||
ewol::Widget* destWidget,
|
ewol::Widget* destWidget,
|
||||||
int32_t realInputId);
|
int32_t realInputId);
|
||||||
private:
|
private:
|
||||||
ewol::eSystem& m_system;
|
ewol::eContext& m_system;
|
||||||
public:
|
public:
|
||||||
eSystemInput(ewol::eSystem& _system);
|
eInput(ewol::eContext& _context);
|
||||||
~eSystemInput(void);
|
~eInput(void);
|
||||||
void SetDpi(int32_t newDPI);
|
void SetDpi(int32_t newDPI);
|
||||||
|
|
||||||
// note if id<0 ==> the it was finger event ...
|
// note if id<0 ==> the it was finger event ...
|
@ -1,7 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author Edouard DUPIN
|
|
||||||
*
|
|
||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
|
||||||
*
|
|
||||||
* @license BSD v3 (see license file)
|
|
||||||
*/
|
|
@ -7,8 +7,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Colored3DObject.h>
|
#include <ewol/resources/Colored3DObject.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "Colored3DObject"
|
#define __class__ "Colored3DObject"
|
@ -10,10 +10,10 @@
|
|||||||
#define __COLORED_3D_OBJECT_H__
|
#define __COLORED_3D_OBJECT_H__
|
||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/resources/Image.h>
|
#include <ewol/resources/Image.h>
|
||||||
#include <ewol/renderer/resources/Shader.h>
|
#include <ewol/resources/Shader.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/ConfigFile.h>
|
#include <ewol/resources/ConfigFile.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "ConfigFile"
|
#define __class__ "ConfigFile"
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -13,9 +13,9 @@
|
|||||||
|
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
|
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
#include <ewol/renderer/resources/FontFreeType.h>
|
#include <ewol/resources/FontFreeType.h>
|
||||||
#include <ewol/renderer/resources/font/FontBase.h>
|
#include <ewol/resources/font/FontBase.h>
|
||||||
|
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
@ -10,7 +10,7 @@
|
|||||||
#define __EWOL_FONT_FREE_TYPE_H__
|
#define __EWOL_FONT_FREE_TYPE_H__
|
||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/renderer/resources/font/FontBase.h>
|
#include <ewol/resources/font/FontBase.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <freetype/ft2build.h>
|
#include <freetype/ft2build.h>
|
@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <egami/egami.h>
|
#include <egami/egami.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/resources/Image.h>
|
#include <ewol/resources/Image.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
|
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
@ -12,8 +12,8 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/UString.h>
|
#include <etk/UString.h>
|
||||||
#include <egami/Image.h>
|
#include <egami/Image.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -7,8 +7,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Mesh.h>
|
#include <ewol/resources/Mesh.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
@ -11,14 +11,14 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/Hach.h>
|
#include <etk/Hach.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/resources/Image.h>
|
#include <ewol/resources/Image.h>
|
||||||
#include <ewol/renderer/resources/Shader.h>
|
#include <ewol/resources/Shader.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
#include <ewol/renderer/resources/VirtualBufferObject.h>
|
#include <ewol/resources/VirtualBufferObject.h>
|
||||||
#include <ewol/renderer/Light.h>
|
#include <ewol/Light.h>
|
||||||
#include <ewol/renderer/Material.h>
|
#include <ewol/Material.h>
|
||||||
#include <ewol/renderer/resources/physicsShape/PhysicsShape.h>
|
#include <ewol/resources/physicsShape/PhysicsShape.h>
|
||||||
// 3 "float" elements
|
// 3 "float" elements
|
||||||
#define MESH_VBO_VERTICES (0)
|
#define MESH_VBO_VERTICES (0)
|
||||||
// 2 "float" elements
|
// 2 "float" elements
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
#include <ewol/ewol.h>
|
#include <ewol/ewol.h>
|
||||||
|
|
@ -13,9 +13,9 @@
|
|||||||
#include <etk/math/Vector4D.h>
|
#include <etk/math/Vector4D.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/resources/Shader.h>
|
#include <ewol/resources/Shader.h>
|
||||||
#include <ewol/renderer/resources/VirtualBufferObject.h>
|
#include <ewol/resources/VirtualBufferObject.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -8,11 +8,11 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/resources/FontFreeType.h>
|
#include <ewol/resources/FontFreeType.h>
|
||||||
#include <ewol/ewol.h>
|
#include <ewol/ewol.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
|
|
||||||
// Specific for the resource :
|
// Specific for the resource :
|
@ -11,16 +11,16 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/resources/Shader.h>
|
#include <ewol/resources/Shader.h>
|
||||||
#include <ewol/renderer/resources/Program.h>
|
#include <ewol/resources/Program.h>
|
||||||
#include <ewol/renderer/resources/VirtualBufferObject.h>
|
#include <ewol/resources/VirtualBufferObject.h>
|
||||||
#include <ewol/renderer/resources/ConfigFile.h>
|
#include <ewol/resources/ConfigFile.h>
|
||||||
#include <ewol/renderer/resources/TexturedFont.h>
|
#include <ewol/resources/TexturedFont.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
#include <ewol/renderer/resources/Image.h>
|
#include <ewol/resources/Image.h>
|
||||||
#include <ewol/renderer/resources/Mesh.h>
|
#include <ewol/resources/Mesh.h>
|
||||||
#include <ewol/renderer/resources/Colored3DObject.h>
|
#include <ewol/resources/Colored3DObject.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -9,7 +9,7 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Shader.h>
|
#include <ewol/resources/Shader.h>
|
||||||
|
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -9,8 +9,8 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/ewol.h>
|
#include <ewol/ewol.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "Texture"
|
#define __class__ "Texture"
|
@ -13,7 +13,7 @@
|
|||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <egami/Image.h>
|
#include <egami/Image.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
class Texture : public ewol::Resource {
|
class Texture : public ewol::Resource {
|
@ -9,11 +9,11 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
|
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/eSystem.h>
|
#include <ewol/renderer/eContext.h>
|
||||||
|
|
||||||
#include <ewol/renderer/resources/font/FontBase.h>
|
#include <ewol/resources/font/FontBase.h>
|
||||||
#include <ewol/renderer/resources/TexturedFont.h>
|
#include <ewol/resources/TexturedFont.h>
|
||||||
|
|
||||||
|
|
||||||
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::font::mode_te& _obj)
|
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::font::mode_te& _obj)
|
@ -9,9 +9,9 @@
|
|||||||
#ifndef __EWOL_TEXTURED_FONT_H__
|
#ifndef __EWOL_TEXTURED_FONT_H__
|
||||||
#define __EWOL_TEXTURED_FONT_H__
|
#define __EWOL_TEXTURED_FONT_H__
|
||||||
|
|
||||||
#include <ewol/renderer/resources/font/FontBase.h>
|
#include <ewol/resources/font/FontBase.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
||||||
{
|
{
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/ResourceManager.h>
|
#include <ewol/resources/ResourceManager.h>
|
||||||
#include <ewol/renderer/resources/VirtualBufferObject.h>
|
#include <ewol/resources/VirtualBufferObject.h>
|
||||||
|
|
||||||
#undef __class__
|
#undef __class__
|
||||||
#define __class__ "VirtualBufferObject"
|
#define __class__ "VirtualBufferObject"
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <etk/math/Vector2D.h>
|
#include <etk/math/Vector2D.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/openGL.h>
|
#include <ewol/renderer/openGL.h>
|
||||||
|
|
||||||
#define NB_VBO_MAX (4)
|
#define NB_VBO_MAX (4)
|
@ -12,9 +12,9 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <egami/Image.h>
|
#include <egami/Image.h>
|
||||||
#include <ewol/renderer/resources/Texture.h>
|
#include <ewol/resources/Texture.h>
|
||||||
#include <ewol/renderer/resources/Resource.h>
|
#include <ewol/resources/Resource.h>
|
||||||
#include <ewol/renderer/resources/font/GlyphProperty.h>
|
#include <ewol/resources/font/GlyphProperty.h>
|
||||||
|
|
||||||
|
|
||||||
namespace ewol
|
namespace ewol
|
@ -9,7 +9,7 @@
|
|||||||
#ifndef __EWOL_FONT_GLYPH_PROPERTY_H__
|
#ifndef __EWOL_FONT_GLYPH_PROPERTY_H__
|
||||||
#define __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
|
namespace ewol
|
@ -18,10 +18,9 @@ def Create(target):
|
|||||||
'ewol/commandLine.cpp',
|
'ewol/commandLine.cpp',
|
||||||
'ewol/key.cpp',
|
'ewol/key.cpp',
|
||||||
'ewol/cursor.cpp',
|
'ewol/cursor.cpp',
|
||||||
'ewol/Dimension.cpp'])
|
'ewol/Dimension.cpp',
|
||||||
|
'ewol/Light.cpp',
|
||||||
# Basic Eobject of EWOL
|
'ewol/Material.cpp'])
|
||||||
myModule.AddSrcFile([])
|
|
||||||
|
|
||||||
#openGl Basic access abstraction (for the model matrix and include
|
#openGl Basic access abstraction (for the model matrix and include
|
||||||
myModule.AddSrcFile([
|
myModule.AddSrcFile([
|
||||||
@ -35,31 +34,29 @@ def Create(target):
|
|||||||
'ewol/renderer/EventInput.cpp',
|
'ewol/renderer/EventInput.cpp',
|
||||||
'ewol/renderer/EventEntry.cpp',
|
'ewol/renderer/EventEntry.cpp',
|
||||||
'ewol/renderer/EventTime.cpp',
|
'ewol/renderer/EventTime.cpp',
|
||||||
'ewol/renderer/Light.cpp',
|
'ewol/renderer/eContext.cpp',
|
||||||
'ewol/renderer/Material.cpp',
|
'ewol/renderer/eInput.cpp'])
|
||||||
'ewol/renderer/eSystem.cpp',
|
|
||||||
'ewol/renderer/eSystemInput.cpp'])
|
|
||||||
|
|
||||||
# renderer :
|
# renderer :
|
||||||
myModule.AddSrcFile([
|
myModule.AddSrcFile([
|
||||||
'ewol/renderer/resources/Shader.cpp',
|
'ewol/resources/Shader.cpp',
|
||||||
'ewol/renderer/resources/Program.cpp',
|
'ewol/resources/Program.cpp',
|
||||||
'ewol/renderer/resources/VirtualBufferObject.cpp',
|
'ewol/resources/VirtualBufferObject.cpp',
|
||||||
'ewol/renderer/resources/ConfigFile.cpp',
|
'ewol/resources/ConfigFile.cpp',
|
||||||
'ewol/renderer/resources/FontFreeType.cpp',
|
'ewol/resources/FontFreeType.cpp',
|
||||||
'ewol/renderer/resources/TexturedFont.cpp',
|
'ewol/resources/TexturedFont.cpp',
|
||||||
'ewol/renderer/resources/Mesh.cpp',
|
'ewol/resources/Mesh.cpp',
|
||||||
'ewol/renderer/resources/Texture.cpp',
|
'ewol/resources/Texture.cpp',
|
||||||
'ewol/renderer/resources/Colored3DObject.cpp',
|
'ewol/resources/Colored3DObject.cpp',
|
||||||
'ewol/renderer/resources/Image.cpp',
|
'ewol/resources/Image.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsShape.cpp',
|
'ewol/resources/physicsShape/PhysicsShape.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsBox.cpp',
|
'ewol/resources/physicsShape/PhysicsBox.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsCapsule.cpp',
|
'ewol/resources/physicsShape/PhysicsCapsule.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsCone.cpp',
|
'ewol/resources/physicsShape/PhysicsCone.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsConvexHull.cpp',
|
'ewol/resources/physicsShape/PhysicsConvexHull.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsCylinder.cpp',
|
'ewol/resources/physicsShape/PhysicsCylinder.cpp',
|
||||||
'ewol/renderer/resources/physicsShape/PhysicsSphere.cpp',
|
'ewol/resources/physicsShape/PhysicsSphere.cpp',
|
||||||
'ewol/renderer/ResourceManager.cpp'])
|
'ewol/resources/ResourceManager.cpp'])
|
||||||
|
|
||||||
# Audio system
|
# Audio system
|
||||||
myModule.AddSrcFile([
|
myModule.AddSrcFile([
|
||||||
|
Loading…
x
Reference in New Issue
Block a user