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

[DEV] update stl

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-19 21:15:32 +01:00
parent 1d10f95332
commit 803ae2fc3b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ege/ElementGame.cpp
View File

@ -443,7 +443,7 @@ void ege::ElementGame::drawDebug(ewol::Colored3DObject* _draw, const ege::Camera
m_debugText.setPos(vec3(-20,32,0)); m_debugText.setPos(vec3(-20,32,0));
m_debugText.print(getType()); m_debugText.print(getType());
m_debugText.setPos(vec3(-20,20,0)); m_debugText.setPos(vec3(-20,20,0));
m_debugText.print(std::string("life=(")+std::string(getLifeRatio())); m_debugText.print("life=("+std::to_string(getLifeRatio()));
//m_debugText.print(std::string("Axe=(")+std::string(m_tmpAxe.x())+std::string(",")+etk::UString(m_tmpAxe.y())+etk::UString(",")+etk::UString(m_tmpAxe.z())+etk::UString(")")); //m_debugText.print(std::string("Axe=(")+std::string(m_tmpAxe.x())+std::string(",")+etk::UString(m_tmpAxe.y())+etk::UString(",")+etk::UString(m_tmpAxe.z())+etk::UString(")"));
btScalar mmm[16]; btScalar mmm[16];
btDefaultMotionState* myMotionState = (btDefaultMotionState*)m_body->getMotionState(); btDefaultMotionState* myMotionState = (btDefaultMotionState*)m_body->getMotionState();

4
ege/Environement.cpp
View File

@ -99,7 +99,7 @@ void ege::Environement::getElementNearestFixed(const vec3& _sourcePosition,
int32_t jjj; int32_t jjj;
for (jjj=0; jjj<_resultList.size(); jjj++) { for (jjj=0; jjj<_resultList.size(); jjj++) {
if (_resultList[jjj].dist>result.dist) { if (_resultList[jjj].dist>result.dist) {
_resultList.insert(jjj, result); _resultList.insert(_resultList.begin()+jjj, result);
break; break;
} }
} }
@ -241,7 +241,7 @@ void ege::Environement::getOrderedElementForDisplay(std::vector<ege::Environemen
int32_t jjj; int32_t jjj;
for (jjj=0; jjj<_resultList.size(); jjj++) { for (jjj=0; jjj<_resultList.size(); jjj++) {
if (_resultList[jjj].dist>result.dist) { if (_resultList[jjj].dist>result.dist) {
_resultList.insert(jjj, result); _resultList.insert(_resultList.begin()+jjj, result);
break; break;
} }
} }

4
ege/Scene.cpp
View File

@ -251,7 +251,7 @@ void ege::Scene::periodicCall(const ewol::EventTime& _event) {
int32_t lastGameTime = m_gameTime; int32_t lastGameTime = m_gameTime;
m_gameTime += curentDelta; m_gameTime += curentDelta;
if (lastGameTime != (int32_t)m_gameTime) { if (lastGameTime != (int32_t)m_gameTime) {
generateEventId(eventPlayTimeChange, m_gameTime); generateEventId(eventPlayTimeChange, std::to_string(m_gameTime));
} }
//EWOL_DEBUG("Time: m_lastCallTime=" << m_lastCallTime << " deltaTime=" << deltaTime); //EWOL_DEBUG("Time: m_lastCallTime=" << m_lastCallTime << " deltaTime=" << deltaTime);
@ -287,7 +287,7 @@ void ege::Scene::periodicCall(const ewol::EventTime& _event) {
} }
if (0 != numberEnnemyKilled) { if (0 != numberEnnemyKilled) {
generateEventId(eventKillEnemy, numberEnnemyKilled); generateEventId(eventKillEnemy, std::to_string(numberEnnemyKilled));
} }
} }
markToRedraw(); markToRedraw();