[DEV] UPDATE gale infra

This commit is contained in:
Edouard DUPIN 2015-08-04 23:24:28 +02:00
parent 84a00bffbe
commit 9dea7c306e
9 changed files with 85 additions and 36 deletions

84
.gitignore vendored
View File

@ -1,28 +1,64 @@
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
###################################
# folders
###################################
CVS
.svn
Object_*
doxygen/API/
doxygen/ALL/
# Compiled Dynamic libraries
*.so
*.dylib
###################################
# backup files
###################################
*~
*.swp
*.old
*.bck
###################################
# Compiled source #
###################################
*.com
*.class
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.o
*.so
*.pyc
tags
#ewol
out
ewol_debug
ewol_release
###################################
# Packages #
###################################
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
###################################
# Logs and databases #
###################################
*.log
*.sql
*.sqlite
###################################
# OS generated files #
###################################
.DS_Store?
ehthumbs.db
Icon?
Thumbs.db
Sources/libewol/ewol/os/AndroidAbstraction.cpp
org_ewol_EwolConstants.h

View File

@ -146,3 +146,7 @@ void gale::Application::setOrientation(enum gale::orientation _orientation) {
enum gale::orientation gale::Application::getOrientation() {
return gale::orientation_screenAuto;
}
void gale::Application::onClipboardEvent(enum gale::context::clipBoard::clipboardListe _clipboardId) {
}

View File

@ -17,6 +17,7 @@
#include <gale/key/type.h>
#include <gale/key/Special.h>
#include <gale/context/cursor.h>
#include <gale/context/clipBoard.h>
namespace gale {
class Context;
@ -187,6 +188,12 @@ namespace gale {
* @return Current orientation.
*/
virtual enum gale::orientation getOrientation();
public:
/**
* @brief A clipboard data is back (apear after a request of a new clipboard).
* @param[in] _clipboardId Id of the clipboard.
*/
virtual void onClipboardEvent(enum gale::context::clipBoard::clipboardListe _clipboardId);
};
}

View File

@ -237,14 +237,12 @@ void gale::Context::processEvents() {
#endif
break;
case eSystemMessage::msgClipboardArrive:
#if 0
{
std::shared_ptr<gale::Widget> tmpWidget = m_widgetManager.focusGet();
if (tmpWidget != nullptr) {
tmpWidget->onEventClipboard(data->clipboardID);
std::shared_ptr<gale::Application> appl = m_application;
if (appl != nullptr) {
appl->onClipboardEvent(data->clipboardID);
}
}
#endif
break;
case eSystemMessage::msgHide:
GALE_DEBUG("Receive MSG : msgHide");
@ -560,6 +558,8 @@ void gale::Context::clipBoardSet(enum gale::context::clipBoard::clipboardListe _
}
bool gale::Context::OS_Draw(bool _displayEveryTime) {
// TODO : Remove this force at true ...
_displayEveryTime = true;
int64_t currentTime = gale::getTime();
// this is to prevent the multiple display at the a high frequency ...
#if (!defined(__TARGET_OS__Android) && !defined(__TARGET_OS__Windows))

View File

@ -21,6 +21,7 @@
#include <gale/context/Fps.h>
#include <memory>
#include <gale/orientation.h>
#include <gale/context/clipBoard.h>
#define MAX_MANAGE_INPUT (15)

View File

@ -61,7 +61,7 @@ void gale::resource::Manager::display() {
std::shared_ptr<gale::Resource> tmpRessource = it.lock();
if (tmpRessource != nullptr) {
GALE_INFO(" [" << tmpRessource->getId() << "]"
<< tmpRessource->getObjectType()
<< tmpRessource->getType()
<< "=\"" << tmpRessource->getName() << "\" "
<< tmpRessource.use_count() << " elements");
}
@ -80,7 +80,7 @@ void gale::resource::Manager::reLoadResources() {
if(tmpRessource != nullptr) {
if (jjj == tmpRessource->getResourceLevel()) {
tmpRessource->reload();
GALE_INFO(" [" << tmpRessource->getId() << "]="<< tmpRessource->getObjectType());
GALE_INFO(" [" << tmpRessource->getId() << "]="<< tmpRessource->getType());
}
}
}
@ -106,6 +106,7 @@ void gale::resource::Manager::update(const std::shared_ptr<gale::Resource>& _obj
// Specific to load or update the data in the openGl context == > system use only
void gale::resource::Manager::updateContext() {
// TODO : Check the number of call this ... GALE_INFO("update open-gl context ... ");
if (m_contextHasBeenRemoved == true) {
// need to update all ...
m_contextHasBeenRemoved = false;

View File

@ -32,7 +32,7 @@ void gale::Resource::init(const std::string& _name) {
m_name = _name;
}
const char * const gale::Resource::getObjectType() {
const char * const gale::Resource::getType() {
if (m_listType.size() == 0) {
return "gale::Resource";
}

View File

@ -139,7 +139,7 @@ namespace gale {
* @brief get the current type of the Resource
* @return the last type name of the element
*/
const char* const getObjectType();
const char* const getType();
/**
* @brief Get the herarchic of the Resource type.
* @return descriptive string.

View File

@ -33,9 +33,9 @@ namespace gale {
bool m_loaded; //!< internal state of the openGl system.
// Gale internal API:
public:
void updateContext();
void removeContext();
void removeContextToLate();
virtual void updateContext();
virtual void removeContext();
virtual void removeContextToLate();
// middleware interface:
public:
uint32_t getRendererId() const {