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

Added FBM 3D & 4D and HybridMultiFractal 2D + cleaned code

Browse Source 
this commit will change the scale of values produced by fbm2d. This will
probably not happen again. As a consequence, fbm values will always be
constrained between -1 and 1, but do not perfectly stick to that scale.
There is no easy solution, if the user wants the best dynamic between -1
and 1, he should adjust manually the value by multiplying by a gain slightly superior to 1.


Former-commit-id: ebdba9e9f4bbb972abe355c07ec9f8bce42329b9
This commit is contained in:
Remi Beges
2012-11-09 18:38:50 +01:00
parent 7bd6202389
commit 8f04f3e6a0
10 changed files with 270 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Nazara/Noise/FBM2D.cpp
View File

@@ -32,31 +32,20 @@ float NzFBM2D::GetValue(float x, float y, float resolution)
m_value = 0.0;
for (int i(0); i < this->m_octaves; ++i)
for (int i(0); i < m_octaves; ++i)
{
m_value += m_source->GetValue(x,y,resolution) * this->exponent_array[i];
resolution *= this->m_lacunarity;
m_value += m_source->GetValue(x,y,resolution) * m_exponent_array[i];
resolution *= m_lacunarity;
}
//cout<<m_value<<endl;//"|"<<this->m_sum<<endl;
//m_remainder = this->m_octaves - static_cast<int>(this->m_octaves);
m_remainder = m_octaves - static_cast<int>(m_octaves);
//if(!NzNumberEquals(remainder, static_cast<float>(0.0)))
// m_value += remainder * Get2DSimplexNoiseValue(x,y,resolution) * exponent_array[(int)m_octaves-1];
if(!NzNumberEquals(m_remainder, static_cast<float>(0.0)))
m_value += m_remainder * m_source->GetValue(x,y,resolution) * m_exponent_array[static_cast<int>(m_octaves-1)];
//0.65 is an experimental value to make the noise stick closer to [-1 , 1]
return m_value / (this->m_sum * 0.65);
return m_value/this->m_sum;
}
NzFBM2D::~NzFBM2D()
{
switch(m_noiseType)
{
case PERLIN:
delete dynamic_cast<NzPerlin2D*>(m_source);
break;
default:
delete dynamic_cast<NzSimplex2D*>(m_source);
break;
}
delete m_source;
}