atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add extra compilation flags & correct warning

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-27 21:33:34 +01:00
parent e975c52b6e
commit c89f157d1a
50 changed files with 296 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build

@ -1 +1 @@
Subproject commit 01f75930774fae683d70b50bd62b5681bceaca74 Subproject commit 051759ed892a8392fb0dfb75308608765f321827

2
external/bullet/lutin_bullet.py vendored
View File

@ -9,6 +9,8 @@ def Create(target):
myModule = lutinModule.module(__file__, 'bullet', 'LIBRARY') myModule = lutinModule.module(__file__, 'bullet', 'LIBRARY')
myModule.AddModuleDepend(['linearmath']) myModule.AddModuleDepend(['linearmath'])
#remove compilation warning (specific for external libs):
myModule.remove_compile_warning()
myModule.CompileFlags_CC([ myModule.CompileFlags_CC([
'-Wno-write-strings', '-Wno-write-strings',

2
external/bullet/lutin_linearmath.py vendored
View File

@ -7,6 +7,8 @@ import lutinTools
def Create(target): def Create(target):
myModule = lutinModule.module(__file__, 'linearmath', 'LIBRARY') myModule = lutinModule.module(__file__, 'linearmath', 'LIBRARY')
#remove compilation warning (specific for external libs):
myModule.remove_compile_warning()
myModule.AddSrcFile([ myModule.AddSrcFile([
'bullet/src/LinearMath/btQuickprof.cpp', 'bullet/src/LinearMath/btQuickprof.cpp',

2
external/egami vendored

@ -1 +1 @@
Subproject commit e2d2e514682f72cb35916d00048b2ccc460dd2c8 Subproject commit 80e3d4b47dbf3dc97eb2469b15ad6d9169b19986

2
external/ege vendored

@ -1 +1 @@
Subproject commit 803ae2fc3bb894109826fb763cbc4b0091393038 Subproject commit b616a99bfac3e293ffe1d78b7ac5aa58c7113fa6

2
external/ejson vendored

@ -1 +1 @@
Subproject commit 564ec3130f3874c3bcc2235976f2d85996c4f770 Subproject commit 7593b52dd9657301370c31d7a97465fa7b450ae0

2
external/etk vendored

@ -1 +1 @@
Subproject commit b507f48e4733d1bde152435fd7997f788101cd7b Subproject commit 9f47018aa4fcac3c2bfd92012576be76e2c56b20

2
external/exml vendored

@ -1 +1 @@
Subproject commit c24b20b9d20bfa2d648e51152eb8182fb4537f03 Subproject commit 0cfb9c2130d5fadeb46c2b08d28dde609a6736af

2
external/freetype vendored

@ -1 +1 @@
Subproject commit d3adbca45b32e33e9834c359fac5308e96769bd7 Subproject commit 9532cd9800336c9259aa0f746f146446343a5703

1
sources/ewol/Dimension.cpp
View File

@ -178,6 +178,7 @@ vec2 ewol::Dimension::get(enum ewol::Dimension::distance _type) const {
case ewol::Dimension::foot: case ewol::Dimension::foot:
return getFoot(); return getFoot();
} }
return vec2(0,0);
} }
void ewol::Dimension::set(const vec2& _size, enum ewol::Dimension::distance _type) { void ewol::Dimension::set(const vec2& _size, enum ewol::Dimension::distance _type) {

9
sources/ewol/commandLine.cpp
View File

@ -11,19 +11,20 @@
#include <vector> #include <vector>
void ewol::CommandLine::parse(int32_t _argc, const char* _argv[]) { void ewol::CommandLine::parse(int32_t _argc, const char* _argv[]) {
for( int32_t i=1 ; i<_argc; i++) { for (int32_t i=1 ; i<_argc; i++) {
EWOL_INFO("commandLine : \"" << _argv[i] << "\"" ); EWOL_INFO("commandLine : \"" << _argv[i] << "\"" );
m_listArgs.push_back(_argv[i]); m_listArgs.push_back(_argv[i]);
} }
} }
esize_t ewol::CommandLine::size(void) { int32_t ewol::CommandLine::size(void) {
return m_listArgs.size(); return m_listArgs.size();
} }
const std::string& ewol::CommandLine::get(int32_t _id) { const std::string& ewol::CommandLine::get(int32_t _id) {
static const std::string errorArg(""); static const std::string errorArg("");
if (_id<0 && _id >= m_listArgs.size()) { if ( _id < 0
&& _id >= (int64_t)m_listArgs.size()) {
return errorArg; return errorArg;
} }
return m_listArgs[_id]; return m_listArgs[_id];
@ -33,7 +34,7 @@ void ewol::CommandLine::add(const std::string& _newElement) {
m_listArgs.push_back(_newElement); m_listArgs.push_back(_newElement);
} }
void ewol::CommandLine::remove(esize_t _id) { void ewol::CommandLine::remove(int32_t _id) {
m_listArgs.erase(m_listArgs.begin()+_id); m_listArgs.erase(m_listArgs.begin()+_id);
} }

4
sources/ewol/commandLine.h
View File

@ -25,7 +25,7 @@ namespace ewol {
* @brief get the number of element in the Command line * @brief get the number of element in the Command line
* @return the number of element * @return the number of element
*/ */
esize_t size(void); int32_t size(void);
/** /**
* @brief get an element with a specific ID * @brief get an element with a specific ID
* @return _id The cmdLine Id element * @return _id The cmdLine Id element
@ -40,7 +40,7 @@ namespace ewol {
* @brief remove an element * @brief remove an element
* @param[in] _id Id of the element * @param[in] _id Id of the element
*/ */
void remove(esize_t _id); void remove(int32_t _id);
}; };
}; };

69
sources/ewol/compositing/Text.cpp
View File

@ -380,7 +380,7 @@ void ewol::Text::parseHtmlNode(exml::Element* _element) {
if (_element == NULL) { if (_element == NULL) {
EWOL_ERROR( "Error Input node does not existed ..."); EWOL_ERROR( "Error Input node does not existed ...");
} }
for(int32_t iii=0; iii< _element->size(); iii++) { for(size_t iii=0; iii< _element->size(); iii++) {
if (_element->getType(iii) == exml::typeComment) { if (_element->getType(iii) == exml::typeComment) {
// nothing to do ... // nothing to do ...
} else if (_element->getType(iii) == exml::typeText) { } else if (_element->getType(iii) == exml::typeText) {
@ -533,10 +533,10 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
} }
// if real display : ( not display is for size calculation) // if real display : ( not display is for size calculation)
if (m_needDisplay == true) { if (m_needDisplay == true) {
if( ( m_selectionStartPos-1<iii if( ( m_selectionStartPos-1 < (int64_t)iii
&& iii <= m_cursorPos-1) && (int64_t)iii <= m_cursorPos-1)
|| ( m_selectionStartPos-1 >= iii || ( m_selectionStartPos-1 >= (int64_t)iii
&& iii > m_cursorPos-1) ) { && (int64_t)iii > m_cursorPos-1) ) {
setColor( 0x000000FF); setColor( 0x000000FF);
setColorBg(m_colorSelection); setColorBg(m_colorSelection);
} else { } else {
@ -558,7 +558,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
} }
// display the cursor if needed (if it is at the other position...) // display the cursor if needed (if it is at the other position...)
if (m_needDisplay == true) { if (m_needDisplay == true) {
if (iii == m_cursorPos-1) { if ((int64_t)iii == m_cursorPos-1) {
m_vectorialDraw.setPos(m_position); m_vectorialDraw.setPos(m_position);
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
@ -577,7 +577,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
int32_t stop; int32_t stop;
int32_t space; int32_t space;
int32_t freeSpace; int32_t freeSpace;
while (currentId < _text.size()) { while (currentId < (int64_t)_text.size()) {
bool needNoJustify = extrapolateLastId(_text, currentId, stop, space, freeSpace); bool needNoJustify = extrapolateLastId(_text, currentId, stop, space, freeSpace);
float interpolation = basicSpaceWidth; float interpolation = basicSpaceWidth;
switch (m_alignement) { switch (m_alignement) {
@ -614,7 +614,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
} }
for(size_t iii=currentId; iii<stop && iii<_text.size(); iii++) { for(size_t iii=currentId; (int64_t)iii<stop && iii<_text.size(); iii++) {
float fontHeigh = m_font->getHeight(m_mode); float fontHeigh = m_font->getHeight(m_mode);
// get specific decoration if provided // get specific decoration if provided
if (iii<_decoration.size()) { if (iii<_decoration.size()) {
@ -623,10 +623,10 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
setFontMode(_decoration[iii].m_mode); setFontMode(_decoration[iii].m_mode);
} }
if (m_needDisplay == true) { if (m_needDisplay == true) {
if( ( m_selectionStartPos-1<iii if( ( m_selectionStartPos-1<(int64_t)iii
&& iii <= m_cursorPos-1) && (int64_t)iii <= m_cursorPos-1)
|| ( m_selectionStartPos-1 >= iii || ( m_selectionStartPos-1 >= (int64_t)iii
&& iii > m_cursorPos-1) ) { && (int64_t)iii > m_cursorPos-1) ) {
setColor( 0x000000FF); setColor( 0x000000FF);
setColorBg(m_colorSelection); setColorBg(m_colorSelection);
} else { } else {
@ -635,7 +635,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
} }
} }
// special for the justify mode // special for the justify mode
if (_text[iii] == etk::UChar::Space) { if ((char32_t)_text[iii] == etk::UChar::Space) {
//EWOL_DEBUG(" generateString : \" \""); //EWOL_DEBUG(" generateString : \" \"");
if( m_needDisplay == true if( m_needDisplay == true
&& m_colorBg.a() != 0) { && m_colorBg.a() != 0) {
@ -664,7 +664,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
} }
} }
if (m_needDisplay == true) { if (m_needDisplay == true) {
if (iii == m_cursorPos-1) { if ((int64_t)iii == m_cursorPos-1) {
m_vectorialDraw.setPos(m_position); m_vectorialDraw.setPos(m_position);
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
@ -673,14 +673,14 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
} }
if (currentId == stop) { if (currentId == stop) {
currentId++; currentId++;
} else if(_text[stop] == etk::UChar::Space) { } else if((char32_t)_text[stop] == etk::UChar::Space) {
currentId = stop+1; currentId = stop+1;
// reset position : // reset position :
setPos(vec3(m_startTextpos, setPos(vec3(m_startTextpos,
(float)(m_position.y() - m_font->getHeight(m_mode)), (float)(m_position.y() - m_font->getHeight(m_mode)),
m_position.z()) ); m_position.z()) );
m_nbCharDisplayed++; m_nbCharDisplayed++;
} else if(_text[stop] == etk::UChar::Return) { } else if((char32_t)_text[stop] == etk::UChar::Return) {
currentId = stop+1; currentId = stop+1;
// reset position : // reset position :
setPos(vec3(m_startTextpos, setPos(vec3(m_startTextpos,
@ -694,6 +694,7 @@ void ewol::Text::print(const std::string& _text, const std::vector<TextDecoratio
//EWOL_DEBUG(" 4 print in not alligned mode : start=" << m_sizeDisplayStart << " stop=" << m_sizeDisplayStop << " pos=" << m_position); //EWOL_DEBUG(" 4 print in not alligned mode : start=" << m_sizeDisplayStart << " stop=" << m_sizeDisplayStop << " pos=" << m_position);
} }
} }
void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecoration>& _decoration) { void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecoration>& _decoration) {
if (m_font == NULL) { if (m_font == NULL) {
EWOL_ERROR("Font Id is not corectly defined"); EWOL_ERROR("Font Id is not corectly defined");
@ -721,10 +722,10 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
} }
// if real display : ( not display is for size calculation) // if real display : ( not display is for size calculation)
if (m_needDisplay == true) { if (m_needDisplay == true) {
if( ( m_selectionStartPos-1<iii if( ( m_selectionStartPos-1<(int64_t)iii
&& iii <= m_cursorPos-1) && (int64_t)iii <= m_cursorPos-1)
|| ( m_selectionStartPos-1 >= iii || ( m_selectionStartPos-1 >= (int64_t)iii
&& iii > m_cursorPos-1) ) { && (int64_t)iii > m_cursorPos-1) ) {
setColor( 0x000000FF); setColor( 0x000000FF);
setColorBg(m_colorSelection); setColorBg(m_colorSelection);
} else { } else {
@ -746,7 +747,7 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
} }
// display the cursor if needed (if it is at the other position...) // display the cursor if needed (if it is at the other position...)
if (m_needDisplay == true) { if (m_needDisplay == true) {
if (iii == m_cursorPos-1) { if ((int64_t)iii == m_cursorPos-1) {
m_vectorialDraw.setPos(m_position); m_vectorialDraw.setPos(m_position);
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
@ -765,7 +766,7 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
int32_t stop; int32_t stop;
int32_t space; int32_t space;
int32_t freeSpace; int32_t freeSpace;
while (currentId < _text.size()) { while (currentId < (int64_t)_text.size()) {
bool needNoJustify = extrapolateLastId(_text, currentId, stop, space, freeSpace); bool needNoJustify = extrapolateLastId(_text, currentId, stop, space, freeSpace);
float interpolation = basicSpaceWidth; float interpolation = basicSpaceWidth;
switch (m_alignement) { switch (m_alignement) {
@ -802,7 +803,7 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
} }
for(int32_t iii=currentId; iii<stop && iii<_text.size(); iii++) { for(size_t iii=currentId; (int64_t)iii<stop && iii<_text.size(); iii++) {
float fontHeigh = m_font->getHeight(m_mode); float fontHeigh = m_font->getHeight(m_mode);
// get specific decoration if provided // get specific decoration if provided
if (iii<_decoration.size()) { if (iii<_decoration.size()) {
@ -811,10 +812,10 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
setFontMode(_decoration[iii].m_mode); setFontMode(_decoration[iii].m_mode);
} }
if (m_needDisplay == true) { if (m_needDisplay == true) {
if( ( m_selectionStartPos-1<iii if( ( m_selectionStartPos-1<(int64_t)iii
&& iii <= m_cursorPos-1) && (int64_t)iii <= m_cursorPos-1)
|| ( m_selectionStartPos-1 >= iii || ( m_selectionStartPos-1 >= (int64_t)iii
&& iii > m_cursorPos-1) ) { && (int64_t)iii > m_cursorPos-1) ) {
setColor( 0x000000FF); setColor( 0x000000FF);
setColorBg(m_colorSelection); setColorBg(m_colorSelection);
} else { } else {
@ -823,7 +824,7 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
} }
} }
// special for the justify mode // special for the justify mode
if (_text[iii] == etk::UChar::Space) { if ((char32_t)_text[iii] == etk::UChar::Space) {
//EWOL_DEBUG(" generateString : \" \""); //EWOL_DEBUG(" generateString : \" \"");
if( m_needDisplay == true if( m_needDisplay == true
&& m_colorBg.a() != 0) { && m_colorBg.a() != 0) {
@ -852,7 +853,7 @@ void ewol::Text::print(const std::u32string& _text, const std::vector<TextDecora
} }
} }
if (m_needDisplay == true) { if (m_needDisplay == true) {
if (iii == m_cursorPos-1) { if ((int64_t)iii == m_cursorPos-1) {
m_vectorialDraw.setPos(m_position); m_vectorialDraw.setPos(m_position);
setColorBg(m_colorCursor); setColorBg(m_colorCursor);
printCursor(false); printCursor(false);
@ -1202,11 +1203,11 @@ bool ewol::Text::extrapolateLastId(const std::string& _text,
break; break;
} }
// save number of space : // save number of space :
if (_text[iii] == etk::UChar::Space) { if ((char32_t)_text[iii] == etk::UChar::Space) {
_space++; _space++;
lastSpacePosition = iii; lastSpacePosition = iii;
lastSpacefreeSize = stopPosition - endPos; lastSpacefreeSize = stopPosition - endPos;
} else if (_text[iii] == etk::UChar::Return) { } else if ((char32_t)_text[iii] == etk::UChar::Return) {
_stop = iii; _stop = iii;
endOfLine = true; endOfLine = true;
break; break;
@ -1218,7 +1219,7 @@ bool ewol::Text::extrapolateLastId(const std::string& _text,
// retore previous : // retore previous :
m_previousCharcode = storePrevious; m_previousCharcode = storePrevious;
// need to align left or right ... // need to align left or right ...
if(_stop == _text.size()) { if(_stop == (int64_t)_text.size()) {
return true; return true;
} else { } else {
if (endOfLine) { if (endOfLine) {
@ -1281,7 +1282,7 @@ bool ewol::Text::extrapolateLastId(const std::u32string& _text,
// retore previous : // retore previous :
m_previousCharcode = storePrevious; m_previousCharcode = storePrevious;
// need to align left or right ... // need to align left or right ...
if(_stop == _text.size()) { if(_stop == (int64_t)_text.size()) {
return true; return true;
} else { } else {
if (endOfLine) { if (endOfLine) {
@ -1309,7 +1310,7 @@ void ewol::Text::htmlAddData(const std::string& _data) {
} }
} }
m_htmlCurrrentLine += _data; m_htmlCurrrentLine += _data;
for(int32_t iii=0; iii<_data.size() ; iii++) { for(size_t iii=0; iii<_data.size() ; iii++) {
m_htmlDecoration.push_back(m_htmlDecoTmp); m_htmlDecoration.push_back(m_htmlDecoTmp);
} }
} }

2
sources/ewol/renderer/EMultiCast.cpp
View File

@ -58,7 +58,7 @@ void ewol::EMultiCast::send(ewol::EObject* _object, const char* const _message,
EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :"); EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :");
// send the message at all registered widget ... // send the message at all registered widget ...
for (int32_t iii=0; iii<m_messageList.size(); iii++) { for (size_t iii=0; iii<m_messageList.size(); iii++) {
if( m_messageList[iii].m_message == _message if( m_messageList[iii].m_message == _message
&& m_messageList[iii].m_object != _object) && m_messageList[iii].m_object != _object)
{ {

18
sources/ewol/renderer/EObject.cpp
View File

@ -42,7 +42,7 @@ ewol::EObject::~EObject(void) {
EWOL_DEBUG("delete EObject : [" << m_uniqueId << "] : " << getTypeDescription()); EWOL_DEBUG("delete EObject : [" << m_uniqueId << "] : " << getTypeDescription());
getEObjectManager().rm(this); getEObjectManager().rm(this);
getMultiCast().rm(this); getMultiCast().rm(this);
for (int32_t iii=0; iii<m_externEvent.size(); iii++) { for (size_t iii=0; iii<m_externEvent.size(); iii++) {
if (NULL!=m_externEvent[iii]) { if (NULL!=m_externEvent[iii]) {
delete(m_externEvent[iii]); delete(m_externEvent[iii]);
m_externEvent[iii] = NULL; m_externEvent[iii] = NULL;
@ -105,7 +105,7 @@ void ewol::EObject::addEventId(const char * _generateEventId) {
void ewol::EObject::generateEventId(const char * _generateEventId, const std::string& _data) { void ewol::EObject::generateEventId(const char * _generateEventId, const std::string& _data) {
int32_t nbObject = getEObjectManager().getNumberObject(); int32_t nbObject = getEObjectManager().getNumberObject();
// for every element registered ... // for every element registered ...
for (int32_t iii=0; iii<m_externEvent.size(); iii++) { for (size_t iii=0; iii<m_externEvent.size(); iii++) {
if (NULL!=m_externEvent[iii]) { if (NULL!=m_externEvent[iii]) {
// if we find the event ... // if we find the event ...
if (m_externEvent[iii]->localEventId == _generateEventId) { if (m_externEvent[iii]->localEventId == _generateEventId) {
@ -155,7 +155,7 @@ void ewol::EObject::registerOnEvent(ewol::EObject * _destinationObject,
} }
// check if event existed : // check if event existed :
bool findIt = false; bool findIt = false;
for(int32_t iii=0; iii<m_availlableEventId.size(); iii++) { for(size_t iii=0; iii<m_availlableEventId.size(); iii++) {
if (m_availlableEventId[iii] == _eventId) { if (m_availlableEventId[iii] == _eventId) {
findIt = true; findIt = true;
break; break;
@ -163,7 +163,7 @@ void ewol::EObject::registerOnEvent(ewol::EObject * _destinationObject,
} }
if (false == findIt) { if (false == findIt) {
EWOL_DEBUG("Try to register with a NON direct string name"); EWOL_DEBUG("Try to register with a NON direct string name");
for(int32_t iii=0; iii<m_availlableEventId.size(); iii++) { for(size_t iii=0; iii<m_availlableEventId.size(); iii++) {
if (0 == strncmp(m_availlableEventId[iii], _eventId, 1024)) { if (0 == strncmp(m_availlableEventId[iii], _eventId, 1024)) {
findIt = true; findIt = true;
_eventIdgenerated = m_availlableEventId[iii]; _eventIdgenerated = m_availlableEventId[iii];
@ -233,7 +233,7 @@ void ewol::EObject::registerConfig(const char* _config,
EWOL_ERROR("Try to add NULL config"); EWOL_ERROR("Try to add NULL config");
return; return;
} }
for(int32_t iii=0 ; iii<m_listConfig.size() ; iii++) { for(size_t iii=0 ; iii<m_listConfig.size() ; iii++) {
if (NULL != m_listConfig[iii].getConfig()) { if (NULL != m_listConfig[iii].getConfig()) {
if (0 == strcmp(m_listConfig[iii].getConfig(), _config) ) { if (0 == strcmp(m_listConfig[iii].getConfig(), _config) ) {
EWOL_ERROR("Try to add config already added : " << _config << " at pos=" << iii); EWOL_ERROR("Try to add config already added : " << _config << " at pos=" << iii);
@ -249,7 +249,7 @@ bool ewol::EObject::loadXML(exml::Element* _node) {
return false; return false;
} }
bool errorOccured = true; bool errorOccured = true;
for(int32_t iii=0 ; iii<m_listConfig.size() ; iii++) { for(size_t iii=0 ; iii<m_listConfig.size() ; iii++) {
if (m_listConfig[iii].getConfig() == NULL) { if (m_listConfig[iii].getConfig() == NULL) {
continue; continue;
} }
@ -270,7 +270,7 @@ bool ewol::EObject::storeXML(exml::Element* _node) const {
return false; return false;
} }
bool errorOccured = true; bool errorOccured = true;
for(int32_t iii=0 ; iii<m_listConfig.size() ; iii++) { for(size_t iii=0 ; iii<m_listConfig.size() ; iii++) {
if (m_listConfig[iii].getConfig() == NULL) { if (m_listConfig[iii].getConfig() == NULL) {
continue; continue;
} }
@ -307,7 +307,7 @@ bool ewol::EObject::onGetConfig(const char* _config, std::string& _result) const
} }
bool ewol::EObject::setConfig(const std::string& _config, const std::string& _value) { bool ewol::EObject::setConfig(const std::string& _config, const std::string& _value) {
for(int32_t iii=0 ; iii<m_listConfig.size() ; iii++) { for(size_t iii=0 ; iii<m_listConfig.size() ; iii++) {
if (NULL != m_listConfig[iii].getConfig()) { if (NULL != m_listConfig[iii].getConfig()) {
if (_config == m_listConfig[iii].getConfig() ) { if (_config == m_listConfig[iii].getConfig() ) {
// call config with standard parameter // call config with standard parameter
@ -328,7 +328,7 @@ std::string ewol::EObject::getConfig(const char* _config) const {
} }
std::string ewol::EObject::getConfig(const std::string& _config) const { std::string ewol::EObject::getConfig(const std::string& _config) const {
for(int32_t iii=0 ; iii<m_listConfig.size() ; iii++) { for(size_t iii=0 ; iii<m_listConfig.size() ; iii++) {
if (NULL != m_listConfig[iii].getConfig()) { if (NULL != m_listConfig[iii].getConfig()) {
if (_config == m_listConfig[iii].getConfig() ) { if (_config == m_listConfig[iii].getConfig() ) {
// call config with standard parameter // call config with standard parameter

26
sources/ewol/renderer/EObjectManager.cpp
View File

@ -39,9 +39,9 @@ void ewol::EObjectManager::unInit(void) {
EWOL_DEBUG(" == > Un-Init EObject-Manager"); EWOL_DEBUG(" == > Un-Init EObject-Manager");
removeAllAutoRemove(); removeAllAutoRemove();
EWOL_INFO(" remove missing user widget"); EWOL_INFO(" remove missing user widget");
int32_t iii=0; size_t iii=0;
while(iii<m_eObjectList.size()) { while(iii < m_eObjectList.size()) {
if (m_eObjectList[iii]!=NULL) { if (m_eObjectList[iii] != NULL) {
if ( m_eObjectList[iii]->getStatic() == true if ( m_eObjectList[iii]->getStatic() == true
|| m_eObjectList[iii]->getStatusResource() == true) { || m_eObjectList[iii]->getStatusResource() == true) {
iii++; iii++;
@ -56,8 +56,8 @@ void ewol::EObjectManager::unInit(void) {
} }
removeAllAutoRemove(); removeAllAutoRemove();
EWOL_INFO(" remove resources user widgets"); EWOL_INFO(" remove resources user widgets");
while(iii<m_eObjectList.size()) { while(iii < m_eObjectList.size()) {
if (m_eObjectList[iii]!=NULL) { if (m_eObjectList[iii] != NULL) {
if (m_eObjectList[iii]->getStatic() == true) { if (m_eObjectList[iii]->getStatic() == true) {
iii++; iii++;
} else { } else {
@ -71,8 +71,8 @@ void ewol::EObjectManager::unInit(void) {
} }
removeAllAutoRemove(); removeAllAutoRemove();
EWOL_INFO(" remove static user widgets"); EWOL_INFO(" remove static user widgets");
while(iii<m_eObjectList.size()) { while(iii < m_eObjectList.size()) {
if (m_eObjectList[iii]!=NULL) { if (m_eObjectList[iii] != NULL) {
EWOL_WARNING("Un-INIT : remove EObject type=\"" << m_eObjectList[iii]->getObjectType() << "\""); EWOL_WARNING("Un-INIT : remove EObject type=\"" << m_eObjectList[iii]->getObjectType() << "\"");
delete(m_eObjectList[iii]); delete(m_eObjectList[iii]);
m_eObjectList[iii] = NULL; m_eObjectList[iii] = NULL;
@ -95,12 +95,12 @@ int32_t ewol::EObjectManager::getNumberObject(void) {
} }
void ewol::EObjectManager::informOneObjectIsRemoved(ewol::EObject* _object) { void ewol::EObjectManager::informOneObjectIsRemoved(ewol::EObject* _object) {
for (int32_t iii=0; iii<m_eObjectList.size(); iii++) { for (size_t iii=0; iii<m_eObjectList.size(); iii++) {
if (m_eObjectList[iii] != NULL) { if (m_eObjectList[iii] != NULL) {
m_eObjectList[iii]->onObjectRemove(_object); m_eObjectList[iii]->onObjectRemove(_object);
} }
} }
for (int32_t iii=0; iii<m_eObjectAutoRemoveList.size(); iii++) { for (size_t iii=0; iii<m_eObjectAutoRemoveList.size(); iii++) {
if( m_eObjectAutoRemoveList[iii] != NULL if( m_eObjectAutoRemoveList[iii] != NULL
&& m_eObjectAutoRemoveList[iii] != _object) { && m_eObjectAutoRemoveList[iii] != _object) {
m_eObjectAutoRemoveList[iii]->onObjectRemove(_object); m_eObjectAutoRemoveList[iii]->onObjectRemove(_object);
@ -115,7 +115,7 @@ void ewol::EObjectManager::rm(ewol::EObject* _object) {
EWOL_ERROR("Try to remove (NULL) EObject"); EWOL_ERROR("Try to remove (NULL) EObject");
return; return;
} }
for (int32_t iii=0; iii<m_eObjectList.size(); iii++) { for (size_t iii=0; iii<m_eObjectList.size(); iii++) {
if (m_eObjectList[iii] == _object) { if (m_eObjectList[iii] == _object) {
// remove Element // remove Element
m_eObjectList[iii] = NULL; m_eObjectList[iii] = NULL;
@ -125,7 +125,7 @@ void ewol::EObjectManager::rm(ewol::EObject* _object) {
} }
} }
// check if the object has not been auto removed ... or remove in defered time ... // check if the object has not been auto removed ... or remove in defered time ...
for (int32_t iii=0; iii<m_eObjectAutoRemoveList.size(); iii++) { for (size_t iii=0; iii<m_eObjectAutoRemoveList.size(); iii++) {
if( m_eObjectAutoRemoveList[iii] != NULL if( m_eObjectAutoRemoveList[iii] != NULL
&& m_eObjectAutoRemoveList[iii] == _object) { && m_eObjectAutoRemoveList[iii] == _object) {
return; return;
@ -140,7 +140,7 @@ void ewol::EObjectManager::autoRemove(ewol::EObject* _object) {
EWOL_ERROR("Try to Auto-Remove (NULL) EObject"); EWOL_ERROR("Try to Auto-Remove (NULL) EObject");
return; return;
} }
for (int32_t iii=0; iii<m_eObjectList.size(); iii++) { for (size_t iii=0; iii<m_eObjectList.size(); iii++) {
if (m_eObjectList[iii] == _object) { if (m_eObjectList[iii] == _object) {
// remove Element // remove Element
m_eObjectList[iii] = NULL; m_eObjectList[iii] = NULL;
@ -174,7 +174,7 @@ ewol::EObject* ewol::EObjectManager::get(const std::string& _name) {
if (_name == "") { if (_name == "") {
return NULL; return NULL;
} }
for (int32_t iii=0; iii<m_eObjectList.size(); iii++) { for (size_t iii=0; iii<m_eObjectList.size(); iii++) {
if (m_eObjectList[iii] != NULL) { if (m_eObjectList[iii] != NULL) {
if (m_eObjectList[iii]->getName() == _name) { if (m_eObjectList[iii]->getName() == _name) {
return m_eObjectList[iii]; return m_eObjectList[iii];

2
sources/ewol/renderer/X11/Context.cpp
View File

@ -207,7 +207,7 @@ class X11Interface : public ewol::eContext {
switch (event.type) { switch (event.type) {
case ClientMessage: { case ClientMessage: {
X11_INFO("Receive : ClientMessage"); X11_INFO("Receive : ClientMessage");
if(XAtomeDeleteWindows == (int64_t)event.xclient.data.l[0]) { if(XAtomeDeleteWindows == (uint64_t)event.xclient.data.l[0]) {
EWOL_INFO(" == > Kill Requested ..."); EWOL_INFO(" == > Kill Requested ...");
OS_Stop(); OS_Stop();
m_run = false; m_run = false;

12
sources/ewol/renderer/audio/audio.cpp
View File

@ -280,7 +280,7 @@ std::vector<RequestPlay*> ListEffectsPlaying;
int32_t ewol::audio::effects::add(std::string _file) { int32_t ewol::audio::effects::add(std::string _file) {
for (int32_t iii=0; iii<ListEffects.size(); iii++) { for (size_t iii=0; iii<ListEffects.size(); iii++) {
if (NULL != ListEffects[iii]) { if (NULL != ListEffects[iii]) {
if (ListEffects[iii]->m_file == _file) { if (ListEffects[iii]->m_file == _file) {
ListEffects[iii]->m_requestedTime++; ListEffects[iii]->m_requestedTime++;
@ -301,7 +301,7 @@ int32_t ewol::audio::effects::add(std::string _file) {
void ewol::audio::effects::rm(int32_t _effectId) { void ewol::audio::effects::rm(int32_t _effectId) {
// find element ... // find element ...
if (_effectId <0 || _effectId >= ListEffects.size()) { if (_effectId <0 || _effectId >= (int64_t)ListEffects.size()) {
EWOL_ERROR("Wrong effect ID : " << _effectId << " != [0.." << ListEffects.size()-1 << "] == > can not remove it ..."); EWOL_ERROR("Wrong effect ID : " << _effectId << " != [0.." << ListEffects.size()-1 << "] == > can not remove it ...");
return; return;
} }
@ -321,7 +321,7 @@ void ewol::audio::effects::rm(int32_t _effectId) {
void ewol::audio::effects::play(int32_t _effectId, float _xxx, float _yyy) { void ewol::audio::effects::play(int32_t _effectId, float _xxx, float _yyy) {
if (_effectId <0 || _effectId >= ListEffects.size()) { if (_effectId <0 || _effectId >= (int64_t)ListEffects.size()) {
EWOL_ERROR("Wrong effect ID : " << _effectId << " != [0.." << ListEffects.size()-1 << "] == > can not play it ..."); EWOL_ERROR("Wrong effect ID : " << _effectId << " != [0.." << ListEffects.size()-1 << "] == > can not play it ...");
return; return;
} }
@ -331,7 +331,7 @@ void ewol::audio::effects::play(int32_t _effectId, float _xxx, float _yyy) {
} }
EWOL_VERBOSE("effect play : " << _effectId ); EWOL_VERBOSE("effect play : " << _effectId );
// try to find an empty slot : // try to find an empty slot :
for (int32_t iii=0; iii<ListEffectsPlaying.size(); iii++) { for (size_t iii=0; iii<ListEffectsPlaying.size(); iii++) {
if (ListEffectsPlaying[iii]->isFree()) { if (ListEffectsPlaying[iii]->isFree()) {
ListEffectsPlaying[iii]->reset(ListEffects[_effectId]); ListEffectsPlaying[iii]->reset(ListEffects[_effectId]);
return; return;
@ -382,8 +382,8 @@ void ewol::audio::effects::muteSet(bool _newMute) {
void ewol::audio::effects::getData(int16_t * _bufferInterlace, int32_t _nbSample, int32_t _nbChannels) { void ewol::audio::effects::getData(int16_t* _bufferInterlace, int32_t _nbSample, int32_t _nbChannels) {
for (int32_t iii=0; iii<ListEffectsPlaying.size(); iii++) { for (size_t iii = 0; iii < ListEffectsPlaying.size(); ++iii) {
if (ListEffectsPlaying[iii]!= NULL) { if (ListEffectsPlaying[iii]!= NULL) {
ListEffectsPlaying[iii]->play(_bufferInterlace, _nbSample, _nbChannels); ListEffectsPlaying[iii]->play(_bufferInterlace, _nbSample, _nbChannels);
} }

2
sources/ewol/renderer/audio/decWav.cpp
View File

@ -82,7 +82,7 @@ int16_t * ewol::audio::wav::loadData(std::string filename, int8_t nbChan, int32_
return NULL; return NULL;
} }
// try to find endienness : // try to find endienness :
if (fileSize < sizeof(waveHeader)) { if (fileSize < (int64_t)sizeof(waveHeader)) {
EWOL_ERROR("File : \"" << fileAccess << "\" == > has not enouth data inside might be minumum of " << (int32_t)(sizeof(waveHeader))); EWOL_ERROR("File : \"" << fileAccess << "\" == > has not enouth data inside might be minumum of " << (int32_t)(sizeof(waveHeader)));
return NULL; return NULL;
} }

2
sources/ewol/renderer/eContext.cpp
View File

@ -230,7 +230,7 @@ ewol::eContext::eContext(int32_t _argc, const char* _argv[]) :
// set the curent interface : // set the curent interface :
lockContext(); lockContext();
// parse the debug level: // parse the debug level:
for(esize_t iii=m_commandLine.size()-1 ; iii >= 0 ; --iii) { for(int32_t iii=m_commandLine.size()-1 ; iii >= 0 ; --iii) {
if (m_commandLine.get(iii) == "-l0") { if (m_commandLine.get(iii) == "-l0") {
debug::setGeneralLevel(etk::logLevelNone); debug::setGeneralLevel(etk::logLevelNone);
} else if (m_commandLine.get(iii) == "-l1") { } else if (m_commandLine.get(iii) == "-l1") {

8
sources/ewol/resources/ConfigFile.cpp
View File

@ -46,7 +46,7 @@ ewol::ConfigFile::ConfigFile(const std::string& _filename) :
ewol::ConfigFile::~ConfigFile(void) { ewol::ConfigFile::~ConfigFile(void) {
// remove all element // remove all element
for (int32_t iii=0; iii<m_list.size(); iii++){ for (size_t iii=0; iii<m_list.size(); iii++){
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
delete(m_list[iii]); delete(m_list[iii]);
m_list[iii] = NULL; m_list[iii] = NULL;
@ -57,7 +57,7 @@ ewol::ConfigFile::~ConfigFile(void) {
void ewol::ConfigFile::reload(void) { void ewol::ConfigFile::reload(void) {
// reset all parameters // reset all parameters
for (int32_t iii=0; iii<m_list.size(); iii++){ for (size_t iii=0; iii<m_list.size(); iii++){
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
m_list[iii]->parse(""); m_list[iii]->parse("");
} }
@ -113,7 +113,7 @@ void ewol::ConfigFile::reload(void) {
EWOL_DEBUG(" param name=\"" << paramName << "\" val=\"" << paramValue << "\""); EWOL_DEBUG(" param name=\"" << paramName << "\" val=\"" << paramValue << "\"");
// check if the parameters existed : // check if the parameters existed :
bool findParam = false; bool findParam = false;
for (int32_t iii=0; iii<m_list.size(); iii++){ for (size_t iii=0; iii<m_list.size(); iii++){
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
if (m_list[iii]->m_paramName == paramName) { if (m_list[iii]->m_paramName == paramName) {
m_list[iii]->parse(paramValue); m_list[iii]->parse(paramValue);
@ -140,7 +140,7 @@ void ewol::ConfigFile::reload(void) {
int32_t ewol::ConfigFile::request(const std::string& _paramName) { int32_t ewol::ConfigFile::request(const std::string& _paramName) {
// check if the parameters existed : // check if the parameters existed :
for (int32_t iii=0; iii<m_list.size(); iii++){ for (size_t iii=0; iii<m_list.size(); iii++){
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
if (m_list[iii]->m_paramName == _paramName) { if (m_list[iii]->m_paramName == _paramName) {
return iii; return iii;

4
sources/ewol/resources/FontFreeType.cpp
View File

@ -241,9 +241,9 @@ void ewol::FontFreeType::generateKerning(int32_t fontSize, std::vector<ewol::Gly
return; return;
} }
// For all the kerning element we get the kerning value : // For all the kerning element we get the kerning value :
for(int32_t iii=0; iii<listGlyph.size(); iii++) { for(size_t iii=0; iii<listGlyph.size(); iii++) {
listGlyph[iii].kerningClear(); listGlyph[iii].kerningClear();
for(int32_t kkk=0; kkk<listGlyph.size(); kkk++) { for(size_t kkk=0; kkk<listGlyph.size(); kkk++) {
FT_Vector kerning; FT_Vector kerning;
FT_Get_Kerning(m_fftFace, listGlyph[kkk].m_glyphIndex, listGlyph[iii].m_glyphIndex, FT_KERNING_UNFITTED, &kerning ); FT_Get_Kerning(m_fftFace, listGlyph[kkk].m_glyphIndex, listGlyph[iii].m_glyphIndex, FT_KERNING_UNFITTED, &kerning );
// add the kerning only if != 0 ... // add the kerning only if != 0 ...

29
sources/ewol/resources/Mesh.cpp
View File

@ -113,7 +113,7 @@ void ewol::Mesh::draw(mat4& _positionMatrix,
int32_t nbElementDrawTheoric = 0; int32_t nbElementDrawTheoric = 0;
int32_t nbElementDraw = 0; int32_t nbElementDraw = 0;
#endif #endif
for (esize_t kkk=0; kkk<m_listFaces.size(); kkk++) { for (int32_t kkk=0; kkk<m_listFaces.size(); kkk++) {
if (false == m_materials.exist(m_listFaces.getKey(kkk))) { if (false == m_materials.exist(m_listFaces.getKey(kkk))) {
EWOL_WARNING("missing materials : '" << m_listFaces.getKey(kkk) << "'"); EWOL_WARNING("missing materials : '" << m_listFaces.getKey(kkk) << "'");
continue; continue;
@ -138,7 +138,7 @@ void ewol::Mesh::draw(mat4& _positionMatrix,
std::vector<ewol::Face>& tmppFaces = m_listFaces.getValue(kkk).m_faces; std::vector<ewol::Face>& tmppFaces = m_listFaces.getValue(kkk).m_faces;
//std::vector<uint32_t>& tmppIndex = m_listFaces.getValue(kkk).m_index; //std::vector<uint32_t>& tmppIndex = m_listFaces.getValue(kkk).m_index;
if (normalModeFace == m_normalMode) { if (normalModeFace == m_normalMode) {
for(int32_t iii=0; iii<tmppFaces.size() ; ++iii) { for(size_t iii=0; iii<tmppFaces.size() ; ++iii) {
if(btDot(mattttt * m_listFacesNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= 0.0f) { if(btDot(mattttt * m_listFacesNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= 0.0f) {
tmpIndexResult.push_back(iii*3); tmpIndexResult.push_back(iii*3);
tmpIndexResult.push_back(iii*3+1); tmpIndexResult.push_back(iii*3+1);
@ -146,7 +146,7 @@ void ewol::Mesh::draw(mat4& _positionMatrix,
} }
} }
} else { } else {
for(int32_t iii=0; iii<tmppFaces.size() ; ++iii) { for(size_t iii=0; iii<tmppFaces.size() ; ++iii) {
if( (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= -0.2f) if( (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= -0.2f)
|| (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[1]], cameraNormal) >= -0.2f) || (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[1]], cameraNormal) >= -0.2f)
|| (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[2]], cameraNormal) >= -0.2f) ) { || (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[2]], cameraNormal) >= -0.2f) ) {
@ -182,7 +182,7 @@ void ewol::Mesh::calculateNormaleFace(void) {
m_listFacesNormal.clear(); m_listFacesNormal.clear();
if (m_normalMode != ewol::Mesh::normalModeFace) { if (m_normalMode != ewol::Mesh::normalModeFace) {
std::vector<Face>& tmpFaceList = m_listFaces.getValue(0).m_faces; std::vector<Face>& tmpFaceList = m_listFaces.getValue(0).m_faces;
for(int32_t iii=0 ; iii<tmpFaceList.size() ; iii++) { for(size_t iii=0 ; iii<tmpFaceList.size() ; iii++) {
// for all case, We use only the 3 vertex for quad element, in theory 3D modeler export element in triangle if it is not a real plane. // for all case, We use only the 3 vertex for quad element, in theory 3D modeler export element in triangle if it is not a real plane.
vec3 normal = btCross(m_listVertex[tmpFaceList[iii].m_vertex[0]]-m_listVertex[tmpFaceList[iii].m_vertex[1]], vec3 normal = btCross(m_listVertex[tmpFaceList[iii].m_vertex[0]]-m_listVertex[tmpFaceList[iii].m_vertex[1]],
m_listVertex[tmpFaceList[iii].m_vertex[1]]-m_listVertex[tmpFaceList[iii].m_vertex[2]]); m_listVertex[tmpFaceList[iii].m_vertex[1]]-m_listVertex[tmpFaceList[iii].m_vertex[2]]);
@ -195,15 +195,15 @@ void ewol::Mesh::calculateNormaleFace(void) {
void ewol::Mesh::calculateNormaleEdge(void) { void ewol::Mesh::calculateNormaleEdge(void) {
m_listVertexNormal.clear(); m_listVertexNormal.clear();
if (m_normalMode != ewol::Mesh::normalModeVertex) { if (m_normalMode != ewol::Mesh::normalModeVertex) {
for(int32_t iii=0 ; iii<m_listVertex.size() ; iii++) { for(size_t iii=0 ; iii<m_listVertex.size() ; iii++) {
std::vector<Face>& tmpFaceList = m_listFaces.getValue(0).m_faces; std::vector<Face>& tmpFaceList = m_listFaces.getValue(0).m_faces;
vec3 normal(0,0,0); vec3 normal(0,0,0);
// add the vertex from all the element in the list for face when the element in the face ... // add the vertex from all the element in the list for face when the element in the face ...
for(int32_t jjj=0 ; jjj<tmpFaceList.size() ; jjj++) { for(size_t jjj=0 ; jjj<tmpFaceList.size() ; jjj++) {
m_verticesVBO->pushOnBuffer(MESH_VBO_VERTICES_NORMAL, normal); m_verticesVBO->pushOnBuffer(MESH_VBO_VERTICES_NORMAL, normal);
if( tmpFaceList[jjj].m_vertex[0] == iii if( tmpFaceList[jjj].m_vertex[0] == (int32_t)iii
|| tmpFaceList[jjj].m_vertex[1] == iii || tmpFaceList[jjj].m_vertex[1] == (int32_t)iii
|| tmpFaceList[jjj].m_vertex[2] == iii) { || tmpFaceList[jjj].m_vertex[2] == (int32_t)iii) {
normal += m_listFacesNormal[jjj]; normal += m_listFacesNormal[jjj];
} }
} }
@ -230,16 +230,16 @@ void ewol::Mesh::generateVBO(void) {
// generate element in 2 pass : // generate element in 2 pass :
// - create new index dependeng a vertex is a unique componenet of position, texture, normal // - create new index dependeng a vertex is a unique componenet of position, texture, normal
// - the index list generation (can be dynamic ... (TODO later) // - the index list generation (can be dynamic ... (TODO later)
for (esize_t kkk=0; kkk<m_listFaces.size(); kkk++) { for (int32_t kkk=0; kkk<m_listFaces.size(); kkk++) {
// clean faces indexes : // clean faces indexes :
m_listFaces.getValue(kkk).m_index.clear(); m_listFaces.getValue(kkk).m_index.clear();
#ifdef TRY_MINIMAL_VBO #ifdef TRY_MINIMAL_VBO
int64_t tmpppppp=0; int64_t tmpppppp=0;
#endif #endif
FaceIndexing& tmpFaceList = m_listFaces.getValue(kkk); FaceIndexing& tmpFaceList = m_listFaces.getValue(kkk);
for (int32_t iii=0; iii<tmpFaceList.m_faces.size() ; iii++) { for (size_t iii=0; iii<tmpFaceList.m_faces.size() ; iii++) {
int32_t vertexVBOId[3]; int32_t vertexVBOId[3];
for(int32_t indice=0 ; indice<3; indice++) { for(size_t indice=0 ; indice<3; indice++) {
vec3 position = m_listVertex[tmpFaceList.m_faces[iii].m_vertex[indice]]; vec3 position = m_listVertex[tmpFaceList.m_faces[iii].m_vertex[indice]];
vec3 normal; vec3 normal;
if (m_normalMode == ewol::Mesh::normalModeVertex) { if (m_normalMode == ewol::Mesh::normalModeVertex) {
@ -271,7 +271,7 @@ void ewol::Mesh::generateVBO(void) {
vertexVBOId[indice] = m_verticesVBO->sizeOnBufferVec3(MESH_VBO_VERTICES)-1; vertexVBOId[indice] = m_verticesVBO->sizeOnBufferVec3(MESH_VBO_VERTICES)-1;
} }
} }
for(int32_t indice=0 ; indice<3; indice++) { for(size_t indice=0 ; indice<3; indice++) {
tmpFaceList.m_index.push_back(vertexVBOId[indice]); tmpFaceList.m_index.push_back(vertexVBOId[indice]);
} }
} }
@ -826,7 +826,6 @@ bool ewol::Mesh::loadEMF(const std::string& _fileName) {
if (meshFaceMaterialID < 0) { if (meshFaceMaterialID < 0) {
continue; continue;
} }
int32_t matches;
uint32_t vertexIndex[3], uvIndex[3], normalIndex[3]; uint32_t vertexIndex[3], uvIndex[3], normalIndex[3];
vertexIndex[0] = 0; vertexIndex[0] = 0;
vertexIndex[1] = 0; vertexIndex[1] = 0;
@ -837,7 +836,7 @@ bool ewol::Mesh::loadEMF(const std::string& _fileName) {
normalIndex[0] = 0; normalIndex[0] = 0;
normalIndex[1] = 0; normalIndex[1] = 0;
normalIndex[2] = 0; normalIndex[2] = 0;
matches = sscanf(inputDataLine, "%d/%d/%d %d/%d/%d %d/%d/%d", scanf(inputDataLine, "%d/%d/%d %d/%d/%d %d/%d/%d",
&vertexIndex[0], &uvIndex[0], &normalIndex[0], &vertexIndex[0], &uvIndex[0], &normalIndex[0],
&vertexIndex[1], &uvIndex[1], &normalIndex[1], &vertexIndex[1], &uvIndex[1], &normalIndex[1],
&vertexIndex[2], &uvIndex[2], &normalIndex[2] ); &vertexIndex[2], &uvIndex[2], &normalIndex[2] );

58
sources/ewol/resources/Program.cpp
View File

@ -96,7 +96,7 @@ ewol::Program::Program(const std::string& _filename) :
} }
ewol::Program::~Program(void) { ewol::Program::~Program(void) {
for (int32_t iii=0; iii<m_shaderList.size(); iii++) { for (size_t iii=0; iii<m_shaderList.size(); iii++) {
ewol::Shader::release(m_shaderList[iii]); ewol::Shader::release(m_shaderList[iii]);
m_shaderList[iii] = 0; m_shaderList[iii] = 0;
} }
@ -118,7 +118,7 @@ static char l_bufferDisplayError[LOG_OGL_INTERNAL_BUFFER_LEN] = "";
int32_t ewol::Program::getAttribute(std::string _elementName) { int32_t ewol::Program::getAttribute(std::string _elementName) {
// check if it exist previously : // check if it exist previously :
for(int32_t iii=0; iii<m_elementList.size(); iii++) { for(size_t iii=0; iii<m_elementList.size(); iii++) {
if (m_elementList[iii].m_name == _elementName) { if (m_elementList[iii].m_name == _elementName) {
return iii; return iii;
} }
@ -139,7 +139,7 @@ int32_t ewol::Program::getAttribute(std::string _elementName) {
int32_t ewol::Program::getUniform(std::string _elementName) { int32_t ewol::Program::getUniform(std::string _elementName) {
// check if it exist previously : // check if it exist previously :
for(int32_t iii=0; iii<m_elementList.size(); iii++) { for(size_t iii=0; iii<m_elementList.size(); iii++) {
if (m_elementList[iii].m_name == _elementName) { if (m_elementList[iii].m_name == _elementName) {
return iii; return iii;
} }
@ -172,7 +172,7 @@ void ewol::Program::updateContext(void) {
} }
EWOL_DEBUG("Create program with oglID=" << m_program); EWOL_DEBUG("Create program with oglID=" << m_program);
// first attach vertex shader, and after fragment shader // first attach vertex shader, and after fragment shader
for (int32_t iii=0; iii<m_shaderList.size(); iii++) { for (size_t iii=0; iii<m_shaderList.size(); iii++) {
if (NULL != m_shaderList[iii]) { if (NULL != m_shaderList[iii]) {
if (m_shaderList[iii]->getShaderType() == GL_VERTEX_SHADER) { if (m_shaderList[iii]->getShaderType() == GL_VERTEX_SHADER) {
glAttachShader(m_program, m_shaderList[iii]->getGL_ID()); glAttachShader(m_program, m_shaderList[iii]->getGL_ID());
@ -180,7 +180,7 @@ void ewol::Program::updateContext(void) {
} }
} }
} }
for (int32_t iii=0; iii<m_shaderList.size(); iii++) { for (size_t iii=0; iii<m_shaderList.size(); iii++) {
if (NULL != m_shaderList[iii]) { if (NULL != m_shaderList[iii]) {
if (m_shaderList[iii]->getShaderType() == GL_FRAGMENT_SHADER) { if (m_shaderList[iii]->getShaderType() == GL_FRAGMENT_SHADER) {
glAttachShader(m_program, m_shaderList[iii]->getGL_ID()); glAttachShader(m_program, m_shaderList[iii]->getGL_ID());
@ -200,7 +200,7 @@ void ewol::Program::updateContext(void) {
char tmpLog[256]; char tmpLog[256];
int32_t idOut=0; int32_t idOut=0;
EWOL_ERROR("Could not compile \"PROGRAM\": \"" << m_name << "\""); EWOL_ERROR("Could not compile \"PROGRAM\": \"" << m_name << "\"");
for (int32_t iii=0; iii<LOG_OGL_INTERNAL_BUFFER_LEN ; iii++) { for (size_t iii=0; iii<LOG_OGL_INTERNAL_BUFFER_LEN ; iii++) {
tmpLog[idOut] = l_bufferDisplayError[iii]; tmpLog[idOut] = l_bufferDisplayError[iii];
if (tmpLog[idOut] == '\n' || tmpLog[idOut] == '\0' || idOut >= 256) { if (tmpLog[idOut] == '\n' || tmpLog[idOut] == '\0' || idOut >= 256) {
tmpLog[idOut] = '\0'; tmpLog[idOut] = '\0';
@ -224,7 +224,7 @@ void ewol::Program::updateContext(void) {
} }
m_exist = true; m_exist = true;
// now get the old attribute requested priviously ... // now get the old attribute requested priviously ...
for(int32_t iii=0; iii<m_elementList.size(); iii++) { for(size_t iii=0; iii<m_elementList.size(); iii++) {
if (true == m_elementList[iii].m_isAttribute) { if (true == m_elementList[iii].m_isAttribute) {
m_elementList[iii].m_elementId = glGetAttribLocation(m_program, m_elementList[iii].m_name.c_str()); m_elementList[iii].m_elementId = glGetAttribLocation(m_program, m_elementList[iii].m_name.c_str());
m_elementList[iii].m_isLinked = true; m_elementList[iii].m_isLinked = true;
@ -251,7 +251,7 @@ void ewol::Program::removeContext(void) {
glDeleteProgram(m_program); glDeleteProgram(m_program);
m_program = 0; m_program = 0;
m_exist = false; m_exist = false;
for(int32_t iii=0; iii<m_elementList.size(); iii++) { for(size_t iii=0; iii<m_elementList.size(); iii++) {
m_elementList[iii].m_elementId=0; m_elementList[iii].m_elementId=0;
} }
} }
@ -310,7 +310,7 @@ void ewol::Program::sendAttribute(int32_t _idElem,
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -337,7 +337,7 @@ void ewol::Program::sendAttributePointer(int32_t _idElem,
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -362,7 +362,7 @@ void ewol::Program::uniformMatrix4fv(int32_t _idElem, int32_t _nbElement, mat4 _
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -383,7 +383,7 @@ void ewol::Program::uniform1f(int32_t _idElem, float _value1) {
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -397,7 +397,7 @@ void ewol::Program::uniform2f(int32_t _idElem, float _value1, float _value2) {
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -411,7 +411,7 @@ void ewol::Program::uniform3f(int32_t _idElem, float _value1, float _value2, flo
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -425,7 +425,7 @@ void ewol::Program::uniform4f(int32_t _idElem, float _value1, float _value2, flo
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -442,7 +442,7 @@ void ewol::Program::uniform1i(int32_t _idElem, int32_t _value1) {
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -456,7 +456,7 @@ void ewol::Program::uniform2i(int32_t _idElem, int32_t _value1, int32_t _value2)
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -470,7 +470,7 @@ void ewol::Program::uniform3i(int32_t _idElem, int32_t _value1, int32_t _value2,
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -484,7 +484,7 @@ void ewol::Program::uniform4i(int32_t _idElem, int32_t _value1, int32_t _value2,
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -502,7 +502,7 @@ void ewol::Program::uniform1fv(int32_t _idElem, int32_t _nbElement, const float
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -524,7 +524,7 @@ void ewol::Program::uniform2fv(int32_t _idElem, int32_t _nbElement, const float
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -546,7 +546,7 @@ void ewol::Program::uniform3fv(int32_t _idElem, int32_t _nbElement, const float
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -568,7 +568,7 @@ void ewol::Program::uniform4fv(int32_t _idElem, int32_t _nbElement, const float
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -593,7 +593,7 @@ void ewol::Program::uniform1iv(int32_t _idElem, int32_t _nbElement, const int32_
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -615,7 +615,7 @@ void ewol::Program::uniform2iv(int32_t _idElem, int32_t _nbElement, const int32_
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -637,7 +637,7 @@ void ewol::Program::uniform3iv(int32_t _idElem, int32_t _nbElement, const int32_
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -659,7 +659,7 @@ void ewol::Program::uniform4iv(int32_t _idElem, int32_t _nbElement, const int32_
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]"); EWOL_ERROR("idElem = " << _idElem << " not in [0.." << (m_elementList.size()-1) << "]");
return; return;
} }
@ -700,7 +700,7 @@ void ewol::Program::setTexture0(int32_t _idElem, GLint _textureOpenGlID) {
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
return; return;
} }
if (false == m_elementList[_idElem].m_isLinked) { if (false == m_elementList[_idElem].m_isLinked) {
@ -725,7 +725,7 @@ void ewol::Program::setTexture1(int32_t _idElem, GLint _textureOpenGlID) {
if (0 == m_program) { if (0 == m_program) {
return; return;
} }
if (_idElem<0 || _idElem>m_elementList.size()) { if (_idElem<0 || (size_t)_idElem>m_elementList.size()) {
return; return;
} }
if (false == m_elementList[_idElem].m_isLinked) { if (false == m_elementList[_idElem].m_isLinked) {

28
sources/ewol/resources/ResourceManager.cpp
View File

@ -40,7 +40,7 @@ void ewol::ResourceManager::unInit(void) {
display(); display();
m_resourceListToUpdate.clear(); m_resourceListToUpdate.clear();
// remove all resources ... // remove all resources ...
for (int32_t iii=m_resourceList.size()-1; iii >= 0; iii--) { for (int64_t iii=m_resourceList.size()-1; iii >= 0; iii--) {
if (m_resourceList[iii] != NULL) { if (m_resourceList[iii] != NULL) {
EWOL_WARNING("Find a resource that is not removed : [" << m_resourceList[iii]->getId() << "]" EWOL_WARNING("Find a resource that is not removed : [" << m_resourceList[iii]->getId() << "]"
<< "=\"" << m_resourceList[iii]->getName() << "\" " << "=\"" << m_resourceList[iii]->getName() << "\" "
@ -55,7 +55,7 @@ void ewol::ResourceManager::unInit(void) {
void ewol::ResourceManager::display(void) { void ewol::ResourceManager::display(void) {
EWOL_INFO("Resources loaded : "); EWOL_INFO("Resources loaded : ");
// remove all resources ... // remove all resources ...
for (int32_t iii=m_resourceList.size()-1; iii >= 0; iii--) { for (int64_t iii=m_resourceList.size()-1; iii >= 0; iii--) {
if (m_resourceList[iii] != NULL) { if (m_resourceList[iii] != NULL) {
EWOL_INFO(" [" << m_resourceList[iii]->getId() << "]" EWOL_INFO(" [" << m_resourceList[iii]->getId() << "]"
<< m_resourceList[iii]->getObjectType() << m_resourceList[iii]->getObjectType()
@ -70,9 +70,9 @@ void ewol::ResourceManager::reLoadResources(void) {
EWOL_INFO("------------- Resources re-loaded -------------"); EWOL_INFO("------------- Resources re-loaded -------------");
// remove all resources ... // remove all resources ...
if (m_resourceList.size() != 0) { if (m_resourceList.size() != 0) {
for (int32_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) { for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) {
EWOL_INFO(" Reload level : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1)); EWOL_INFO(" Reload level : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1));
for (int32_t iii=m_resourceList.size()-1; iii >= 0; iii--) { for (int64_t iii=m_resourceList.size()-1; iii >= 0; iii--) {
if(m_resourceList[iii] != NULL) { if(m_resourceList[iii] != NULL) {
if (jjj == m_resourceList[iii]->getResourceLevel()) { if (jjj == m_resourceList[iii]->getResourceLevel()) {
m_resourceList[iii]->reload(); m_resourceList[iii]->reload();
@ -89,7 +89,7 @@ void ewol::ResourceManager::reLoadResources(void) {
void ewol::ResourceManager::update(ewol::Resource* _object) { void ewol::ResourceManager::update(ewol::Resource* _object) {
// chek if not added before // chek if not added before
for (int32_t iii=0; iii<m_resourceListToUpdate.size(); iii++) { for (size_t iii=0; iii<m_resourceListToUpdate.size(); iii++) {
if (m_resourceListToUpdate[iii] != NULL) { if (m_resourceListToUpdate[iii] != NULL) {
if (m_resourceListToUpdate[iii] == _object) { if (m_resourceListToUpdate[iii] == _object) {
// just prevent some double add ... // just prevent some double add ...
@ -107,9 +107,9 @@ void ewol::ResourceManager::updateContext(void) {
// need to update all ... // need to update all ...
m_contextHasBeenRemoved = false; m_contextHasBeenRemoved = false;
if (m_resourceList.size() != 0) { if (m_resourceList.size() != 0) {
for (int32_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) { for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) {
EWOL_INFO(" updateContext level (D) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1)); EWOL_INFO(" updateContext level (D) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1));
for (int32_t iii=0; iii<m_resourceList.size(); iii++) { for (size_t iii=0; iii<m_resourceList.size(); iii++) {
if(m_resourceList[iii] != NULL) { if(m_resourceList[iii] != NULL) {
if (jjj == m_resourceList[iii]->getResourceLevel()) { if (jjj == m_resourceList[iii]->getResourceLevel()) {
//EWOL_DEBUG("Update context of " << iii << " named : " << l_resourceList[iii]->getName()); //EWOL_DEBUG("Update context of " << iii << " named : " << l_resourceList[iii]->getName());
@ -121,9 +121,9 @@ void ewol::ResourceManager::updateContext(void) {
} }
}else { }else {
if (m_resourceListToUpdate.size() != 0) { if (m_resourceListToUpdate.size() != 0) {
for (int32_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) { for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) {
EWOL_INFO(" updateContext level (U) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1)); EWOL_INFO(" updateContext level (U) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1));
for (int32_t iii=0; iii<m_resourceListToUpdate.size(); iii++) { for (size_t iii=0; iii<m_resourceListToUpdate.size(); iii++) {
if(m_resourceListToUpdate[iii] != NULL) { if(m_resourceListToUpdate[iii] != NULL) {
if (jjj == m_resourceListToUpdate[iii]->getResourceLevel()) { if (jjj == m_resourceListToUpdate[iii]->getResourceLevel()) {
m_resourceListToUpdate[iii]->updateContext(); m_resourceListToUpdate[iii]->updateContext();
@ -139,7 +139,7 @@ void ewol::ResourceManager::updateContext(void) {
// in this case, it is really too late ... // in this case, it is really too late ...
void ewol::ResourceManager::contextHasBeenDestroyed(void) { void ewol::ResourceManager::contextHasBeenDestroyed(void) {
for (int32_t iii=0; iii<m_resourceList.size(); iii++) { for (size_t iii=0; iii<m_resourceList.size(); iii++) {
if (m_resourceList[iii] != NULL) { if (m_resourceList[iii] != NULL) {
m_resourceList[iii]->removeContextToLate(); m_resourceList[iii]->removeContextToLate();
} }
@ -151,7 +151,7 @@ void ewol::ResourceManager::contextHasBeenDestroyed(void) {
// internal generic keeper ... // internal generic keeper ...
ewol::Resource* ewol::ResourceManager::localKeep(const std::string& _filename) { ewol::Resource* ewol::ResourceManager::localKeep(const std::string& _filename) {
EWOL_VERBOSE("KEEP (DEFAULT) : file : \"" << _filename << "\""); EWOL_VERBOSE("KEEP (DEFAULT) : file : \"" << _filename << "\"");
for (int32_t iii=0; iii<m_resourceList.size(); iii++) { for (size_t iii=0; iii<m_resourceList.size(); iii++) {
if (m_resourceList[iii] != NULL) { if (m_resourceList[iii] != NULL) {
if(m_resourceList[iii]->getName() == _filename) { if(m_resourceList[iii]->getName() == _filename) {
m_resourceList[iii]->increment(); m_resourceList[iii]->increment();
@ -166,7 +166,7 @@ ewol::Resource* ewol::ResourceManager::localKeep(const std::string& _filename) {
// internal generic keeper ... // internal generic keeper ...
void ewol::ResourceManager::localAdd(ewol::Resource* _object) { void ewol::ResourceManager::localAdd(ewol::Resource* _object) {
//Add ... find empty slot //Add ... find empty slot
for (int32_t iii=0; iii<m_resourceList.size(); iii++) { for (size_t iii=0; iii<m_resourceList.size(); iii++) {
if (m_resourceList[iii] == NULL) { if (m_resourceList[iii] == NULL) {
m_resourceList[iii] = _object; m_resourceList[iii] = _object;
return; return;
@ -181,14 +181,14 @@ bool ewol::ResourceManager::release(ewol::Resource*& _object) {
EWOL_ERROR("Try to remove a resource that have null pointer ..."); EWOL_ERROR("Try to remove a resource that have null pointer ...");
return false; return false;
} }
for (int32_t iii=0; iii<m_resourceListToUpdate.size(); iii++) { for (size_t iii=0; iii<m_resourceListToUpdate.size(); iii++) {
if (m_resourceListToUpdate[iii] == _object) { if (m_resourceListToUpdate[iii] == _object) {
m_resourceListToUpdate[iii] = NULL; m_resourceListToUpdate[iii] = NULL;
//l_resourceListToUpdate.Erase(iii); //l_resourceListToUpdate.Erase(iii);
} }
} }
EWOL_VERBOSE("RELEASE (default) : file : \"" << _object->getName() << "\""); EWOL_VERBOSE("RELEASE (default) : file : \"" << _object->getName() << "\"");
for (int32_t iii=m_resourceList.size()-1; iii >= 0; iii--) { for (int64_t iii=m_resourceList.size()-1; iii >= 0; iii--) {
if (m_resourceList[iii] == NULL) { if (m_resourceList[iii] == NULL) {
continue; continue;
} }

2
sources/ewol/resources/Shader.cpp
View File

@ -88,7 +88,7 @@ void ewol::Shader::updateContext(void) {
EWOL_ERROR("Could not compile \"" << tmpShaderType << "\" name='" << m_name << "'"); EWOL_ERROR("Could not compile \"" << tmpShaderType << "\" name='" << m_name << "'");
EWOL_ERROR("Error " << l_bufferDisplayError); EWOL_ERROR("Error " << l_bufferDisplayError);
std::vector<std::string> lines = string_split(m_fileData, '\n'); std::vector<std::string> lines = string_split(m_fileData, '\n');
for (esize_t iii=0 ; iii<lines.size() ; iii++) { for (size_t iii=0 ; iii<lines.size() ; iii++) {
EWOL_ERROR("file " << (iii+1) << "|" << lines[iii]); EWOL_ERROR("file " << (iii+1) << "|" << lines[iii]);
} }
return; return;

18
sources/ewol/resources/TexturedFont.cpp
View File

@ -93,7 +93,7 @@ ewol::TexturedFont::TexturedFont(const std::string& _fontName) :
#endif #endif
} }
folderList.push_back(ewol::getContext().getFontDefault().getFolder()); folderList.push_back(ewol::getContext().getFontDefault().getFolder());
for (int32_t folderID=0; folderID<folderList.size() ; folderID++) { for (size_t folderID=0; folderID<folderList.size() ; folderID++) {
etk::FSNode myFolder(folderList[folderID]); etk::FSNode myFolder(folderList[folderID]);
// find the real Font name : // find the real Font name :
std::vector<std::string> output; std::vector<std::string> output;
@ -102,9 +102,9 @@ ewol::TexturedFont::TexturedFont(const std::string& _fontName) :
EWOL_INFO("try to find font named : " << split << " in: " << myFolder); EWOL_INFO("try to find font named : " << split << " in: " << myFolder);
//EWOL_CRITICAL("parse string : " << split); //EWOL_CRITICAL("parse string : " << split);
bool hasFindAFont = false; bool hasFindAFont = false;
for (int32_t jjj=0; jjj<split.size(); jjj++) { for (size_t jjj=0; jjj<split.size(); jjj++) {
EWOL_INFO(" try with : '" << split[jjj] << "'"); EWOL_INFO(" try with : '" << split[jjj] << "'");
for (int32_t iii=0; iii<output.size(); iii++) { for (size_t iii=0; iii<output.size(); iii++) {
//EWOL_DEBUG(" file : " << output[iii]); //EWOL_DEBUG(" file : " << output[iii]);
if( true == end_with(output[iii], split[jjj]+"-"+"bold"+".ttf", false) if( true == end_with(output[iii], split[jjj]+"-"+"bold"+".ttf", false)
|| true == end_with(output[iii], split[jjj]+"-"+"b"+".ttf", false) || true == end_with(output[iii], split[jjj]+"-"+"b"+".ttf", false)
@ -248,9 +248,9 @@ bool ewol::TexturedFont::addGlyph(const char32_t& _val) {
size.setY(size.y()*2); size.setY(size.y()*2);
m_data.resize(size, etk::Color<>(0)); m_data.resize(size, etk::Color<>(0));
// note : need to rework all the lyer due to the fact that the texture is used by the faur type... // note : need to rework all the lyer due to the fact that the texture is used by the faur type...
for (int32_t kkk=0; kkk<4 ; kkk++) { for (size_t kkk=0; kkk<4 ; kkk++) {
// change the coordonate on the element in the texture // change the coordonate on the element in the texture
for (int32_t jjj=0 ; jjj<m_listElement[kkk].size() ; ++jjj) { for (size_t jjj=0 ; jjj<m_listElement[kkk].size() ; ++jjj) {
m_listElement[kkk][jjj].m_texturePosStart *= vec2(1.0f, 0.5f); m_listElement[kkk][jjj].m_texturePosStart *= vec2(1.0f, 0.5f);
m_listElement[kkk][jjj].m_texturePosSize *= vec2(1.0f, 0.5f); m_listElement[kkk][jjj].m_texturePosSize *= vec2(1.0f, 0.5f);
} }
@ -291,13 +291,13 @@ bool ewol::TexturedFont::addGlyph(const char32_t& _val) {
return hasChange; return hasChange;
} }
int32_t ewol::TexturedFont::getIndex(const char32_t& _charcode, const enum ewol::font::mode _displayMode) { int32_t ewol::TexturedFont::getIndex(char32_t _charcode, const enum ewol::font::mode _displayMode) {
if (_charcode < 0x20) { if (_charcode < 0x20) {
return 0; return 0;
} else if (_charcode < 0x80) { } else if (_charcode < 0x80) {
return _charcode - 0x1F; return _charcode - 0x1F;
} else { } else {
for (int32_t iii=0x80-0x20; iii < m_listElement[_displayMode].size(); iii++) { for (size_t iii=0x80-0x20; iii < m_listElement[_displayMode].size(); iii++) {
//EWOL_DEBUG("search : '" << charcode << "' =?= '" << (m_listElement[displayMode])[iii].m_UVal << "'"); //EWOL_DEBUG("search : '" << charcode << "' =?= '" << (m_listElement[displayMode])[iii].m_UVal << "'");
if (_charcode == (m_listElement[_displayMode])[iii].m_UVal) { if (_charcode == (m_listElement[_displayMode])[iii].m_UVal) {
//EWOL_DEBUG("search : '" << charcode << "'"); //EWOL_DEBUG("search : '" << charcode << "'");
@ -321,9 +321,9 @@ ewol::GlyphProperty* ewol::TexturedFont::getGlyphPointer(const char32_t& _charco
//EWOL_DEBUG("Get glyph property for mode: " << _displayMode << " == > wrapping index : " << m_modeWraping[_displayMode]); //EWOL_DEBUG("Get glyph property for mode: " << _displayMode << " == > wrapping index : " << m_modeWraping[_displayMode]);
int32_t index = getIndex(_charcode, _displayMode); int32_t index = getIndex(_charcode, _displayMode);
if( index < 0 if( index < 0
|| index >= m_listElement[_displayMode].size() ) { || (size_t)index >= m_listElement[_displayMode].size() ) {
EWOL_ERROR(" Try to get glyph index inexistant ... == > return the index 0 ... id=" << index); EWOL_ERROR(" Try to get glyph index inexistant ... == > return the index 0 ... id=" << index);
if (m_listElement[_displayMode].size() >= 0) { if (m_listElement[_displayMode].size() > 0) {
return &((m_listElement[_displayMode])[0]); return &((m_listElement[_displayMode])[0]);
} }
return NULL; return NULL;

2
sources/ewol/resources/TexturedFont.h
View File

@ -68,7 +68,7 @@ namespace ewol {
* @param[in] _displayMode Mode to display the currrent font * @param[in] _displayMode Mode to display the currrent font
* @return The ID in the table (if it does not exist : return 0) * @return The ID in the table (if it does not exist : return 0)
*/ */
int32_t getIndex(const char32_t& _charcode, const enum ewol::font::mode _displayMode); int32_t getIndex(char32_t _charcode, const enum ewol::font::mode _displayMode);
/** /**
* @brief get the pointer on the coresponding glyph * @brief get the pointer on the coresponding glyph
* @param[in] _charcode The unicodeValue * @param[in] _charcode The unicodeValue

12
sources/ewol/resources/VirtualBufferObject.cpp
View File

@ -19,7 +19,7 @@ ewol::VirtualBufferObject::VirtualBufferObject(int32_t _number) :
m_exist(false) { m_exist(false) {
addObjectType("ewol::VirtualBufferObject"); addObjectType("ewol::VirtualBufferObject");
m_nbVBO = etk_avg(1, _number, NB_VBO_MAX); m_nbVBO = etk_avg(1, _number, NB_VBO_MAX);
for (int32_t iii=0; iii<NB_VBO_MAX; iii++) { for (size_t iii=0; iii<NB_VBO_MAX; iii++) {
m_vbo[iii]=0; m_vbo[iii]=0;
m_vboUsed[iii]=false; m_vboUsed[iii]=false;
} }
@ -41,7 +41,7 @@ void ewol::VirtualBufferObject::updateContext(void) {
glGenBuffers(m_nbVBO, m_vbo); glGenBuffers(m_nbVBO, m_vbo);
} }
m_exist = true; m_exist = true;
for (int32_t iii=0; iii<m_nbVBO; iii++) { for (size_t iii=0; iii<m_nbVBO; iii++) {
EWOL_INFO("VBO : add [" << getId() << "]=" << m_buffer[iii].size() << "*sizeof(float) OGl_Id=" << m_vbo[iii]); EWOL_INFO("VBO : add [" << getId() << "]=" << m_buffer[iii].size() << "*sizeof(float) OGl_Id=" << m_vbo[iii]);
if (true == m_vboUsed[iii]) { if (true == m_vboUsed[iii]) {
// select the buffer to set data inside it ... // select the buffer to set data inside it ...
@ -63,7 +63,7 @@ void ewol::VirtualBufferObject::removeContext(void) {
<< "/" << m_vbo[3]); << "/" << m_vbo[3]);
glDeleteBuffers(m_nbVBO, m_vbo); glDeleteBuffers(m_nbVBO, m_vbo);
m_exist = false; m_exist = false;
for (int32_t iii=0; iii<NB_VBO_MAX; iii++) { for (size_t iii=0; iii<NB_VBO_MAX; iii++) {
m_vbo[iii] = 0; m_vbo[iii] = 0;
} }
} }
@ -71,7 +71,7 @@ void ewol::VirtualBufferObject::removeContext(void) {
void ewol::VirtualBufferObject::removeContextToLate(void) { void ewol::VirtualBufferObject::removeContextToLate(void) {
m_exist = false; m_exist = false;
for (int32_t iii=0; iii<NB_VBO_MAX; iii++) { for (size_t iii=0; iii<NB_VBO_MAX; iii++) {
m_vbo[iii] = 0; m_vbo[iii] = 0;
} }
} }
@ -94,7 +94,7 @@ void ewol::VirtualBufferObject::pushOnBuffer(int32_t _id, const vec3& _data) {
} }
vec3 ewol::VirtualBufferObject::getOnBufferVec3(int32_t _id, int32_t _elementID) { vec3 ewol::VirtualBufferObject::getOnBufferVec3(int32_t _id, int32_t _elementID) {
if (_elementID*3>m_buffer[_id].size()) { if ((size_t)_elementID*3 > m_buffer[_id].size()) {
return vec3(0,0,0); return vec3(0,0,0);
} }
return vec3(m_buffer[_id][3*_elementID], return vec3(m_buffer[_id][3*_elementID],
@ -113,7 +113,7 @@ void ewol::VirtualBufferObject::pushOnBuffer(int32_t _id, const vec2& _data) {
} }
vec2 ewol::VirtualBufferObject::getOnBufferVec2(int32_t _id, int32_t _elementID) { vec2 ewol::VirtualBufferObject::getOnBufferVec2(int32_t _id, int32_t _elementID) {
if (_elementID*2>m_buffer[_id].size()) { if ((size_t)_elementID*2 > m_buffer[_id].size()) {
return vec2(0,0); return vec2(0,0);
} }
return vec2(m_buffer[_id][2*_elementID], return vec2(m_buffer[_id][2*_elementID],

2
sources/ewol/resources/VirtualBufferObject.h
View File

@ -23,7 +23,7 @@ namespace ewol {
*/ */
class VirtualBufferObject : public ewol::Resource { class VirtualBufferObject : public ewol::Resource {
private : private :
int32_t m_nbVBO; size_t m_nbVBO;
bool m_exist; //!< This data is availlable in the Graphic card bool m_exist; //!< This data is availlable in the Graphic card
GLuint m_vbo[NB_VBO_MAX]; //!< openGl ID of this VBO GLuint m_vbo[NB_VBO_MAX]; //!< openGl ID of this VBO
bool m_vboUsed[NB_VBO_MAX]; //!< true if the VBO is allocated or used ... bool m_vboUsed[NB_VBO_MAX]; //!< true if the VBO is allocated or used ...

2
sources/ewol/widget/Button.cpp
View File

@ -407,7 +407,7 @@ bool widget::Button::loadXML(exml::Element* _element) {
setSubWidgetToggle(NULL); setSubWidgetToggle(NULL);
// parse all the elements : // parse all the elements :
for(int32_t iii=0; iii< _element->size(); iii++) { for(size_t iii=0; iii< _element->size(); iii++) {
exml::Element* pNode = _element->getElement(iii); exml::Element* pNode = _element->getElement(iii);
if (pNode == NULL) { if (pNode == NULL) {
// trash here all that is not element // trash here all that is not element

2
sources/ewol/widget/Container.cpp
View File

@ -163,7 +163,7 @@ bool widget::Container::loadXML(exml::Element* _node) {
subWidgetRemoveDelayed(); subWidgetRemoveDelayed();
// parse all the elements : // parse all the elements :
for(int32_t iii=0; iii< _node->size(); iii++) { for(size_t iii=0; iii< _node->size(); iii++) {
exml::Element* pNode = _node->getElement(iii); exml::Element* pNode = _node->getElement(iii);
if (pNode == NULL) { if (pNode == NULL) {
// trash here all that is not element // trash here all that is not element

26
sources/ewol/widget/ContainerN.cpp
View File

@ -85,8 +85,8 @@ void widget::ContainerN::subWidgetRemove(ewol::Widget* _newWidget) {
if (NULL == _newWidget) { if (NULL == _newWidget) {
return; return;
} }
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (_newWidget == m_subWidget[iii]) { if (_newWidget == m_subWidget[iii]) {
m_subWidget[iii]->removeUpperWidget(); m_subWidget[iii]->removeUpperWidget();
delete(m_subWidget[iii]); delete(m_subWidget[iii]);
@ -107,7 +107,7 @@ void widget::ContainerN::subWidgetUnLink(ewol::Widget* _newWidget) {
if (NULL == _newWidget) { if (NULL == _newWidget) {
return; return;
} }
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (_newWidget == m_subWidget[iii]) { if (_newWidget == m_subWidget[iii]) {
m_subWidget[iii]->removeUpperWidget(); m_subWidget[iii]->removeUpperWidget();
m_subWidget[iii] = NULL; m_subWidget[iii] = NULL;
@ -120,7 +120,7 @@ void widget::ContainerN::subWidgetUnLink(ewol::Widget* _newWidget) {
} }
void widget::ContainerN::subWidgetRemoveAll(void) { void widget::ContainerN::subWidgetRemoveAll(void) {
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
// the size automaticly decrement with the auto call of the onObjectRemove function // the size automaticly decrement with the auto call of the onObjectRemove function
while (m_subWidget.size() > 0 ) { while (m_subWidget.size() > 0 ) {
if (NULL != m_subWidget[0]) { if (NULL != m_subWidget[0]) {
@ -142,7 +142,7 @@ void widget::ContainerN::subWidgetRemoveAll(void) {
void widget::ContainerN::subWidgetRemoveAllDelayed(void) { void widget::ContainerN::subWidgetRemoveAllDelayed(void) {
// the size automaticly decrement with the auto call of the onObjectRemove function // the size automaticly decrement with the auto call of the onObjectRemove function
for(int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->removeUpperWidget(); m_subWidget[iii]->removeUpperWidget();
m_subWidget[iii]->removeObject(); m_subWidget[iii]->removeObject();
@ -159,7 +159,7 @@ ewol::Widget* widget::ContainerN::getWidgetNamed(const std::string& _widgetName)
if (NULL!=tmpUpperWidget) { if (NULL!=tmpUpperWidget) {
return tmpUpperWidget; return tmpUpperWidget;
} }
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
ewol::Widget* tmpWidget = m_subWidget[iii]->getWidgetNamed(_widgetName); ewol::Widget* tmpWidget = m_subWidget[iii]->getWidgetNamed(_widgetName);
if (NULL != tmpWidget) { if (NULL != tmpWidget) {
@ -174,7 +174,7 @@ void widget::ContainerN::onObjectRemove(ewol::EObject* _removeObject) {
// First step call parrent : // First step call parrent :
ewol::Widget::onObjectRemove(_removeObject); ewol::Widget::onObjectRemove(_removeObject);
// second step find if in all the elements ... // second step find if in all the elements ...
for(int32_t iii=m_subWidget.size()-1; iii >= 0; iii--) { for (int64_t iii=m_subWidget.size()-1; iii >= 0; iii--) {
if(m_subWidget[iii] == _removeObject) { if(m_subWidget[iii] == _removeObject) {
EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} remove sizer sub Element [" << iii << "/" << m_subWidget.size()-1 << "] == > destroyed object"); EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} remove sizer sub Element [" << iii << "/" << m_subWidget.size()-1 << "] == > destroyed object");
m_subWidget[iii] = NULL; m_subWidget[iii] = NULL;
@ -193,7 +193,7 @@ void widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) {
// subwidget draw // subwidget draw
ewol::DrawProperty prop = _displayProp; ewol::DrawProperty prop = _displayProp;
prop.limit(m_origin, m_size); prop.limit(m_origin, m_size);
for (int32_t iii=m_subWidget.size()-1; iii >= 0; iii--) { for (int64_t iii=m_subWidget.size()-1; iii >= 0; iii--) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->systemDraw(prop); m_subWidget[iii]->systemDraw(prop);
} }
@ -202,7 +202,7 @@ void widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) {
void widget::ContainerN::calculateSize(const vec2& _availlable) { void widget::ContainerN::calculateSize(const vec2& _availlable) {
m_size = _availlable; m_size = _availlable;
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->setOrigin(m_origin+m_offset); m_subWidget[iii]->setOrigin(m_origin+m_offset);
m_subWidget[iii]->calculateSize(m_size); m_subWidget[iii]->calculateSize(m_size);
@ -216,7 +216,7 @@ void widget::ContainerN::calculateMinMaxSize(void) {
m_minSize.setValue(0,0); m_minSize.setValue(0,0);
m_maxSize.setValue(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE); m_maxSize.setValue(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE);
//EWOL_ERROR("[" << getId() << "] {" << getObjectType() << "} set min size : " << m_minSize); //EWOL_ERROR("[" << getId() << "] {" << getObjectType() << "} set min size : " << m_minSize);
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->calculateMinMaxSize(); m_subWidget[iii]->calculateMinMaxSize();
bvec2 subExpendProp = m_subWidget[iii]->canExpand(); bvec2 subExpendProp = m_subWidget[iii]->canExpand();
@ -235,7 +235,7 @@ void widget::ContainerN::calculateMinMaxSize(void) {
} }
void widget::ContainerN::onRegenerateDisplay(void) { void widget::ContainerN::onRegenerateDisplay(void) {
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->onRegenerateDisplay(); m_subWidget[iii]->onRegenerateDisplay();
} }
@ -247,7 +247,7 @@ ewol::Widget* widget::ContainerN::getWidgetAtPos(const vec2& _pos) {
return NULL; return NULL;
} }
// for all element in the sizer ... // for all element in the sizer ...
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
vec2 tmpSize = m_subWidget[iii]->getSize(); vec2 tmpSize = m_subWidget[iii]->getSize();
vec2 tmpOrigin = m_subWidget[iii]->getOrigin(); vec2 tmpOrigin = m_subWidget[iii]->getOrigin();
@ -286,7 +286,7 @@ bool widget::ContainerN::loadXML(exml::Element* _node) {
invertAdding=true; invertAdding=true;
} }
// parse all the elements : // parse all the elements :
for(int32_t iii=0; iii< _node->size(); iii++) { for (size_t iii=0; iii < _node->size(); iii++) {
exml::Element* pNode = _node->getElement(iii); exml::Element* pNode = _node->getElement(iii);
if (pNode == NULL) { if (pNode == NULL) {
// trash here all that is not element // trash here all that is not element

16
sources/ewol/widget/Entry.cpp
View File

@ -114,7 +114,7 @@ void widget::Entry::calculateMinMaxSize(void) {
void widget::Entry::setValue(const std::string& _newData) { void widget::Entry::setValue(const std::string& _newData) {
std::string newData = _newData; std::string newData = _newData;
if (newData.size()>m_maxCharacter) { if ((int64_t)newData.size() > m_maxCharacter) {
newData = std::string(_newData, 0, m_maxCharacter); newData = std::string(_newData, 0, m_maxCharacter);
EWOL_DEBUG("Limit entry set of data... " << std::string(_newData, m_maxCharacter)); EWOL_DEBUG("Limit entry set of data... " << std::string(_newData, m_maxCharacter));
} }
@ -197,7 +197,7 @@ void widget::Entry::updateCursorPosition(const vec2& _pos, bool _selection) {
//EWOL_DEBUG("hidenSize : " << displayHidenSize); //EWOL_DEBUG("hidenSize : " << displayHidenSize);
int32_t newCursorPosition = -1; int32_t newCursorPosition = -1;
int32_t tmpTextOriginX = padding.x(); int32_t tmpTextOriginX = padding.x();
for (int32_t iii=0; iii<m_data.size(); iii++) { for (size_t iii=0; iii<m_data.size(); iii++) {
tmpDisplay = std::string(m_data, 0, iii); tmpDisplay = std::string(m_data, 0, iii);
int32_t tmpWidth = m_oObjectText.calculateSize(tmpDisplay).x() - displayHidenSize; int32_t tmpWidth = m_oObjectText.calculateSize(tmpDisplay).x() - displayHidenSize;
if (tmpWidth >= relPos.x()-tmpTextOriginX) { if (tmpWidth >= relPos.x()-tmpTextOriginX) {
@ -272,7 +272,7 @@ bool widget::Entry::onEventInput(const ewol::EventInput& _event) {
// select word // select word
m_displayCursorPosSelection = m_displayCursorPos-1; m_displayCursorPosSelection = m_displayCursorPos-1;
// search forward // search forward
for (int32_t iii=m_displayCursorPos; iii <= m_data.size(); iii++) { for (size_t iii=m_displayCursorPos; iii <= m_data.size(); iii++) {
if(iii == m_data.size()) { if(iii == m_data.size()) {
m_displayCursorPos = iii; m_displayCursorPos = iii;
break; break;
@ -291,7 +291,7 @@ bool widget::Entry::onEventInput(const ewol::EventInput& _event) {
} }
} }
// search backward // search backward
for (int32_t iii=m_displayCursorPosSelection; iii >= -1; iii--) { for (int64_t iii=m_displayCursorPosSelection; iii >= -1; iii--) {
if(iii == -1) { if(iii == -1) {
m_displayCursorPosSelection = 0; m_displayCursorPosSelection = 0;
break; break;
@ -365,7 +365,7 @@ bool widget::Entry::onEventEntry(const ewol::EventEntry& _event) {
return true; return true;
} else if (_event.getChar() == 0x7F) { } else if (_event.getChar() == 0x7F) {
// SUPPR : // SUPPR :
if (m_data.size() > 0 && m_displayCursorPos<m_data.size()) { if (m_data.size() > 0 && m_displayCursorPos < (int64_t)m_data.size()) {
m_data.erase(m_displayCursorPos, 1); m_data.erase(m_displayCursorPos, 1);
m_displayCursorPos = etk_max(m_displayCursorPos, 0); m_displayCursorPos = etk_max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
@ -379,7 +379,7 @@ bool widget::Entry::onEventEntry(const ewol::EventEntry& _event) {
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
} }
} else if(_event.getChar() >= 20) { } else if(_event.getChar() >= 20) {
if (m_data.size() > m_maxCharacter) { if ((int64_t)m_data.size() > m_maxCharacter) {
EWOL_INFO("Reject data for entry : '" << _event.getChar() << "'"); EWOL_INFO("Reject data for entry : '" << _event.getChar() << "'");
} else { } else {
std::string newData = m_data; std::string newData = m_data;
@ -415,7 +415,7 @@ bool widget::Entry::onEventEntry(const ewol::EventEntry& _event) {
default: default:
return false; return false;
} }
m_displayCursorPos = etk_avg(0, m_displayCursorPos, m_data.size()); m_displayCursorPos = etk_avg(0, m_displayCursorPos, (int64_t)m_data.size());
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
markToRedraw(); markToRedraw();
return true; return true;
@ -434,7 +434,7 @@ void widget::Entry::setInternalValue(const std::string& _newData) {
} }
//EWOL_INFO("find regExp : \"" << m_data << "\" start=" << m_regExp.Start() << " stop=" << m_regExp.Stop() ); //EWOL_INFO("find regExp : \"" << m_data << "\" start=" << m_regExp.Start() << " stop=" << m_regExp.Stop() );
if( 0 != m_regExp.start() if( 0 != m_regExp.start()
|| _newData.size() != m_regExp.stop() ) { || _newData.size() != (size_t)m_regExp.stop() ) {
EWOL_INFO("The input data match not entirely with the regExp \"" << _newData << "\" RegExp=\"" << m_regExp.getRegExp() << "\" start=" << m_regExp.start() << " stop=" << m_regExp.stop() ); EWOL_INFO("The input data match not entirely with the regExp \"" << _newData << "\" RegExp=\"" << m_regExp.getRegExp() << "\" start=" << m_regExp.start() << " stop=" << m_regExp.stop() );
return; return;
} }

40
sources/ewol/widget/Gird.cpp
View File

@ -58,7 +58,7 @@ void widget::Gird::calculateSize(const vec2& _availlable) {
m_size = _availlable; m_size = _availlable;
m_size -= m_borderSize*2; m_size -= m_borderSize*2;
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii].widget) { if (NULL != m_subWidget[iii].widget) {
//calculate the origin : //calculate the origin :
vec2 tmpOrigin = m_origin + m_borderSize; vec2 tmpOrigin = m_origin + m_borderSize;
@ -92,7 +92,7 @@ void widget::Gird::calculateSize(const vec2& _availlable) {
} }
void widget::Gird::calculateMinMaxSize(void) { void widget::Gird::calculateMinMaxSize(void) {
for (int32_t iii=0; iii<m_sizeCol.size(); iii++ ){ for (size_t iii=0; iii<m_sizeCol.size(); iii++ ){
if (m_sizeCol[iii] <= 0) { if (m_sizeCol[iii] <= 0) {
m_sizeCol[iii] = 0; m_sizeCol[iii] = 0;
} }
@ -103,7 +103,7 @@ void widget::Gird::calculateMinMaxSize(void) {
m_uniformSizeRow = 0; m_uniformSizeRow = 0;
m_minSize += m_borderSize*2; m_minSize += m_borderSize*2;
int32_t lastLineID = 0; int32_t lastLineID = 0;
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (m_subWidget[iii].row > lastLineID) { if (m_subWidget[iii].row > lastLineID) {
// change of line : // change of line :
lastLineID = m_subWidget[iii].row; lastLineID = m_subWidget[iii].row;
@ -125,7 +125,7 @@ void widget::Gird::calculateMinMaxSize(void) {
m_uniformSizeRow = m_sizeRow; m_uniformSizeRow = m_sizeRow;
} }
int32_t tmpSizeWidth = 0; int32_t tmpSizeWidth = 0;
for (int32_t iii=0; iii<m_sizeCol.size(); iii++ ){ for (size_t iii=0; iii<m_sizeCol.size(); iii++ ){
tmpSizeWidth += abs(m_sizeCol[iii]); tmpSizeWidth += abs(m_sizeCol[iii]);
} }
EWOL_DEBUG(" tmpSizeWidth=" << tmpSizeWidth); EWOL_DEBUG(" tmpSizeWidth=" << tmpSizeWidth);
@ -138,10 +138,10 @@ void widget::Gird::calculateMinMaxSize(void) {
} }
void widget::Gird::setColNumber(int32_t _colNumber) { void widget::Gird::setColNumber(int32_t _colNumber) {
if (m_sizeCol.size() > _colNumber) { if ((int64_t)m_sizeCol.size() > _colNumber) {
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
// remove subWidget : // remove subWidget :
for (int32_t iii=m_subWidget.size(); iii >= 0; iii--) { for (int64_t iii=m_subWidget.size(); iii >= 0; iii--) {
if (m_subWidget[iii].col>(_colNumber-1)) { if (m_subWidget[iii].col>(_colNumber-1)) {
// out of bounds : must remove it ... // out of bounds : must remove it ...
if (m_subWidget[iii].widget != NULL) { if (m_subWidget[iii].widget != NULL) {
@ -169,7 +169,7 @@ void widget::Gird::setColNumber(int32_t _colNumber) {
} }
void widget::Gird::setColSize(int32_t _colId, int32_t _size) { void widget::Gird::setColSize(int32_t _colId, int32_t _size) {
if (m_sizeCol.size() > _colId) { if ((int64_t)m_sizeCol.size() > _colId) {
m_sizeCol[_colId] = _size; m_sizeCol[_colId] = _size;
} else { } else {
EWOL_ERROR("Can not set the Colomn size : " << _colId+1 EWOL_ERROR("Can not set the Colomn size : " << _colId+1
@ -183,7 +183,7 @@ void widget::Gird::setRowSize(int32_t _size) {
} }
int32_t widget::Gird::getColSize(int32_t _colId) { int32_t widget::Gird::getColSize(int32_t _colId) {
if (m_sizeCol.size() > _colId) { if ((int64_t)m_sizeCol.size() > _colId) {
if (m_sizeCol[_colId] <= 0) { if (m_sizeCol[_colId] <= 0) {
return 0; return 0;
} }
@ -198,7 +198,7 @@ int32_t widget::Gird::getRowSize(void) {
} }
void widget::Gird::subWidgetRemoveAll(void) { void widget::Gird::subWidgetRemoveAll(void) {
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
// the size automaticly decrement with the auto call of the onObjectRemove function // the size automaticly decrement with the auto call of the onObjectRemove function
while (m_subWidget.size() > 0 ) { while (m_subWidget.size() > 0 ) {
if (NULL != m_subWidget[0].widget) { if (NULL != m_subWidget[0].widget) {
@ -228,7 +228,7 @@ void widget::Gird::subWidgetAdd(int32_t _colId, int32_t _rowId, ewol::Widget* _n
prop.widget = _newWidget; prop.widget = _newWidget;
// need to find the correct position : // need to find the correct position :
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (m_subWidget[iii].row < prop.row) { if (m_subWidget[iii].row < prop.row) {
continue; continue;
} else if (m_subWidget[iii].row > prop.row) { } else if (m_subWidget[iii].row > prop.row) {
@ -265,8 +265,8 @@ void widget::Gird::subWidgetRemove(ewol::Widget* _newWidget)
if (NULL == _newWidget) { if (NULL == _newWidget) {
return; return;
} }
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (_newWidget == m_subWidget[iii].widget) { if (_newWidget == m_subWidget[iii].widget) {
delete(m_subWidget[iii].widget); delete(m_subWidget[iii].widget);
// no remove, this element is removed with the function onObjectRemove == > it does not exist anymore ... // no remove, this element is removed with the function onObjectRemove == > it does not exist anymore ...
@ -286,9 +286,9 @@ void widget::Gird::subWidgetRemove(int32_t _colId, int32_t _rowId) {
EWOL_WARNING("[" << getId() << "] try to remove widget with id < 0 col=" << _colId << " row=" << _rowId); EWOL_WARNING("[" << getId() << "] try to remove widget with id < 0 col=" << _colId << " row=" << _rowId);
return; return;
} }
int32_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
// try to find it ... // try to find it ...
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if( m_subWidget[iii].row == _rowId if( m_subWidget[iii].row == _rowId
&& m_subWidget[iii].col == _colId) { && m_subWidget[iii].col == _colId) {
if (m_subWidget[iii].widget == NULL) { if (m_subWidget[iii].widget == NULL) {
@ -315,7 +315,7 @@ void widget::Gird::subWidgetUnLink(ewol::Widget* _newWidget) {
if (NULL == _newWidget) { if (NULL == _newWidget) {
return; return;
} }
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (_newWidget == m_subWidget[iii].widget) { if (_newWidget == m_subWidget[iii].widget) {
m_subWidget[iii].widget = NULL; m_subWidget[iii].widget = NULL;
m_subWidget.erase(m_subWidget.begin()+iii); m_subWidget.erase(m_subWidget.begin()+iii);
@ -330,7 +330,7 @@ void widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) {
return; return;
} }
// try to find it ... // try to find it ...
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if( m_subWidget[iii].row == _rowId if( m_subWidget[iii].row == _rowId
&& m_subWidget[iii].col == _colId) { && m_subWidget[iii].col == _colId) {
m_subWidget[iii].widget = NULL; m_subWidget[iii].widget = NULL;
@ -343,7 +343,7 @@ void widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) {
void widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) { void widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) {
ewol::Widget::systemDraw(_displayProp); ewol::Widget::systemDraw(_displayProp);
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii].widget) { if (NULL != m_subWidget[iii].widget) {
m_subWidget[iii].widget->systemDraw(_displayProp); m_subWidget[iii].widget->systemDraw(_displayProp);
} }
@ -351,7 +351,7 @@ void widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) {
} }
void widget::Gird::onRegenerateDisplay(void) { void widget::Gird::onRegenerateDisplay(void) {
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii].widget) { if (NULL != m_subWidget[iii].widget) {
m_subWidget[iii].widget->onRegenerateDisplay(); m_subWidget[iii].widget->onRegenerateDisplay();
} }
@ -363,7 +363,7 @@ ewol::Widget * widget::Gird::getWidgetAtPos(const vec2& _pos) {
return NULL; return NULL;
} }
// for all element in the sizer ... // for all element in the sizer ...
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii].widget) { if (NULL != m_subWidget[iii].widget) {
vec2 tmpSize = m_subWidget[iii].widget->getSize(); vec2 tmpSize = m_subWidget[iii].widget->getSize();
vec2 tmpOrigin = m_subWidget[iii].widget->getOrigin(); vec2 tmpOrigin = m_subWidget[iii].widget->getOrigin();

5
sources/ewol/widget/Image.cpp
View File

@ -115,11 +115,6 @@ void widget::Image::onRegenerateDisplay(void) {
vec2 imageRealSize = m_minSize - imageBoder; vec2 imageRealSize = m_minSize - imageBoder;
vec2 imageRealSizeMax = m_size - imageBoder; vec2 imageRealSizeMax = m_size - imageBoder;
bool xSizeBigger = false;
if (imageRealSize.x() > imageRealSize.y()) {
xSizeBigger = true;
}
if (m_userFill.x() == true) { if (m_userFill.x() == true) {
imageRealSize.setX(imageRealSizeMax.x()); imageRealSize.setX(imageRealSizeMax.x());
} else { } else {

2
sources/ewol/widget/Layer.cpp
View File

@ -34,7 +34,7 @@ ewol::Widget* widget::Layer::getWidgetAtPos(const vec2& _pos) {
return NULL; return NULL;
} }
// for all element in the sizer ... // for all element in the sizer ...
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
vec2 tmpSize = m_subWidget[iii]->getSize(); vec2 tmpSize = m_subWidget[iii]->getSize();
vec2 tmpOrigin = m_subWidget[iii]->getOrigin(); vec2 tmpOrigin = m_subWidget[iii]->getOrigin();

16
sources/ewol/widget/List.cpp
View File

@ -30,7 +30,7 @@ widget::List::List(void) {
widget::List::~List(void) { widget::List::~List(void) {
//clean all the object //clean all the object
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
delete(m_listOObject[iii]); delete(m_listOObject[iii]);
m_listOObject[iii] = NULL; m_listOObject[iii] = NULL;
} }
@ -53,7 +53,7 @@ void widget::List::setRawVisible(int32_t _id) {
m_displayStartRaw = _id - m_nbVisibleRaw + 2; m_displayStartRaw = _id - m_nbVisibleRaw + 2;
} }
} }
if (m_displayStartRaw>getNuberOfRaw()) { if (m_displayStartRaw > (int32_t)getNuberOfRaw()) {
m_displayStartRaw = getNuberOfRaw()-2; m_displayStartRaw = getNuberOfRaw()-2;
} }
if (m_displayStartRaw<0) { if (m_displayStartRaw<0) {
@ -78,7 +78,7 @@ void widget::List::addOObject(ewol::Compositing* _newObject, int32_t _pos) {
EWOL_ERROR("Try to add an empty object in the Widget generic display system"); EWOL_ERROR("Try to add an empty object in the Widget generic display system");
return; return;
} }
if (_pos < 0 || _pos >= m_listOObject.size() ) { if (_pos < 0 || (size_t)_pos >= m_listOObject.size() ) {
m_listOObject.push_back(_newObject); m_listOObject.push_back(_newObject);
} else { } else {
m_listOObject.insert(m_listOObject.begin()+_pos, _newObject); m_listOObject.insert(m_listOObject.begin()+_pos, _newObject);
@ -86,7 +86,7 @@ void widget::List::addOObject(ewol::Compositing* _newObject, int32_t _pos) {
} }
void widget::List::clearOObjectList(void) { void widget::List::clearOObjectList(void) {
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
delete(m_listOObject[iii]); delete(m_listOObject[iii]);
m_listOObject[iii] = NULL; m_listOObject[iii] = NULL;
} }
@ -94,7 +94,7 @@ void widget::List::clearOObjectList(void) {
} }
void widget::List::onDraw(void) { void widget::List::onDraw(void) {
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
if (NULL != m_listOObject[iii]) { if (NULL != m_listOObject[iii]) {
m_listOObject[iii]->draw(); m_listOObject[iii]->draw();
} }
@ -162,11 +162,11 @@ void widget::List::onRegenerateDisplay(void) {
// add the default position raw : // add the default position raw :
m_lineSize.push_back(tmpRegister); m_lineSize.push_back(tmpRegister);
for(int32_t jjj=0; jjj<nbColomn && displayPositionX < m_size.x() ; jjj++) { for (size_t jjj=0; jjj<nbColomn && displayPositionX < m_size.x() ; jjj++) {
int32_t sizeColom = 0; int32_t sizeColom = 0;
displayPositionY = m_size.y(); displayPositionY = m_size.y();
m_nbVisibleRaw = 0; m_nbVisibleRaw = 0;
for(int32_t iii=startRaw; iii<nbRaw && displayPositionY >= 0; iii++) { for (int32_t iii=startRaw; iii<nbRaw && displayPositionY >= 0; iii++) {
m_nbVisibleRaw++; m_nbVisibleRaw++;
std::string myTextToWrite; std::string myTextToWrite;
etk::Color<> fg; etk::Color<> fg;
@ -222,7 +222,7 @@ bool widget::List::onEventInput(const ewol::EventInput& _event) {
} }
// parse all the loged row position to find the good one... // parse all the loged row position to find the good one...
int32_t rawID = -1; int32_t rawID = -1;
for(int32_t iii=0; iii<m_lineSize.size()-1; iii++) { for (size_t iii=0; iii<m_lineSize.size()-1; iii++) {
if( relativePos.y()<m_lineSize[iii].y() if( relativePos.y()<m_lineSize[iii].y()
&& relativePos.y() >= m_lineSize[iii+1].y() ) { && relativePos.y() >= m_lineSize[iii+1].y() ) {
// we find the raw : // we find the raw :

25
sources/ewol/widget/ListFileSystem.cpp
View File

@ -41,7 +41,7 @@ widget::ListFileSystem::ListFileSystem(void) {
}; };
widget::ListFileSystem::~ListFileSystem(void) { widget::ListFileSystem::~ListFileSystem(void) {
for (int32_t iii=0; iii<m_list.size(); iii++) { for (size_t iii=0; iii<m_list.size(); iii++) {
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
delete(m_list[iii]); delete(m_list[iii]);
m_list[iii] = NULL; m_list[iii] = NULL;
@ -56,7 +56,7 @@ etk::Color<> widget::ListFileSystem::getBasicBG(void) {
void widget::ListFileSystem::regenerateView(void) { void widget::ListFileSystem::regenerateView(void) {
// clean the list of files : // clean the list of files :
for (esize_t iii=0; iii<m_list.size(); iii++) { for (size_t iii=0; iii<m_list.size(); iii++) {
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
delete(m_list[iii]); delete(m_list[iii]);
m_list[iii] = NULL; m_list[iii] = NULL;
@ -117,7 +117,7 @@ void widget::ListFileSystem::setSelect( std::string _data) {
// remove selected line // remove selected line
m_selectedLine = -1; m_selectedLine = -1;
// search the coresponding file : // search the coresponding file :
for (int32_t iii=0; iii<m_list.size(); iii++) { for (size_t iii=0; iii<m_list.size(); iii++) {
if (NULL!=m_list[iii]) { if (NULL!=m_list[iii]) {
if (m_list[iii]->getNameFile() == _data) { if (m_list[iii]->getNameFile() == _data) {
// we find the line : // we find the line :
@ -157,7 +157,7 @@ bool widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std::stri
} }
} }
if( _raw-offset >= 0 if( _raw-offset >= 0
&& _raw-offset < m_list.size() && _raw-offset < (int32_t)m_list.size()
&& NULL != m_list[_raw-offset]) { && NULL != m_list[_raw-offset]) {
/*if (etk::FSN_FILE == m_list[raw-offset]->getNodeType()) { /*if (etk::FSN_FILE == m_list[raw-offset]->getNodeType()) {
myTextToWrite = m_list[raw-offset]->getRight().getRight(); myTextToWrite = m_list[raw-offset]->getRight().getRight();
@ -194,26 +194,25 @@ bool widget::ListFileSystem::onItemEvent(int32_t _IdInput,
EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if (1 == _IdInput) { if (1 == _IdInput) {
int32_t previousRaw = m_selectedLine; int32_t previousRaw = m_selectedLine;
if (_raw > m_list.size()+offset ) { if (_raw > (int32_t)m_list.size()+offset ) {
m_selectedLine = -1; m_selectedLine = -1;
} else { } else {
m_selectedLine = _raw; m_selectedLine = _raw;
} }
if (previousRaw != m_selectedLine) { if (previousRaw != m_selectedLine) {
if( true == m_showFolder if( m_showFolder == true
&& m_selectedLine == 0) { && m_selectedLine == 0) {
// "." folder // "." folder
generateEventId(ewolEventFSFolderSelect, "."); generateEventId(ewolEventFSFolderSelect, ".");
} else if ( true == m_showFolder } else if ( m_showFolder == true
&& m_selectedLine == 1) { && m_selectedLine == 1) {
// ".." folder // ".." folder
generateEventId(ewolEventFSFolderSelect, ".."); generateEventId(ewolEventFSFolderSelect, "..");
} else if( m_selectedLine-offset >= 0 } else if( m_selectedLine-offset >= 0
&& m_selectedLine-offset < m_list.size() && m_selectedLine-offset < (int32_t)m_list.size()
&& NULL != m_list[m_selectedLine-offset] ) { && NULL != m_list[m_selectedLine-offset] ) {
// generate event extern : // generate event extern :
switch(m_list[m_selectedLine-offset]->getNodeType()) switch(m_list[m_selectedLine-offset]->getNodeType()) {
{
case etk::FSN_FILE : case etk::FSN_FILE :
generateEventId(ewolEventFSFileSelect, m_list[m_selectedLine-offset]->getNameFile()); generateEventId(ewolEventFSFileSelect, m_list[m_selectedLine-offset]->getNameFile());
break; break;
@ -226,16 +225,16 @@ bool widget::ListFileSystem::onItemEvent(int32_t _IdInput,
} }
} }
} else { } else {
if( true == m_showFolder if( m_showFolder == true
&& m_selectedLine == 0) { && m_selectedLine == 0) {
// "." folder // "." folder
generateEventId(ewolEventFSFolderValidate, "."); generateEventId(ewolEventFSFolderValidate, ".");
} else if ( true == m_showFolder } else if ( m_showFolder == true
&& m_selectedLine == 1) { && m_selectedLine == 1) {
// ".." folder // ".." folder
generateEventId(ewolEventFSFolderValidate, ".."); generateEventId(ewolEventFSFolderValidate, "..");
} else if( m_selectedLine-offset >= 0 } else if( m_selectedLine-offset >= 0
&& m_selectedLine-offset < m_list.size() && m_selectedLine-offset < (int32_t)m_list.size()
&& NULL != m_list[m_selectedLine-offset] ) { && NULL != m_list[m_selectedLine-offset] ) {
switch(m_list[m_selectedLine-offset]->getNodeType()) switch(m_list[m_selectedLine-offset]->getNodeType())
{ {

12
sources/ewol/widget/Menu.cpp
View File

@ -47,7 +47,7 @@ void widget::Menu::subWidgetUnLink(ewol::Widget* _newWidget) {
} }
void widget::Menu::clear(void) { void widget::Menu::clear(void) {
for( int32_t iii=0; iii < m_listElement.size(); iii++) { for (size_t iii=0; iii < m_listElement.size(); iii++) {
if (m_listElement[iii] != NULL) { if (m_listElement[iii] != NULL) {
delete(m_listElement[iii]); delete(m_listElement[iii]);
m_listElement[iii] = NULL; m_listElement[iii] = NULL;
@ -123,7 +123,7 @@ void widget::Menu::onReceiveMessage(const ewol::EMessage& _msg) {
*/ */
EWOL_ERROR(" receive message : " << _msg); EWOL_ERROR(" receive message : " << _msg);
if (_msg.getMessage() == widget::Button::eventPressed) { if (_msg.getMessage() == widget::Button::eventPressed) {
for(int32_t iii=0; iii<m_listElement.size(); iii++) { for (size_t iii=0; iii<m_listElement.size(); iii++) {
if (_msg.getCaller() == m_listElement[iii]->m_widgetPointer) { if (_msg.getCaller() == m_listElement[iii]->m_widgetPointer) {
// 2 posible case (have a message or have a child ... // 2 posible case (have a message or have a child ...
if (m_listElement[iii]->m_generateEvent != NULL) { if (m_listElement[iii]->m_generateEvent != NULL) {
@ -139,7 +139,7 @@ void widget::Menu::onReceiveMessage(const ewol::EMessage& _msg) {
} else{ } else{
EWOL_DEBUG("Menu == > load Sub Menu"); EWOL_DEBUG("Menu == > load Sub Menu");
bool findChild = false; bool findChild = false;
for(int32_t jjj=0; jjj<m_listElement.size(); jjj++) { for (size_t jjj=0; jjj<m_listElement.size(); jjj++) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) { if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) {
findChild = true; findChild = true;
break; break;
@ -178,7 +178,7 @@ void widget::Menu::onReceiveMessage(const ewol::EMessage& _msg) {
m_widgetContextMenu->setSubWidget(mySizer); m_widgetContextMenu->setSubWidget(mySizer);
bool menuHaveImage = false; bool menuHaveImage = false;
for(int32_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) { for (int64_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) {
if (m_listElement[iii]!=NULL) { if (m_listElement[iii]!=NULL) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) { if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) {
if (m_listElement[jjj]->m_image.size()!=0) { if (m_listElement[jjj]->m_image.size()!=0) {
@ -188,7 +188,7 @@ void widget::Menu::onReceiveMessage(const ewol::EMessage& _msg) {
} }
} }
} }
for(int32_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) { for (int64_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) {
if (m_listElement[iii]!=NULL) { if (m_listElement[iii]!=NULL) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) { if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) {
myButton = new widget::Button(); myButton = new widget::Button();
@ -256,7 +256,7 @@ void widget::Menu::onObjectRemove(ewol::EObject * _removeObject) {
if (m_widgetContextMenu == _removeObject) { if (m_widgetContextMenu == _removeObject) {
m_widgetContextMenu = NULL; m_widgetContextMenu = NULL;
} }
for(int32_t jjj=0; jjj<m_listElement.size(); jjj++) { for (size_t jjj=0; jjj<m_listElement.size(); jjj++) {
if (NULL != m_listElement[jjj]) { if (NULL != m_listElement[jjj]) {
if (m_listElement[jjj]->m_widgetPointer == _removeObject) { if (m_listElement[jjj]->m_widgetPointer == _removeObject) {
m_listElement[jjj]->m_widgetPointer = NULL; m_listElement[jjj]->m_widgetPointer = NULL;

36
sources/ewol/widget/PopUp.cpp
View File

@ -42,7 +42,6 @@ widget::PopUp::PopUp(const std::string& _shaperName) :
registerConfig(configLockExpand, "bool", NULL, "Lock expand contamination"); registerConfig(configLockExpand, "bool", NULL, "Lock expand contamination");
registerConfig(configAnimation, "list", "none;increase", "Annimation type"); registerConfig(configAnimation, "list", "none;increase", "Annimation type");
setAnimationMode(animationNone);
// Add annimations : // Add annimations :
addAnnimationType(ewol::Widget::annimationModeEnableAdd, annimationIncrease); addAnnimationType(ewol::Widget::annimationModeEnableAdd, annimationIncrease);
} }
@ -172,14 +171,6 @@ bool widget::PopUp::onSetConfig(const ewol::EConfig& _conf) {
lockExpand(_conf.getData()); lockExpand(_conf.getData());
return true; return true;
} }
if (_conf.getConfig() == configAnimation) {
if (compare_no_case(_conf.getData(), "increase") == true) {
setAnimationMode(animationIncrease);
} else {
setAnimationMode(animationNone);
}
return true;
}
return false; return false;
} }
@ -203,14 +194,6 @@ bool widget::PopUp::onGetConfig(const char* _config, std::string& _result) const
} }
return true; return true;
} }
if (_config == configAnimation) {
if (m_animation == animationIncrease) {
_result = "increase";
} else {
_result = "none";
}
return true;
}
return false; return false;
} }
@ -240,16 +223,25 @@ bool widget::PopUp::onEventInput(const ewol::EventInput& _event) {
return false; return false;
} }
void widget::PopUp::setAnimationMode(enum animation _animation) {
m_animation = _animation; bool widget::PopUp::onStartAnnimation(enum ewol::Widget::annimationMode _mode) {
if (true == m_shaper.changeStatusIn((int32_t)_animation) ) { if (m_annimationType[_mode] != annimationIncrease) {
periodicCallEnable(); return false;
} }
if (true == m_shaper.changeStatusIn(1) ) {
periodicCallEnable();
return true;
}
return false;
}
void widget::PopUp::onStopAnnimation(void) {
periodicCallDisable();
} }
void widget::PopUp::periodicCall(const ewol::EventTime& _event) { void widget::PopUp::periodicCall(const ewol::EventTime& _event) {
if (false == m_shaper.periodicCall(_event) ) { if (false == m_shaper.periodicCall(_event) ) {
periodicCallDisable(); stopAnnimation();
} }
markToRedraw(); markToRedraw();
} }

26
sources/ewol/widget/PopUp.h
View File

@ -71,29 +71,6 @@ namespace widget {
bool getRemoveOnExternClick(void) const { bool getRemoveOnExternClick(void) const {
return m_closeOutEvent; return m_closeOutEvent;
}; };
private:
//float m_slidingProgress; //!< ratio progression of a sliding
public:
enum animation {
animationNone, //!< No annimation
animationIncrease, //!< element came strart with no size and increase with the corect size.
};
private:
enum animation m_animation; //!< Methode add and remove element (animation)
public:
/**
* @brief set an animation mode for the new element set in the Widget container.
* @param[in] _animation The new animation mode.
*/
void setAnimationMode(enum animation _animation);
/**
* @brief get the current animation mode.
* @return The animation mode.
*/
enum animation getAnimationMode(void) const {
return m_animation;
};
protected: // Derived function protected: // Derived function
virtual void onDraw(void); virtual void onDraw(void);
virtual bool onSetConfig(const ewol::EConfig& _conf); virtual bool onSetConfig(const ewol::EConfig& _conf);
@ -105,6 +82,9 @@ namespace widget {
virtual void calculateSize(const vec2& _available); virtual void calculateSize(const vec2& _available);
virtual bool onEventInput(const ewol::EventInput& _event); virtual bool onEventInput(const ewol::EventInput& _event);
virtual ewol::Widget* getWidgetAtPos(const vec2& pos); virtual ewol::Widget* getWidgetAtPos(const vec2& pos);
protected:
virtual bool onStartAnnimation(enum ewol::Widget::annimationMode _mode);
virtual void onStopAnnimation(void);
}; };
}; };

4
sources/ewol/widget/Sizer.cpp
View File

@ -64,7 +64,7 @@ void widget::Sizer::calculateSize(const vec2& _availlable) {
float unexpandableSize=0.0; float unexpandableSize=0.0;
int32_t nbWidgetFixedSize=0; int32_t nbWidgetFixedSize=0;
int32_t nbWidgetNotFixedSize=0; int32_t nbWidgetNotFixedSize=0;
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
vec2 tmpSize = m_subWidget[iii]->getCalculateMinSize(); vec2 tmpSize = m_subWidget[iii]->getCalculateMinSize();
if (m_mode == widget::Sizer::modeVert) { if (m_mode == widget::Sizer::modeVert) {
@ -98,7 +98,7 @@ void widget::Sizer::calculateSize(const vec2& _availlable) {
} }
} }
vec2 tmpOrigin = m_origin + tmpBorderSize; vec2 tmpOrigin = m_origin + tmpBorderSize;
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
vec2 tmpSize = m_subWidget[iii]->getCalculateMinSize(); vec2 tmpSize = m_subWidget[iii]->getCalculateMinSize();
// set the origin : // set the origin :

30
sources/ewol/widget/WSlider.cpp
View File

@ -62,7 +62,7 @@ void widget::WSlider::calculateSize(const vec2& _availlable) {
if (m_windowsDestination == m_windowsSources) { if (m_windowsDestination == m_windowsSources) {
int32_t iii = m_windowsDestination; int32_t iii = m_windowsDestination;
if (iii < m_subWidget.size()) { if (iii < (int32_t)m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->setOrigin(m_origin+m_offset); m_subWidget[iii]->setOrigin(m_origin+m_offset);
m_subWidget[iii]->calculateSize(m_size); m_subWidget[iii]->calculateSize(m_size);
@ -74,7 +74,7 @@ void widget::WSlider::calculateSize(const vec2& _availlable) {
factor = 1.0f; factor = 1.0f;
} }
int32_t iii = m_windowsSources; int32_t iii = m_windowsSources;
if (iii < m_subWidget.size()) { if (iii < (int32_t)m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
if (m_transitionSlide == sladingTransitionHori) { if (m_transitionSlide == sladingTransitionHori) {
m_subWidget[iii]->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress), m_subWidget[iii]->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress),
@ -89,7 +89,7 @@ void widget::WSlider::calculateSize(const vec2& _availlable) {
} }
} }
iii = m_windowsDestination; iii = m_windowsDestination;
if (iii < m_subWidget.size()) { if (iii < (int32_t)m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
if (m_transitionSlide == sladingTransitionHori) { if (m_transitionSlide == sladingTransitionHori) {
m_subWidget[iii]->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress - m_size.x()), m_subWidget[iii]->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress - m_size.x()),
@ -110,7 +110,7 @@ void widget::WSlider::calculateSize(const vec2& _availlable) {
void widget::WSlider::subWidgetSelectSet(int32_t _id) { void widget::WSlider::subWidgetSelectSet(int32_t _id) {
int32_t elementID = -1; int32_t elementID = -1;
// search element in the list : // search element in the list :
for( int32_t iii=0 ; iii<m_subWidget.size() ; iii++) { for (size_t iii=0 ; iii<m_subWidget.size() ; iii++) {
if (m_subWidget[iii] != NULL) { if (m_subWidget[iii] != NULL) {
if (m_subWidget[iii]->getId() == _id) { if (m_subWidget[iii]->getId() == _id) {
elementID = iii; elementID = iii;
@ -135,7 +135,7 @@ void widget::WSlider::subWidgetSelectSet(ewol::Widget* _widgetPointer) {
EWOL_ERROR("Can not change to a widget NULL"); EWOL_ERROR("Can not change to a widget NULL");
return; return;
} }
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (m_subWidget[iii] != NULL) { if (m_subWidget[iii] != NULL) {
if (m_subWidget[iii] == _widgetPointer) { if (m_subWidget[iii] == _widgetPointer) {
subWidgetSelectSet(iii); subWidgetSelectSet(iii);
@ -151,7 +151,7 @@ void widget::WSlider::subWidgetSelectSet(const std::string& _widgetName) {
EWOL_ERROR("Can not change to a widget with no name (input)"); EWOL_ERROR("Can not change to a widget with no name (input)");
return; return;
} }
for (int32_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (m_subWidget[iii] != NULL) { if (m_subWidget[iii] != NULL) {
if (m_subWidget[iii]->getName() == _widgetName) { if (m_subWidget[iii]->getName() == _widgetName) {
subWidgetSelectSet(iii); subWidgetSelectSet(iii);
@ -217,7 +217,7 @@ void widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
if (m_windowsDestination == m_windowsSources) { if (m_windowsDestination == m_windowsSources) {
//EWOL_DEBUG("Draw : " << m_windowsDestination); //EWOL_DEBUG("Draw : " << m_windowsDestination);
int32_t iii = m_windowsDestination; int32_t iii = m_windowsDestination;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->systemDraw(prop); m_subWidget[iii]->systemDraw(prop);
} }
@ -226,14 +226,14 @@ void widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
//EWOL_DEBUG("Draw : " << m_windowsSources << "=>" << m_windowsDestination << "progress=" << ((float)m_slidingProgress/1000.) ); //EWOL_DEBUG("Draw : " << m_windowsSources << "=>" << m_windowsDestination << "progress=" << ((float)m_slidingProgress/1000.) );
// draw Sources : // draw Sources :
int32_t iii = m_windowsSources; int32_t iii = m_windowsSources;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->systemDraw(prop); m_subWidget[iii]->systemDraw(prop);
} }
} }
// draw Destination : // draw Destination :
iii = m_windowsDestination; iii = m_windowsDestination;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->systemDraw(prop); m_subWidget[iii]->systemDraw(prop);
} }
@ -244,20 +244,20 @@ void widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
void widget::WSlider::onRegenerateDisplay(void) { void widget::WSlider::onRegenerateDisplay(void) {
if (m_windowsDestination == m_windowsSources) { if (m_windowsDestination == m_windowsSources) {
int32_t iii = m_windowsDestination; int32_t iii = m_windowsDestination;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->onRegenerateDisplay(); m_subWidget[iii]->onRegenerateDisplay();
} }
} }
} else { } else {
int32_t iii = m_windowsSources; int32_t iii = m_windowsSources;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->onRegenerateDisplay(); m_subWidget[iii]->onRegenerateDisplay();
} }
} }
iii = m_windowsDestination; iii = m_windowsDestination;
if (iii >= 0 || iii < m_subWidget.size()) { if (iii >= 0 || (size_t)iii < m_subWidget.size()) {
if (NULL != m_subWidget[iii]) { if (NULL != m_subWidget[iii]) {
m_subWidget[iii]->onRegenerateDisplay(); m_subWidget[iii]->onRegenerateDisplay();
} }
@ -306,7 +306,7 @@ ewol::Widget* widget::WSlider::getWidgetAtPos(const vec2& _pos) {
return NULL; return NULL;
} }
if (m_windowsDestination == m_windowsSources) { if (m_windowsDestination == m_windowsSources) {
if (m_windowsDestination<m_subWidget.size()) { if (m_windowsDestination < (int64_t)m_subWidget.size()) {
vec2 tmpSize = m_subWidget[m_windowsDestination]->getSize(); vec2 tmpSize = m_subWidget[m_windowsDestination]->getSize();
vec2 tmpOrigin = m_subWidget[m_windowsDestination]->getOrigin(); vec2 tmpOrigin = m_subWidget[m_windowsDestination]->getOrigin();
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())
@ -320,7 +320,7 @@ ewol::Widget* widget::WSlider::getWidgetAtPos(const vec2& _pos) {
} }
} }
} else { } else {
if (m_windowsDestination<m_subWidget.size()) { if (m_windowsDestination < (int64_t)m_subWidget.size()) {
vec2 tmpSize = m_subWidget[m_windowsDestination]->getSize(); vec2 tmpSize = m_subWidget[m_windowsDestination]->getSize();
vec2 tmpOrigin = m_subWidget[m_windowsDestination]->getOrigin(); vec2 tmpOrigin = m_subWidget[m_windowsDestination]->getOrigin();
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())
@ -333,7 +333,7 @@ ewol::Widget* widget::WSlider::getWidgetAtPos(const vec2& _pos) {
return NULL; return NULL;
} }
} }
if (m_windowsSources<m_subWidget.size()) { if (m_windowsSources < (int64_t)m_subWidget.size()) {
vec2 tmpSize = m_subWidget[m_windowsSources]->getSize(); vec2 tmpSize = m_subWidget[m_windowsSources]->getSize();
vec2 tmpOrigin = m_subWidget[m_windowsSources]->getOrigin(); vec2 tmpOrigin = m_subWidget[m_windowsSources]->getOrigin();
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())

2
sources/ewol/widget/Widget.cpp
View File

@ -625,7 +625,7 @@ void ewol::Widget::shortCutAdd(const char * _descriptiveString,
} }
void ewol::Widget::shortCutClean(void) { void ewol::Widget::shortCutClean(void) {
for (int32_t iii=0; iii<m_localShortcut.size(); iii++) { for (size_t iii=0; iii<m_localShortcut.size(); iii++) {
if (NULL != m_localShortcut[iii]) { if (NULL != m_localShortcut[iii]) {
delete(m_localShortcut[iii]); delete(m_localShortcut[iii]);
m_localShortcut[iii]=NULL; m_localShortcut[iii]=NULL;

1
sources/ewol/widget/Widget.h
View File

@ -719,6 +719,7 @@ namespace ewol {
float m_annimationratio; //!< Ratio of the annimation [0..1] float m_annimationratio; //!< Ratio of the annimation [0..1]
private: private:
std::vector<const char*> m_annimationList[2]; //!< List of all annimation type ADD std::vector<const char*> m_annimationList[2]; //!< List of all annimation type ADD
protected:
const char* m_annimationType[2]; //!< type of start annimation (default NULL ==> no annimation) const char* m_annimationType[2]; //!< type of start annimation (default NULL ==> no annimation)
float m_annimationTime[2]; //!< time to produce start annimation float m_annimationTime[2]; //!< time to produce start annimation
protected: protected:

4
sources/ewol/widget/WidgetManager.cpp
View File

@ -154,12 +154,12 @@ void ewol::WidgetManager::focusRemoveIfRemove(ewol::Widget* _newWidget) {
} }
void ewol::WidgetManager::periodicCallAdd(ewol::Widget* _pWidget) { void ewol::WidgetManager::periodicCallAdd(ewol::Widget* _pWidget) {
for (int32_t iii=0; iii < m_listOfPeriodicWidget.size(); iii++) { for (size_t iii=0; iii < m_listOfPeriodicWidget.size(); iii++) {
if (m_listOfPeriodicWidget[iii] == _pWidget) { if (m_listOfPeriodicWidget[iii] == _pWidget) {
return; return;
} }
} }
for (int32_t iii=0; iii < m_listOfPeriodicWidget.size(); iii++) { for (size_t iii=0; iii < m_listOfPeriodicWidget.size(); iii++) {
if (NULL == m_listOfPeriodicWidget[iii]) { if (NULL == m_listOfPeriodicWidget[iii]) {
m_listOfPeriodicWidget[iii] = _pWidget; m_listOfPeriodicWidget[iii] = _pWidget;
return; return;

8
sources/ewol/widget/Windows.cpp
View File

@ -37,7 +37,7 @@ ewol::Windows::~Windows(void) {
delete(m_subWidget); delete(m_subWidget);
m_subWidget=NULL; m_subWidget=NULL;
} }
for(int32_t iii=0; iii<m_popUpWidgetList.size(); iii++) { for (size_t iii=0; iii<m_popUpWidgetList.size(); iii++) {
if (NULL != m_popUpWidgetList[iii]) { if (NULL != m_popUpWidgetList[iii]) {
delete(m_popUpWidgetList[iii]); delete(m_popUpWidgetList[iii]);
m_popUpWidgetList[iii]=NULL; m_popUpWidgetList[iii]=NULL;
@ -55,7 +55,7 @@ void ewol::Windows::calculateSize(const vec2& _availlable) {
// TODO : Herited from MinSize .. and expand ??? // TODO : Herited from MinSize .. and expand ???
m_subWidget->calculateSize(m_size); m_subWidget->calculateSize(m_size);
} }
for(int32_t iii=0; iii<m_popUpWidgetList.size(); iii++) { for (size_t iii=0; iii<m_popUpWidgetList.size(); iii++) {
if (NULL != m_popUpWidgetList[iii]) { if (NULL != m_popUpWidgetList[iii]) {
m_popUpWidgetList[iii]->calculateMinMaxSize(); m_popUpWidgetList[iii]->calculateMinMaxSize();
m_popUpWidgetList[iii]->calculateSize(m_size); m_popUpWidgetList[iii]->calculateSize(m_size);
@ -117,7 +117,7 @@ void ewol::Windows::onRegenerateDisplay(void) {
if (NULL != m_subWidget) { if (NULL != m_subWidget) {
m_subWidget->onRegenerateDisplay(); m_subWidget->onRegenerateDisplay();
} }
for(int32_t iii=0; iii<m_popUpWidgetList.size(); iii++) { for (size_t iii=0; iii<m_popUpWidgetList.size(); iii++) {
if (NULL != m_popUpWidgetList[iii]) { if (NULL != m_popUpWidgetList[iii]) {
m_popUpWidgetList[iii]->onRegenerateDisplay(); m_popUpWidgetList[iii]->onRegenerateDisplay();
} }
@ -157,7 +157,7 @@ void ewol::Windows::systemDraw(const ewol::DrawProperty& _displayProp) {
int64_t ___startTime2 = ewol::getTime(); int64_t ___startTime2 = ewol::getTime();
#endif #endif
// second display the pop-up // second display the pop-up
for(int32_t iii=0; iii<m_popUpWidgetList.size(); iii++) { for (size_t iii=0; iii<m_popUpWidgetList.size(); iii++) {
if (NULL != m_popUpWidgetList[iii]) { if (NULL != m_popUpWidgetList[iii]) {
m_popUpWidgetList[iii]->systemDraw(_displayProp); m_popUpWidgetList[iii]->systemDraw(_displayProp);
//EWOL_DEBUG("Draw Pop-up"); //EWOL_DEBUG("Draw Pop-up");

14
sources/ewol/widget/meta/ParameterList.cpp
View File

@ -37,7 +37,7 @@ widget::ParameterList::ParameterList(void) {
widget::ParameterList::~ParameterList(void) { widget::ParameterList::~ParameterList(void) {
//clean all the object //clean all the object
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
delete(m_listOObject[iii]); delete(m_listOObject[iii]);
m_listOObject[iii] = NULL; m_listOObject[iii] = NULL;
} }
@ -60,7 +60,7 @@ void widget::ParameterList::addOObject(ewol::Compositing* _newObject, int32_t _p
EWOL_ERROR("Try to add an empty object in the Widget generic display system"); EWOL_ERROR("Try to add an empty object in the Widget generic display system");
return; return;
} }
if (_pos < 0 || _pos >= m_listOObject.size() ) { if (_pos < 0 || (size_t)_pos >= m_listOObject.size() ) {
m_listOObject.push_back(_newObject); m_listOObject.push_back(_newObject);
} else { } else {
m_listOObject.insert(m_listOObject.begin()+_pos, _newObject); m_listOObject.insert(m_listOObject.begin()+_pos, _newObject);
@ -68,7 +68,7 @@ void widget::ParameterList::addOObject(ewol::Compositing* _newObject, int32_t _p
} }
void widget::ParameterList::clearOObjectList(void) { void widget::ParameterList::clearOObjectList(void) {
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
delete(m_listOObject[iii]); delete(m_listOObject[iii]);
m_listOObject[iii] = NULL; m_listOObject[iii] = NULL;
} }
@ -76,7 +76,7 @@ void widget::ParameterList::clearOObjectList(void) {
} }
void widget::ParameterList::onDraw(void) { void widget::ParameterList::onDraw(void) {
for (int32_t iii=0; iii<m_listOObject.size(); iii++) { for (size_t iii=0; iii<m_listOObject.size(); iii++) {
if (NULL != m_listOObject[iii]) { if (NULL != m_listOObject[iii]) {
m_listOObject[iii]->draw(); m_listOObject[iii]->draw();
} }
@ -138,7 +138,7 @@ void widget::ParameterList::onRegenerateDisplay(void) {
// calculate the real position ... // calculate the real position ...
tmpOriginY = m_size.y() - (-m_originScrooled.y() + (startRaw+1)*(minHeight + 2*m_paddingSizeY)); tmpOriginY = m_size.y() - (-m_originScrooled.y() + (startRaw+1)*(minHeight + 2*m_paddingSizeY));
for(int32_t iii=startRaw; iii<nbRaw && iii<(startRaw+displayableRaw); iii++) { for (int32_t iii=startRaw; iii<nbRaw && iii<(int32_t)(startRaw+displayableRaw); iii++) {
std::string myTextToWrite = "???"; std::string myTextToWrite = "???";
etk::Color<> fg(0x000000FF); etk::Color<> fg(0x000000FF);
if (m_list[iii] != NULL) { if (m_list[iii] != NULL) {
@ -186,7 +186,7 @@ bool widget::ParameterList::onEventInput(const ewol::EventInput& _event) {
int32_t minHeight = 20; int32_t minHeight = 20;
int32_t rawID = (relativePos.y()+m_originScrooled.y()) / (minHeight + 2*m_paddingSizeY); int32_t rawID = (relativePos.y()+m_originScrooled.y()) / (minHeight + 2*m_paddingSizeY);
// generate an event on a rawId if the element request change and Select it ... // generate an event on a rawId if the element request change and Select it ...
if (rawID >= 0 && rawID<m_list.size()) { if (rawID >= 0 && (size_t)rawID < m_list.size()) {
if (m_list[rawID]!=NULL) { if (m_list[rawID]!=NULL) {
if (m_list[rawID]->m_refId >= 0) { if (m_list[rawID]->m_refId >= 0) {
generateEventId(ewolEventParameterListSelect, std::to_string(m_list[rawID]->m_refId)); generateEventId(ewolEventParameterListSelect, std::to_string(m_list[rawID]->m_refId));
@ -230,7 +230,7 @@ void widget::ParameterList::menuAddGroup(std::string& _label) {
void widget::ParameterList::menuClear(void) { void widget::ParameterList::menuClear(void) {
m_idSelected = -1; m_idSelected = -1;
for (int32_t iii=0; iii<m_list.size(); iii++) { for (size_t iii=0; iii<m_list.size(); iii++) {
if (NULL != m_list[iii]) { if (NULL != m_list[iii]) {
delete(m_list[iii]); delete(m_list[iii]);
m_list[iii] = NULL; m_list[iii] = NULL;

13
sources/lutin_ewol.py
View File

@ -10,6 +10,8 @@ def Create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = lutinModule.module(__file__, 'ewol', 'LIBRARY') myModule = lutinModule.module(__file__, 'ewol', 'LIBRARY')
# add extra compilation flags :
#myModule.add_extra_compile_flags()
# add the file to compile: # add the file to compile:
myModule.AddSrcFile([ myModule.AddSrcFile([
'ewol/ewol.cpp', 'ewol/ewol.cpp',
@ -135,19 +137,8 @@ def Create(target):
# name of the dependency # name of the dependency
myModule.AddModuleDepend(['etk', 'freetype', 'exml', 'ejson', 'egami', 'date']) myModule.AddModuleDepend(['etk', 'freetype', 'exml', 'ejson', 'egami', 'date'])
#ifeq ("$(CONFIG_BUILD_LUA)","y")
#myModule.AddModuleDepend('lua')
#endif
#ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
#myModule.AddModuleDepend('portaudio')
#endif
myModule.AddExportPath(lutinTools.GetCurrentPath(__file__)) myModule.AddExportPath(lutinTools.GetCurrentPath(__file__))
myModule.CompileFlags_CC([
'-Wno-write-strings',
'-Wall'])
if target.name=="Linux": if target.name=="Linux":
myModule.AddExportflag_LD('-lGL') myModule.AddExportflag_LD('-lGL')