Switch from Nz prefix to namespace Nz

What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
This commit is contained in:
Lynix
2015-09-25 19:20:05 +02:00
parent c214251ecf
commit df8da275c4
609 changed files with 68265 additions and 66534 deletions

View File

@@ -8,73 +8,76 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Debug.hpp>
NzComplexNoiseBase::NzComplexNoiseBase()
namespace Nz
{
m_parametersModified = true;
m_lacunarity = 5.0f;
m_hurst = 1.2f;
m_octaves = 3.0f;
for (int i(0) ; i < m_octaves; ++i)
ComplexNoiseBase::ComplexNoiseBase()
{
m_exponent_array[i] = 0;
}
}
m_parametersModified = true;
m_lacunarity = 5.0f;
m_hurst = 1.2f;
m_octaves = 3.0f;
float NzComplexNoiseBase::GetLacunarity() const
{
return m_lacunarity;
}
float NzComplexNoiseBase::GetHurstParameter() const
{
return m_hurst;
}
float NzComplexNoiseBase::GetOctaveNumber() const
{
return m_octaves;
}
void NzComplexNoiseBase::SetLacunarity(float lacunarity)
{
m_lacunarity = lacunarity;
m_parametersModified = true;
}
void NzComplexNoiseBase::SetHurstParameter(float h)
{
m_hurst = h;
m_parametersModified = true;
}
void NzComplexNoiseBase::SetOctavesNumber(float octaves)
{
if(octaves <= 30.0f)
m_octaves = octaves;
else
m_octaves = 30.0f;
m_parametersModified = true;
}
void NzComplexNoiseBase::RecomputeExponentArray()
{
if(m_parametersModified)
{
float frequency = 1.0;
m_sum = 0.f;
for (int i(0) ; i < static_cast<int>(m_octaves) ; ++i)
for (int i(0) ; i < m_octaves; ++i)
{
m_exponent_array[i] = std::pow( frequency, -m_hurst );
frequency *= m_lacunarity;
m_sum += m_exponent_array[i];
m_exponent_array[i] = 0;
}
}
float ComplexNoiseBase::GetLacunarity() const
{
return m_lacunarity;
}
float ComplexNoiseBase::GetHurstParameter() const
{
return m_hurst;
}
float ComplexNoiseBase::GetOctaveNumber() const
{
return m_octaves;
}
void ComplexNoiseBase::SetLacunarity(float lacunarity)
{
m_lacunarity = lacunarity;
m_parametersModified = true;
}
void ComplexNoiseBase::SetHurstParameter(float h)
{
m_hurst = h;
m_parametersModified = true;
}
void ComplexNoiseBase::SetOctavesNumber(float octaves)
{
if(octaves <= 30.0f)
m_octaves = octaves;
else
m_octaves = 30.0f;
m_parametersModified = true;
}
void ComplexNoiseBase::RecomputeExponentArray()
{
if(m_parametersModified)
{
float frequency = 1.0;
m_sum = 0.f;
for (int i(0) ; i < static_cast<int>(m_octaves) ; ++i)
{
m_exponent_array[i] = std::pow( frequency, -m_hurst );
frequency *= m_lacunarity;
m_sum += m_exponent_array[i];
}
m_parametersModified = false;
}
m_parametersModified = false;
}
}