sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings 

Former-commit-id: d4bdb639c3f2e5ebb8d1d3caa020b75ca0821736
This commit is contained in:
Lynix 2013-04-12 15:12:27 +02:00
parent 143707bc2e
commit dd01e0bfdd
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Nazara/Noise/HybridMultiFractal3D.cpp
View File

@ -40,8 +40,8 @@ float NzHybridMultiFractal3D::GetValue(float x, float y, float z, float resoluti
for(int i(1) ; i < m_octaves; ++i) for(int i(1) ; i < m_octaves; ++i)
{ {
if(m_weight > 1.0) if (m_weight > 1.f)
m_weight = 1.0; m_weight = 1.f;
m_signal = (m_source->GetValue(x,y,z,resolution) + m_offset) * m_exponent_array[i]; m_signal = (m_source->GetValue(x,y,z,resolution) + m_offset) * m_exponent_array[i];
m_value += m_weight * m_signal; m_value += m_weight * m_signal;
@ -51,9 +51,8 @@ float NzHybridMultiFractal3D::GetValue(float x, float y, float z, float resoluti
resolution *= m_lacunarity; resolution *= m_lacunarity;
} }
m_remainder = m_octaves - static_cast<int>(m_octaves); m_remainder = std::floor(m_octaves);
if (m_remainder > 0.f)
if (m_remainder != 0)
m_value += m_remainder * m_source->GetValue(x,y,z,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)]; m_value += m_remainder * m_source->GetValue(x,y,z,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)];
return m_value/this->m_sum - m_offset; return m_value/this->m_sum - m_offset;

9
src/Nazara/Noise/HybridMultiFractal4D.cpp
View File

@ -40,8 +40,8 @@ float NzHybridMultiFractal4D::GetValue(float x, float y, float z, float w, float
for(int i(1) ; i < m_octaves; ++i) for(int i(1) ; i < m_octaves; ++i)
{ {
if(m_weight > 1.0) if (m_weight > 1.f)
m_weight = 1.0; m_weight = 1.f;
m_signal = (m_source->GetValue(x,y,z,w,resolution) + m_offset) * m_exponent_array[i]; m_signal = (m_source->GetValue(x,y,z,w,resolution) + m_offset) * m_exponent_array[i];
m_value += m_weight * m_signal; m_value += m_weight * m_signal;
@ -51,9 +51,8 @@ float NzHybridMultiFractal4D::GetValue(float x, float y, float z, float w, float
resolution *= m_lacunarity; resolution *= m_lacunarity;
} }
m_remainder = m_octaves - static_cast<int>(m_octaves); m_remainder = std::floor(m_octaves);
if (m_remainder > 0.f)
if (m_remainder != 0)
m_value += m_remainder * m_source->GetValue(x,y,z,w,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)]; m_value += m_remainder * m_source->GetValue(x,y,z,w,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)];
return m_value/this->m_sum - m_offset; return m_value/this->m_sum - m_offset;

9
src/Nazara/Noise/HybridMultifractal2D.cpp
View File

@ -40,8 +40,8 @@ float NzHybridMultiFractal2D::GetValue(float x, float y, float resolution)
for(int i(1) ; i < m_octaves; ++i) for(int i(1) ; i < m_octaves; ++i)
{ {
if(m_weight > 1.0) if (m_weight > 1.f)
m_weight = 1.0; m_weight = 1.f;
m_signal = (m_source->GetValue(x,y,resolution) + m_offset) * m_exponent_array[i]; m_signal = (m_source->GetValue(x,y,resolution) + m_offset) * m_exponent_array[i];
m_value += m_weight * m_signal; m_value += m_weight * m_signal;
@ -51,9 +51,8 @@ float NzHybridMultiFractal2D::GetValue(float x, float y, float resolution)
resolution *= m_lacunarity; resolution *= m_lacunarity;
} }
m_remainder = m_octaves - static_cast<int>(m_octaves); m_remainder = std::floor(m_octaves);
if (m_remainder > 0.f)
if (m_remainder != 0)
m_value += m_remainder * m_source->GetValue(x,y,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)]; m_value += m_remainder * m_source->GetValue(x,y,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)];
return m_value/this->m_sum - m_offset; return m_value/this->m_sum - m_offset;