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

5
include/Nazara/Math/Algorithm.hpp
View File

@@ -1,3 +1,4 @@
// Copyright (C) 2015 Jérôme Leclercq
// This file is part of the "Nazara Engine - Mathematics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@@ -28,6 +29,10 @@
#define M_SQRT3 1.7320508075688772935274463
#endif
#ifndef M_SQRT5
#define M_SQRT5 2.23606797749979
#endif
namespace Nz
{
template<typename T> /*constexpr*/ T Approach(T value, T objective, T increment);

4
include/Nazara/Noise/FBM.hpp
View File

@@ -18,7 +18,9 @@ namespace Nz
FBM(const FBM&) = delete;
~FBM() = default;
float Get(std::initializer_list<float> coordinates, float scale) const;
float Get(float x, float y, float scale) const override;
float Get(float x, float y, float z, float scale) const override;
float Get(float x, float y, float z, float w, float scale) const override;
FBM& operator=(const FBM&) = delete;

4
include/Nazara/Noise/HybridMultiFractal.hpp
View File

@@ -17,7 +17,9 @@ namespace Nz
HybridMultiFractal(const HybridMultiFractal&) = delete;
~HybridMultiFractal() = default;
float Get(std::initializer_list<float> coordinates, float scale) const;
float Get(float x, float y, float scale) const override;
float Get(float x, float y, float z, float scale) const override;
float Get(float x, float y, float z, float w, float scale) const override;
HybridMultiFractal& operator=(const HybridMultiFractal&) = delete;

4
include/Nazara/Noise/MixerBase.hpp
View File

@@ -17,6 +17,10 @@ namespace Nz
MixerBase();
~MixerBase() = default;
virtual float Get(float x, float y, float scale) const = 0;
virtual float Get(float x, float y, float z, float scale) const = 0;
virtual float Get(float x, float y, float z, float w, float scale) const = 0;
float GetHurstParameter() const;
float GetLacunarity() const;
float GetOctaveNumber() const;

17
include/Nazara/Noise/NoiseBase.hpp
View File

@@ -6,7 +6,11 @@
#define NAZARA_NOISEBASE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Math/Vector4.hpp>
#include <Nazara/Noise/Config.hpp>
#include <array>
#include <random>
namespace Nz
@@ -17,21 +21,26 @@ namespace Nz
NoiseBase(unsigned int seed = 0);
~NoiseBase() = default;
virtual float Get(std::initializer_list<float> coordinates, float scale) const = 0;
virtual float Get(float x, float y, float scale) const = 0;
virtual float Get(float x, float y, float z, float scale) const = 0;
virtual float Get(float x, float y, float z, float w, float scale) const = 0;
float GetScale();
void SetScale(float scale);
void SetSeed(unsigned int seed);
void Shuffle();
void Shuffle(unsigned int amount);
protected:
unsigned int perm[512];
std::array<std::size_t, 3 * 256> m_permutations;
float m_scale;
static std::array<Vector2f, 2 * 2 * 2> s_gradients2;
static std::array<Vector3f, 2 * 2 * 2 * 2> s_gradients3;
static std::array<Vector4f, 2 * 2 * 2 * 2 * 2> s_gradients4;
private:
std::default_random_engine generator;
std::default_random_engine m_randomEngine;
};
}

20
include/Nazara/Noise/Perlin.hpp
View File

@@ -15,21 +15,13 @@ namespace Nz
class NAZARA_NOISE_API Perlin : public NoiseBase
{
public:
Perlin();
Perlin(unsigned int seed);
~Perlin() = default;
Perlin() = default;
Perlin(unsigned int seed);
~Perlin() = default;
float Get(std::initializer_list<float> coordinates, float scale) const;
protected:
float _2D(std::initializer_list<float> coordinates, float scale) const;
float _3D(std::initializer_list<float> coordinates, float scale) const;
float _4D(std::initializer_list<float> coordinates, float scale) const;
private:
const float gradient2[8][2];
const float gradient3[16][3];
const float gradient4[32][4];
float Get(float x, float y, float scale) const override;
float Get(float x, float y, float z, float scale) const override;
float Get(float x, float y, float z, float w, float scale) const override;
};
}

27
include/Nazara/Noise/Simplex.hpp
View File

@@ -15,28 +15,13 @@ namespace Nz
class NAZARA_NOISE_API Simplex : public NoiseBase
{
public:
Simplex();
Simplex(unsigned int seed);
~Simplex() = default;
Simplex() = default;
Simplex(unsigned int seed);
~Simplex() = default;
float Get(std::initializer_list<float> coordinates, float scale) const;
protected:
float _2D(std::initializer_list<float> coordinates, float scale) const;
float _3D(std::initializer_list<float> coordinates, float scale) const;
float _4D(std::initializer_list<float> coordinates, float scale) const;
private:
const float gradient2[8][2];
const float gradient3[16][3];
const float gradient4[32][4];
const float UnskewCoeff2D;
const float SkewCoeff2D;
const float UnskewCoeff3D;
const float SkewCoeff3D;
const float UnskewCoeff4D;
const float SkewCoeff4D;
const int lookupTable4D[64][4];
float Get(float x, float y, float scale) const override;
float Get(float x, float y, float z, float scale) const override;
float Get(float x, float y, float z, float w, float scale) const override;
};
}

23
include/Nazara/Noise/Worley.hpp
View File

@@ -18,23 +18,20 @@ namespace Nz
class NAZARA_NOISE_API Worley : public NoiseBase
{
public:
Worley();
Worley(unsigned int seed);
~Worley() = default;
Worley();
Worley(unsigned int seed);
~Worley() = default;
void Set(WorleyFunction func);
float Get(float x, float y, float scale) const override;
float Get(float x, float y, float z, float scale) const override;
float Get(float x, float y, float z, float w, float scale) const override;
float Get(std::initializer_list<float> coordinates, float scale) const;
protected:
float _2D(std::initializer_list<float> coordinates, float scale) const;
float _3D(std::initializer_list<float> coordinates, float scale) const;
float _4D(std::initializer_list<float> coordinates, float scale) const;
void _SquareTest(int xi, int yi, float x, float y, std::map<float, Vector2f> & featurePoints) const;
void Set(WorleyFunction func);
private:
const float scales[4];
WorleyFunction function;
void SquareTest(int xi, int yi, float x, float y, std::map<float, Vector2f> & featurePoints) const;
WorleyFunction m_function;
};
}