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

Noise: First pass of refactoring

Browse Source 
Former-commit-id: 77de49ee01fea466cb97b22771e4c625389fd95c [formerly edce9427bc009c8ea6a6df35d9ce134a83ab985c]
Former-commit-id: 76227519c8be75a45f6f65250a0870c2eb866953
This commit is contained in:
Jérôme Leclercq
2016-06-18 12:36:20 +02:00
parent 81245a9c43
commit 5970682035
14 changed files with 485 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Nazara/Noise/FBM.cpp
View File

@@ -11,20 +11,51 @@ namespace Nz
{
}
float FBM::Get(std::initializer_list<float> coordinates, float scale) const
///TODO: Handle with variadic templates
float FBM::Get(float x, float y, float scale) const
{
float value = 0.0;
for(int i(0); i < m_octaves; ++i)
float value = 0.f;
for(int i = 0; i < m_octaves; ++i)
{
value += m_source.Get(coordinates,scale) * m_exponent_array.at(i);
value += m_source.Get(x, y, scale) * m_exponent_array.at(i);
scale *= m_lacunarity;
}
float remainder = m_octaves - static_cast<int>(m_octaves);
if(std::fabs(remainder) > 0.01f)
value += remainder * m_source.Get(coordinates,scale) * m_exponent_array.at(static_cast<int>(m_octaves-1));
value += remainder * m_source.Get(x, y, scale) * m_exponent_array.at(static_cast<int>(m_octaves-1));
return value / m_sum;
}
float FBM::Get(float x, float y, float z, float scale) const
{
float value = 0.f;
for(int i = 0; i < m_octaves; ++i)
{
value += m_source.Get(x, y, z, scale) * m_exponent_array.at(i);
scale *= m_lacunarity;
}
float remainder = m_octaves - static_cast<int>(m_octaves);
if(std::fabs(remainder) > 0.01f)
value += remainder * m_source.Get(x, y, z, scale) * m_exponent_array.at(static_cast<int>(m_octaves-1));
return value / m_sum;
}
float FBM::Get(float x, float y, float z, float w, float scale) const
{
float value = 0.f;
for(int i = 0; i < m_octaves; ++i)
{
value += m_source.Get(x, y, z, w, scale) * m_exponent_array.at(i);
scale *= m_lacunarity;
}
float remainder = m_octaves - static_cast<int>(m_octaves);
if(std::fabs(remainder) > 0.01f)
value += remainder * m_source.Get(x, y, z, w, scale) * m_exponent_array.at(static_cast<int>(m_octaves-1));
return value / m_sum;
}