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

[DEV] remove etk_min and etk_max

Browse Source
This commit is contained in:
Edouard DUPIN 2014-07-03 21:03:26 +02:00
parent 45fb9f5ffe
commit 0eeae19eaa
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev.boo Normal file
View File

@ -0,0 +1,8 @@
Basic Todo :
- gestion de 2 soleil (ombre)
- bonne gestion des texture (autre que RGBA tout le temps)
- optimisation des affichages
- un fichier claire de modèle 3d ...

8
ege/Camera.cpp
View File

@ -113,12 +113,12 @@ void ege::Camera::setAngleZ(float _angleZ) {
}
void ege::Camera::setAngleTeta(float _angleTeta) {
m_angleTeta = etk_avg(M_PI/10.0f, _angleTeta, M_PI/2.0f);
m_angleTeta = std::avg(M_PI/10.0f, _angleTeta, M_PI/2.0f);
update();
}
void ege::Camera::setDistance(float _distance) {
m_distance = etk_avg(5, _distance, 150);
m_distance = std::avg(5, _distance, 150);
update();
}
@ -129,13 +129,13 @@ void ege::Camera::periodicCall(float _step) {
if (true == m_forceViewTop) {
if (0.0f != m_offsetFactor) {
m_offsetFactor -= _step*localFactor;
m_offsetFactor = etk_avg(0,m_offsetFactor,1);
m_offsetFactor = std::avg(0,m_offsetFactor,1);
update();
}
} else {
if (1.0f != m_offsetFactor) {
m_offsetFactor += _step*localFactor;
m_offsetFactor = etk_avg(0,m_offsetFactor,1);
m_offsetFactor = std::avg(0,m_offsetFactor,1);
update();
}
}

2
ege/ElementGame.cpp
View File

@ -139,7 +139,7 @@ float ege::ElementGame::getLifeRatio() {
void ege::ElementGame::setFireOn(int32_t _groupIdSource, int32_t _type, float _power, const vec3& _center) {
float previousLife = m_life;
m_life += _power;
m_life = etk_avg(0, m_life, m_lifeMax);
m_life = std::avg(0, m_life, m_lifeMax);
if (m_life <= 0) {
EGE_DEBUG("[" << getUID() << "] element is killed ..." << getType());
}