summaryrefslogtreecommitdiffstats
path: root/Tools/NoiseSpeedTest
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/NoiseSpeedTest')
-rw-r--r--Tools/NoiseSpeedTest/NoiseSpeedTest.cpp25
-rw-r--r--Tools/NoiseSpeedTest/NoiseSpeedTest.h4
-rw-r--r--Tools/NoiseSpeedTest/SimplexNoise.h90
3 files changed, 81 insertions, 38 deletions
diff --git a/Tools/NoiseSpeedTest/NoiseSpeedTest.cpp b/Tools/NoiseSpeedTest/NoiseSpeedTest.cpp
index 90bb9499e..882e78819 100644
--- a/Tools/NoiseSpeedTest/NoiseSpeedTest.cpp
+++ b/Tools/NoiseSpeedTest/NoiseSpeedTest.cpp
@@ -5,10 +5,12 @@
/*
This program compares the performance of the highly-optimized noise implementation in Cuberite, and the Simplex noise.
Since the Simplex noise is not yet implemented in Cuberite, an own implementation is provided.
-Also, the performance difference between using a float and double as datatype is measured, by using a templatized Simplex noise.
+Also, the performance difference between using a float and double as datatype is measured, by using a templatized
+Simplex noise.
-The testing is done on a usage of the generator that is typical for the Cuberite's terrain generator: generate a 3D array of numbers with
-not much variance in the coords. The exact sizes and coord ranges were adapted from the cNoise3DComposable generator.
+The testing is done on a usage of the generator that is typical for the Cuberite's terrain generator: generate a 3D
+array of numbers with not much variance in the coords. The exact sizes and coord ranges were adapted from the
+cNoise3DComposable generator.
*/
#include "Globals.h"
@@ -59,7 +61,7 @@ static void measureClassicNoise(int a_NumIterations)
/** Calculates the specified number of iterations of the Simplex noise.
a_TypeStr is a string representing the DATATYPE (for logging purposes). */
-template<typename DATATYPE> static void measureSimplexNoise(int a_NumIterations, const char * a_TypeStr)
+template <typename DATATYPE> static void measureSimplexNoise(int a_NumIterations, const char * a_TypeStr)
{
cSimplexNoise<DATATYPE> noise(1);
DATATYPE total = 0;
@@ -80,7 +82,12 @@ template<typename DATATYPE> static void measureSimplexNoise(int a_NumIterations,
}
auto timeEnd = std::chrono::high_resolution_clock::now();
auto msec = std::chrono::duration_cast<std::chrono::milliseconds>(timeEnd - timeStart);
- printf("SimplexNoise<%s> took %d milliseconds, returned total %f\n", a_TypeStr, static_cast<int>(msec.count()), total);
+ printf(
+ "SimplexNoise<%s> took %d milliseconds, returned total %f\n",
+ a_TypeStr,
+ static_cast<int>(msec.count()),
+ total
+ );
}
@@ -108,10 +115,10 @@ int main(int argc, char ** argv)
measureSimplexNoise<double>(numIterations, "double");
measureSimplexNoise<double>(numIterations, "double");
- // If build on Windows using MSVC, wait for a keypress before ending:
- #ifdef _MSC_VER
- getchar();
- #endif
+// If build on Windows using MSVC, wait for a keypress before ending:
+#ifdef _MSC_VER
+ getchar();
+#endif
return 0;
}
diff --git a/Tools/NoiseSpeedTest/NoiseSpeedTest.h b/Tools/NoiseSpeedTest/NoiseSpeedTest.h
index 74a0108e6..ac701b241 100644
--- a/Tools/NoiseSpeedTest/NoiseSpeedTest.h
+++ b/Tools/NoiseSpeedTest/NoiseSpeedTest.h
@@ -1,5 +1 @@
// NoiseSpeedTest.h
-
-
-
-
diff --git a/Tools/NoiseSpeedTest/SimplexNoise.h b/Tools/NoiseSpeedTest/SimplexNoise.h
index 6e74212ae..0c422e980 100644
--- a/Tools/NoiseSpeedTest/SimplexNoise.h
+++ b/Tools/NoiseSpeedTest/SimplexNoise.h
@@ -14,10 +14,9 @@ http://staffwww.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
-template<typename Datatype>
-class cSimplexNoise
+template <typename Datatype> class cSimplexNoise
{
-public:
+ public:
cSimplexNoise(unsigned a_Seed)
{
// Based on the seed, initialize the permutation table, using a simple LCG and swapping
@@ -77,11 +76,19 @@ public:
Datatype GetValueAt3D(const Datatype a_X, const Datatype a_Y, const Datatype a_Z)
{
// The gradients are the midpoints of the vertices of a cube.
- static const Datatype grad3[12][3] =
- {
- {1, 1, 0}, {-1, 1, 0}, {1, -1, 0}, {-1, -1, 0},
- {1, 0, 1}, {-1, 0, 1}, {1, 0, -1}, {-1, 0, -1},
- {0, 1, 1}, { 0, -1, 1}, {0, 1, -1}, { 0, -1, -1}
+ static const Datatype grad3[12][3] = {
+ {1, 1, 0},
+ {-1, 1, 0},
+ {1, -1, 0},
+ {-1, -1, 0},
+ {1, 0, 1},
+ {-1, 0, 1},
+ {1, 0, -1},
+ {-1, 0, -1},
+ {0, 1, 1},
+ {0, -1, 1},
+ {0, 1, -1},
+ {0, -1, -1}
};
// Skew factors:
@@ -115,17 +122,32 @@ public:
if (y0 >= z0)
{
// X Y Z order
- i1 = 1; j1 = 0; k1 = 0; i2 = 1; j2 = 1; k2 = 0;
+ i1 = 1;
+ j1 = 0;
+ k1 = 0;
+ i2 = 1;
+ j2 = 1;
+ k2 = 0;
}
else if (x0 >= z0)
{
// X Z Y order
- i1 = 1; j1 = 0; k1 = 0; i2 = 1; j2 = 0; k2 = 1;
+ i1 = 1;
+ j1 = 0;
+ k1 = 0;
+ i2 = 1;
+ j2 = 0;
+ k2 = 1;
}
else
{
// Z X Y order
- i1 = 0; j1 = 0; k1 = 1; i2 = 1; j2 = 0; k2 = 1;
+ i1 = 0;
+ j1 = 0;
+ k1 = 1;
+ i2 = 1;
+ j2 = 0;
+ k2 = 1;
}
}
else
@@ -133,17 +155,32 @@ public:
if (y0 < z0)
{
// Z Y X order
- i1 = 0; j1 = 0; k1 = 1; i2 = 0; j2 = 1; k2 = 1;
+ i1 = 0;
+ j1 = 0;
+ k1 = 1;
+ i2 = 0;
+ j2 = 1;
+ k2 = 1;
}
else if (x0 < z0)
{
// Y Z X order
- i1 = 0; j1 = 1; k1 = 0; i2 = 0; j2 = 1; k2 = 1;
+ i1 = 0;
+ j1 = 1;
+ k1 = 0;
+ i2 = 0;
+ j2 = 1;
+ k2 = 1;
}
else
{
// Y X Z order
- i1 = 0; j1 = 1; k1 = 0; i2 = 1; j2 = 1; k2 = 0;
+ i1 = 0;
+ j1 = 1;
+ k1 = 0;
+ i2 = 1;
+ j2 = 1;
+ k2 = 0;
}
}
@@ -156,7 +193,8 @@ public:
Datatype x2 = x0 - i2 + static_cast<Datatype>(2) * G3; // Offsets for third corner in XYZ coords
Datatype y2 = y0 - j2 + static_cast<Datatype>(2) * G3;
Datatype z2 = z0 - k2 + static_cast<Datatype>(2) * G3;
- Datatype x3 = x0 - static_cast<Datatype>(1) + static_cast<Datatype>(3) * G3; // Offsets for last corner in XYZ coords
+ Datatype x3 =
+ x0 - static_cast<Datatype>(1) + static_cast<Datatype>(3) * G3; // Offsets for last corner in XYZ coords
Datatype y3 = y0 - static_cast<Datatype>(1) + static_cast<Datatype>(3) * G3;
Datatype z3 = z0 - static_cast<Datatype>(1) + static_cast<Datatype>(3) * G3;
@@ -228,10 +266,15 @@ public:
a_Start and a_End are the coords of the 3D array in the noise-space. */
void Generate3D(
Datatype * a_Out,
- int a_SizeX, int a_SizeY, int a_SizeZ,
- Datatype a_StartX, Datatype a_EndX,
- Datatype a_StartY, Datatype a_EndY,
- Datatype a_StartZ, Datatype a_EndZ
+ int a_SizeX,
+ int a_SizeY,
+ int a_SizeZ,
+ Datatype a_StartX,
+ Datatype a_EndX,
+ Datatype a_StartY,
+ Datatype a_EndY,
+ Datatype a_StartZ,
+ Datatype a_EndZ
)
{
Datatype * out = a_Out;
@@ -251,14 +294,11 @@ public:
} // for z
}
-protected:
+ protected:
/** The permutation table, initialized by the seed. */
int m_Perm[512];
- /** A copy of the permutation table, with each item modulo 12, to avoid 4 modulo operations per value calculation. */
+ /** A copy of the permutation table, with each item modulo 12, to avoid 4 modulo operations per value calculation.
+ */
int m_PermMod12[512];
};
-
-
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 23:34:38 +0100