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

fixed typo

This commit is contained in:
Remi Beges 2012-06-09 17:07:01 +02:00
parent ebba6adae4
commit 879a33878e
20 changed files with 74 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/scripts/module/noise.lua
View File

@ -2,16 +2,16 @@ project "NazaraNoise"
files
{
"../include/Nazara/Noise/**.hpp",
"../include/Nazara/Noise/**.inl",
"../src/Nazara/Noise/**.hpp",
"../src/Nazara/Noise/**.cpp"
"../include/Nazara/Noise/**.hpp",
"../include/Nazara/Noise/**.inl",
"../src/Nazara/Noise/**.hpp",
"../src/Nazara/Noise/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/ModuleName/Posix/*.hpp", "../src/Nazara/ModuleName/Posix/*.cpp" }
excludes { "../src/Nazara/Noise/Posix/*.hpp", "../src/Nazara/Noise/Posix/*.cpp" }
else
excludes { "../src/Nazara/ModuleName/Win32/*.hpp", "../src/Nazara/ModuleName/Win32/*.cpp" }
excludes { "../src/Nazara/Noise/Win32/*.hpp", "../src/Nazara/Noise/Win32/*.cpp" }
end
configuration "DebugStatic"

5
include/Nazara/Noise/ComplexNoiseBase.hpp
View File

@ -8,10 +8,9 @@
#define COMPLEXNOISEBASE_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
class NzComplexNoiseBase : public NzNoiseBase
class NAZARA_API NzComplexNoiseBase : public NzNoiseBase
{
public:
NzComplexNoiseBase();

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

@ -9,7 +9,7 @@
#include <Nazara/Prerequesites.hpp>
class NzNoiseBase
class NAZARA_API NzNoiseBase
{
public:
NzNoiseBase(int seed = 0);

5
include/Nazara/Noise/NoiseMachine.hpp
View File

@ -8,8 +8,7 @@
#define NOISEMACHINE_HPP
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include "ComplexNoiseBase.hpp"
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Math/Vector4.hpp>
@ -17,7 +16,7 @@
//TODO : AMELIORER MELANGE TABLE PERMUTATION
// PB MULTIPLES APPELS SHUFFLEPERMUTATIONTABLE()
class NzNoiseMachine : public NzComplexNoiseBase
class NAZARA_API NzNoiseMachine : public NzComplexNoiseBase
{
public:
NzNoiseMachine(int seed = 0);

8
include/Nazara/Noise/Perlin2D.hpp
View File

@ -8,11 +8,10 @@
#define PERLIN2D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector2.hpp>
template <typename T> class NzPerlin2D : public NzNoiseBase
template <typename T> class NAZARA_API NzPerlin2D : public NzNoiseBase
{
public:
NzPerlin2D();
@ -33,8 +32,7 @@ template <typename T> class NzPerlin2D : public NzNoiseBase
typedef NzPerlin2D<float> NzPerlin2Df;
typedef NzPerlin2D<double> NzPerlin2Dd;
//#include <Nazara/Noise/Perlin2D.inl>
#include "Perlin2D.inl"
#include <Nazara/Noise/Perlin2D.inl>
#endif // PERLIN2D_H

7
include/Nazara/Noise/Perlin2D.inl
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzPerlin2D<T>::NzPerlin2D()
@ -57,3 +57,4 @@ T NzPerlin2D<T>::GetValue(T x, T y, T res)
return Li1 + Cy*(Li2-Li1);
}
#include <Nazara/Core/DebugOff.hpp>

8
include/Nazara/Noise/Perlin3D.hpp
View File

@ -8,11 +8,10 @@
#define PERLIN3D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector3.hpp>
template <typename T> class NzPerlin3D : public NzNoiseBase
template <typename T> class NAZARA_API NzPerlin3D : public NzNoiseBase
{
public:
NzPerlin3D();
@ -36,7 +35,6 @@ template <typename T> class NzPerlin3D : public NzNoiseBase
typedef NzPerlin3D<float> NzPerlin3Df;
typedef NzPerlin3D<double> NzPerlin3Dd;
//#include <Nazara/Noise/Perlin3D.inl>
#include "Perlin3D.inl"
#include <Nazara/Noise/Perlin3D.inl>
#endif // PERLIN3D_H

8
include/Nazara/Noise/Perlin3D.inl
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzPerlin3D<T>::NzPerlin3D()
@ -88,3 +88,5 @@ T NzPerlin3D<T>::GetValue(T x, T y, T z, T res)
return Li5 + Cz*(Li6-Li5);
}
#include <Nazara/Core/DebugOff.hpp>

8
include/Nazara/Noise/Perlin4D.hpp
View File

@ -8,11 +8,10 @@
#define PERLIN4D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector4.hpp>
template <typename T> class NzPerlin4D : public NzNoiseBase
template <typename T> class NAZARA_API NzPerlin4D : public NzNoiseBase
{
public:
NzPerlin4D();
@ -36,7 +35,6 @@ template <typename T> class NzPerlin4D : public NzNoiseBase
typedef NzPerlin4D<float> NzPerlin4Df;
typedef NzPerlin4D<double> NzPerlin4Dd;
//#include <Nazara/Noise/Perlin4D.inl>
#include "Perlin4D.inl"
#include <Nazara/Noise/Perlin4D.inl>
#endif // PERLIN4D_H

8
include/Nazara/Noise/Perlin4D.inl
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzPerlin4D<T>::NzPerlin4D()
@ -146,3 +146,5 @@ T NzPerlin4D<T>::GetValue(T x, T y, T z, T w, T res)
return Li13 + Cw*(Li14-Li13);
}
#include <Nazara/Core/DebugOff.hpp>

9
include/Nazara/Noise/Simplex2D.hpp
View File

@ -8,12 +8,10 @@
#define SIMPLEX2D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector2.hpp>
template <typename T> class NzSimplex2D : public NzNoiseBase
template <typename T> class NAZARA_API NzSimplex2D : public NzNoiseBase
{
public:
NzSimplex2D();
@ -39,8 +37,7 @@ template <typename T> class NzSimplex2D : public NzNoiseBase
typedef NzSimplex2D<float> NzSimplex2Df;
typedef NzSimplex2D<double> NzSimplex2Dd;
//#include <Nazara/Noise/Simplex2D.inl>
#include "Simplex2D.inl"
#include <Nazara/Noise/Simplex2D.inl>
#endif // SIMPLEX2D_H

7
include/Nazara/Noise/Simplex2D.inl
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzSimplex2D<T>::NzSimplex2D()
@ -85,3 +85,4 @@ T NzSimplex2D<T>::GetValue(T x, T y, T res)
return (n1+n2+n3)*70;
}
#include <Nazara/Core/DebugOff.hpp>

11
include/Nazara/Noise/Simplex3D.hpp
View File

@ -8,12 +8,10 @@
#define SIMPLEX3D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector3.hpp>
template <typename T> class NzSimplex3D : public NzNoiseBase
template <typename T> class NAZARA_API NzSimplex3D : public NzNoiseBase
{
public:
NzSimplex3D();
@ -39,8 +37,7 @@ template <typename T> class NzSimplex3D : public NzNoiseBase
typedef NzSimplex3D<float> NzSimplex3Df;
typedef NzSimplex3D<double> NzSimplex3Dd;
//#include <Nazara/Noise/Simplex3D.inl>
#include "Simplex3D.inl"
#include <Nazara/Noise/Simplex3D.inl>
#endif // SIMPLEX3D_H

8
include/Nazara/Noise/Simplex3D.inl
View File

@ -2,10 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <iostream>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzSimplex3D<T>::NzSimplex3D()
@ -155,3 +154,4 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
return (n1+n2+n3+n4)*32;
}
#include <Nazara/Core/DebugOff.hpp>

9
include/Nazara/Noise/Simplex4D.hpp
View File

@ -8,12 +8,10 @@
#define SIMPLEX4D_H
#include <Nazara/Prerequesites.hpp>
//#include <Nazara/Noise/NoiseBase.hpp>
#include "NoiseBase.hpp"
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Math/Vector4.hpp>
template <typename T> class NzSimplex4D : public NzNoiseBase
template <typename T> class NAZARA_API NzSimplex4D : public NzNoiseBase
{
public:
NzSimplex4D();
@ -41,8 +39,7 @@ template <typename T> class NzSimplex4D : public NzNoiseBase
typedef NzSimplex4D<float> NzSimplex4Df;
typedef NzSimplex4D<double> NzSimplex4Dd;
//#include <Nazara/Noise/Simplex4D.inl>
#include "Simplex4D.inl"
#include <Nazara/Noise/Simplex4D.inl>
#endif // SIMPLEX4D_H

7
include/Nazara/Noise/Simplex4D.inl
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
template <typename T>
NzSimplex4D<T>::NzSimplex4D()
@ -160,3 +160,4 @@ T NzSimplex4D<T>::GetValue(T x, T y, T z, T w, T res)
return (n1+n2+n3+n4+n5)*27.0;
}
#include <Nazara/Core/DebugOff.hpp>

9
src/Nazara/Noise/ComplexNoiseBase.cpp
View File

@ -1,5 +1,12 @@
#include "ComplexNoiseBase.hpp"
// 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
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <cmath>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
NzComplexNoiseBase::NzComplexNoiseBase()
{

2
src/Nazara/Noise/Noise.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Noise/Noise.hpp>
#include <Nazara/Noise/Error.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>

9
src/Nazara/Noise/NoiseBase.cpp
View File

@ -2,11 +2,10 @@
// This file is part of the "Nazara Engine".
// For conditions of distribution and use, see copyright notice in Config.hpp
#include "NoiseBase.hpp"
//#include <Nazara/Noise/NoiseBase.hpp>
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Noise/NoiseBase.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
NzNoiseBase::NzNoiseBase(int seed)
{

10
src/Nazara/Noise/NoiseMachine.cpp
View File

@ -1,11 +1,11 @@
// 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
#include "NoiseMachine.hpp"
//#include <Nazara/Noise/NoiseMachine.hpp>
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <Nazara/Noise/NoiseMachine.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Noise/Config.hpp>
#include <Nazara/Noise/Debug.hpp>
NzNoiseMachine::NzNoiseMachine(int seed)
{