Added HybridMultiF 3D & 4D

*new constructors for simple noises
*minor bufixes


Former-commit-id: 2f1e9b6b54087e79b3ac52fefc9bbd67fd45c0eb

include/Nazara/Noise/HybridMultiFractal3D.hpp

@@ -0,0 +1,32 @@
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine".
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef HYBRIDMULTIFRACTAL3D_HPP
+#define HYBRIDMULTIFRACTAL3D_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Noise/ComplexNoiseBase.hpp>
+#include <Nazara/Noise/Abstract3DNoise.hpp>
+
+class NAZARA_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase
+{
+    public:
+        NzHybridMultiFractal3D(nzNoises source, int seed);
+        float GetValue(float x, float y, float z, float resolution);
+        ~NzHybridMultiFractal3D();
+    protected:
+    private:
+        NzAbstract3DNoise* m_source;
+        float m_value;
+        float m_remainder;
+        float m_offset;
+        float m_weight;
+        float m_signal;
+        nzNoises m_noiseType;
+};
+
+#endif // HYBRIDMULTIFRACTAL3D_HPP
+

include/Nazara/Noise/HybridMultiFractal4D.hpp

@@ -0,0 +1,32 @@
+// Copyright (C) 2012 Rémi Bèges
+// This file is part of the "Nazara Engine".
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef HYBRIDMULTIFRACTAL4D_HPP
+#define HYBRIDMULTIFRACTAL4D_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Noise/ComplexNoiseBase.hpp>
+#include <Nazara/Noise/Abstract4DNoise.hpp>
+
+class NAZARA_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase
+{
+    public:
+        NzHybridMultiFractal4D(nzNoises source, int seed);
+        float GetValue(float x, float y, float z, float w, float resolution);
+        ~NzHybridMultiFractal4D();
+    protected:
+    private:
+        NzAbstract4DNoise* m_source;
+        float m_value;
+        float m_remainder;
+        float m_offset;
+        float m_weight;
+        float m_signal;
+        nzNoises m_noiseType;
+};
+
+#endif // HYBRIDMULTIFRACTAL4D_HPP
+

include/Nazara/Noise/HybridMultifractal2D.hpp

@@ -22,6 +22,9 @@ class NAZARA_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzCom
         NzAbstract2DNoise* m_source;
         float m_value;
         float m_remainder;
+        float m_offset;
+        float m_weight;
+        float m_signal;
         nzNoises m_noiseType;
 };
 

include/Nazara/Noise/Perlin2D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzPerlin2D : public NzAbstract2DNoise
 {
     public:
         NzPerlin2D();
+        NzPerlin2D(int seed);
         float GetValue(float x, float y, float resolution);
         ~NzPerlin2D() = default;
     protected:

include/Nazara/Noise/Perlin3D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzPerlin3D : public NzAbstract3DNoise
 {
     public:
         NzPerlin3D();
+        NzPerlin3D(int seed);
         float GetValue(float x, float y, float z, float resolution);
         ~NzPerlin3D() = default;
     protected:

include/Nazara/Noise/Perlin4D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzPerlin4D : public NzAbstract4DNoise
 {
     public:
         NzPerlin4D();
+        NzPerlin4D(int seed);
         float GetValue(float x, float y, float z, float w, float resolution);
         ~NzPerlin4D() = default;
     protected:

include/Nazara/Noise/Simplex2D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzSimplex2D : public NzAbstract2DNoise
 {
     public:
         NzSimplex2D();
+        NzSimplex2D(int seed);
         float GetValue(float x, float y, float resolution);
         virtual ~NzSimplex2D() = default;
     protected:

include/Nazara/Noise/Simplex3D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzSimplex3D : public NzAbstract3DNoise
 {
     public:
         NzSimplex3D();
+        NzSimplex3D(int seed);
         float GetValue(float x, float y, float z, float resolution);
         ~NzSimplex3D() = default;
     protected:

include/Nazara/Noise/Simplex4D.hpp

@@ -16,6 +16,7 @@ class NAZARA_API NzSimplex4D : public NzAbstract4DNoise
 {
     public:
         NzSimplex4D();
+        NzSimplex4D(int seed);
         float GetValue(float x, float y, float z, float w, float resolution);
         ~NzSimplex4D() = default;
     protected: