6 files changed, 1157 insertions, 484 deletions

diff --git a/src/Noise/CMakeLists.txt b/src/Noise/CMakeLists.txt
new file mode 100644
index 000000000..e1837500f
--- /dev/null
+++ b/src/Noise/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+cmake_minimum_required (VERSION 2.6)
+project (MCServer)
+
+include_directories ("${PROJECT_SOURCE_DIR}/../")
+
+SET (SRCS
+	Noise.cpp
+)
+
+SET (HDRS
+	Noise.h
+	OctavedNoise.h
+	RidgedNoise.h
+)
+
+if(NOT MSVC)
+	add_library(Noise ${SRCS} ${HDRS})
+
+	target_link_libraries(Noise OSSupport)
+endif()
diff --git a/src/Noise/InterpolNoise.h b/src/Noise/InterpolNoise.h
new file mode 100644
index 000000000..683b54563
--- /dev/null
+++ b/src/Noise/InterpolNoise.h
@@ -0,0 +1,524 @@
+
+// InterpolNoise.h
+
+// Implements the cInterpolNoise class template representing a noise that interpolates the values between integer coords from a single set of neighbors
+
+
+
+
+
+#pragma once
+
+#include "Noise.h"
+
+#define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x))
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cInterpolCell2D:
+
+template <typename T>
+class cInterpolCell2D
+{
+public:
+	cInterpolCell2D(
+		const cNoise & a_Noise,    ///< Noise to use for generating the random values
+		NOISE_DATATYPE * a_Array,  ///< Array to generate into [x + a_SizeX * y]
+		int a_SizeX, int a_SizeY,  ///< Count of the array, in each direction
+		const NOISE_DATATYPE * a_FracX,  ///< Pointer to the array that stores the X fractional values
+		const NOISE_DATATYPE * a_FracY   ///< Pointer to the attay that stores the Y fractional values
+	):
+		m_Noise(a_Noise),
+		m_WorkRnds(&m_Workspace1),
+		m_CurFloorX(0),
+		m_CurFloorY(0),
+		m_Array(a_Array),
+		m_SizeX(a_SizeX),
+		m_SizeY(a_SizeY),
+		m_FracX(a_FracX),
+		m_FracY(a_FracY)
+	{
+	}
+	
+
+	/** Generates part of the output noise array using the current m_WorkRnds[] values */
+	void Generate(
+		int a_FromX, int a_ToX,
+		int a_FromY, int a_ToY
+	)
+	{
+		for (int y = a_FromY; y < a_ToY; y++)
+		{
+			NOISE_DATATYPE Interp[2];
+			NOISE_DATATYPE FracY = T::coeff(m_FracY[y]);
+			Interp[0] = Lerp((*m_WorkRnds)[0][0], (*m_WorkRnds)[0][1], FracY);
+			Interp[1] = Lerp((*m_WorkRnds)[1][0], (*m_WorkRnds)[1][1], FracY);
+			int idx = y * m_SizeX + a_FromX;
+			for (int x = a_FromX; x < a_ToX; x++)
+			{
+				m_Array[idx++] = Lerp(Interp[0], Interp[1], T::coeff(m_FracX[x]));
+			}  // for x
+		}  // for y
+	}
+	
+
+	/** Initializes m_WorkRnds[] with the specified values of the noise at the specified integral coords. */
+	void InitWorkRnds(int a_FloorX, int a_FloorY)
+	{
+		m_CurFloorX = a_FloorX;
+		m_CurFloorY = a_FloorY;
+		(*m_WorkRnds)[0][0] = m_Noise.IntNoise2D(m_CurFloorX,     m_CurFloorY);
+		(*m_WorkRnds)[0][1] = m_Noise.IntNoise2D(m_CurFloorX,     m_CurFloorY + 1);
+		(*m_WorkRnds)[1][0] = m_Noise.IntNoise2D(m_CurFloorX + 1, m_CurFloorY);
+		(*m_WorkRnds)[1][1] = m_Noise.IntNoise2D(m_CurFloorX + 1, m_CurFloorY + 1);
+	}
+	
+
+	/** Updates m_WorkRnds[] for the new integral coords */
+	void Move(int a_NewFloorX, int a_NewFloorY)
+	{
+		// Swap the doublebuffer:
+		int OldFloorX = m_CurFloorX;
+		int OldFloorY = m_CurFloorY;
+		Workspace * OldWorkRnds = m_WorkRnds;
+		m_WorkRnds = (m_WorkRnds == &m_Workspace1) ? &m_Workspace2 : &m_Workspace1;
+	
+		// Reuse as much of the old workspace as possible:
+		// TODO: Try out if simply calculating all 4 elements each time is faster than this monster loop
+		int DiffX = OldFloorX - a_NewFloorX;
+		int DiffY = OldFloorY - a_NewFloorY;
+		for (int x = 0; x < 2; x++)
+		{
+			int cx = a_NewFloorX + x;
+			int OldX = x - DiffX;  // Where would this X be in the old grid?
+			for (int y = 0; y < 2; y++)
+			{
+				int cy = a_NewFloorY + y;
+				int OldY = y - DiffY;  // Where would this Y be in the old grid?
+				if ((OldX >= 0) && (OldX < 2) && (OldY >= 0) && (OldY < 2))
+				{
+					(*m_WorkRnds)[x][y] = (*OldWorkRnds)[OldX][OldY];
+				}
+				else
+				{
+					(*m_WorkRnds)[x][y] = (NOISE_DATATYPE)m_Noise.IntNoise2D(cx, cy);
+				}
+			}
+		}
+		m_CurFloorX = a_NewFloorX;
+		m_CurFloorY = a_NewFloorY;
+	}
+
+protected:
+	typedef NOISE_DATATYPE Workspace[2][2];
+	
+	/** The noise used for generating the values at integral coords. */
+	const cNoise & m_Noise;
+	
+	/** The current random values; points to either m_Workspace1 or m_Workspace2 (doublebuffering) */
+	Workspace * m_WorkRnds;
+
+	/** Buffer 1 for workspace doublebuffering, used in Move() */
+	Workspace m_Workspace1;
+
+	/** Buffer 2 for workspace doublebuffering, used in Move() */
+	Workspace m_Workspace2;
+
+	/** Coords of the currently calculated m_WorkRnds[]. */
+	int m_CurFloorX, m_CurFloorY;
+	
+	/** The output array to generate into. */
+	NOISE_DATATYPE * m_Array;
+
+	/** Dimensions of the output array. */
+	int m_SizeX, m_SizeY;
+
+	/** Arrays holding the fractional values of the coords in each direction. */
+	const NOISE_DATATYPE * m_FracX;
+	const NOISE_DATATYPE * m_FracY;
+} ;
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cInterpolCell3D:
+
+/** Holds a cache of the last calculated integral noise values and interpolates between them en masse.
+Provides a massive optimization for cInterpolNoise.
+Works by calculating multiple noise values (that have the same integral noise coords) at once. The underlying noise values
+needn't be recalculated for these values, only the interpolation is done within the unit cube. */
+template <typename T>
+class cInterpolCell3D
+{
+public:
+	cInterpolCell3D(
+		const cNoise & a_Noise,                 ///< Noise to use for generating the random values
+		NOISE_DATATYPE * a_Array,               ///< Array to generate into [x + a_SizeX * y]
+		int a_SizeX, int a_SizeY, int a_SizeZ,  ///< Count of the array, in each direction
+		const NOISE_DATATYPE * a_FracX,         ///< Pointer to the array that stores the X fractional values
+		const NOISE_DATATYPE * a_FracY,         ///< Pointer to the attay that stores the Y fractional values
+		const NOISE_DATATYPE * a_FracZ          ///< Pointer to the array that stores the Z fractional values
+	):
+		m_Noise(a_Noise),
+		m_WorkRnds(&m_Workspace1),
+		m_CurFloorX(0),
+		m_CurFloorY(0),
+		m_CurFloorZ(0),
+		m_Array(a_Array),
+		m_SizeX(a_SizeX),
+		m_SizeY(a_SizeY),
+		m_SizeZ(a_SizeZ),
+		m_FracX(a_FracX),
+		m_FracY(a_FracY),
+		m_FracZ(a_FracZ)
+	{
+	}
+
+
+	/** Generates part of the output array using current m_WorkRnds[]. */
+	void Generate(
+		int a_FromX, int a_ToX,
+		int a_FromY, int a_ToY,
+		int a_FromZ, int a_ToZ
+	)
+	{
+		for (int z = a_FromZ; z < a_ToZ; z++)
+		{
+			int idxZ = z * m_SizeX * m_SizeY;
+			NOISE_DATATYPE Interp2[2][2];
+			NOISE_DATATYPE FracZ = T::coeff(m_FracZ[z]);
+			for (int x = 0; x < 2; x++)
+			{
+				for (int y = 0; y < 2; y++)
+				{
+					Interp2[x][y] = Lerp((*m_WorkRnds)[x][y][0], (*m_WorkRnds)[x][y][1], FracZ);
+				}
+			}
+			for (int y = a_FromY; y < a_ToY; y++)
+			{
+				NOISE_DATATYPE Interp[2];
+				NOISE_DATATYPE FracY = T::coeff(m_FracY[y]);
+				Interp[0] = Lerp(Interp2[0][0], Interp2[0][1], FracY);
+				Interp[1] = Lerp(Interp2[1][0], Interp2[1][1], FracY);
+				int idx = idxZ + y * m_SizeX + a_FromX;
+				for (int x = a_FromX; x < a_ToX; x++)
+				{
+					m_Array[idx++] = Lerp(Interp[0], Interp[1], T::coeff(m_FracX[x]));
+				}  // for x
+			}  // for y
+		}  // for z
+	}
+
+
+	/** Initializes m_WorkRnds[] with the specified Floor values. */
+	void InitWorkRnds(int a_FloorX, int a_FloorY, int a_FloorZ)
+	{
+		m_CurFloorX = a_FloorX;
+		m_CurFloorY = a_FloorY;
+		m_CurFloorZ = a_FloorZ;
+		(*m_WorkRnds)[0][0][0] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX,     m_CurFloorY,     m_CurFloorZ);
+		(*m_WorkRnds)[0][0][1] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX,     m_CurFloorY,     m_CurFloorZ + 1);
+		(*m_WorkRnds)[0][1][0] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX,     m_CurFloorY + 1, m_CurFloorZ);
+		(*m_WorkRnds)[0][1][1] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX,     m_CurFloorY + 1, m_CurFloorZ + 1);
+		(*m_WorkRnds)[1][0][0] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX + 1, m_CurFloorY,     m_CurFloorZ);
+		(*m_WorkRnds)[1][0][1] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX + 1, m_CurFloorY,     m_CurFloorZ + 1);
+		(*m_WorkRnds)[1][1][0] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX + 1, m_CurFloorY + 1, m_CurFloorZ);
+		(*m_WorkRnds)[1][1][1] = (NOISE_DATATYPE)m_Noise.IntNoise3D(m_CurFloorX + 1, m_CurFloorY + 1, m_CurFloorZ + 1);
+	}
+
+
+	/** Updates m_WorkRnds[] for the new Floor values. */
+	void Move(int a_NewFloorX, int a_NewFloorY, int a_NewFloorZ)
+	{
+		// Swap the doublebuffer:
+		int OldFloorX = m_CurFloorX;
+		int OldFloorY = m_CurFloorY;
+		int OldFloorZ = m_CurFloorZ;
+		Workspace * OldWorkRnds = m_WorkRnds;
+		m_WorkRnds = (m_WorkRnds == &m_Workspace1) ? &m_Workspace2 : &m_Workspace1;
+
+		// Reuse as much of the old workspace as possible:
+		// TODO: Try out if simply calculating all 8 elements each time is faster than this monster loop
+		int DiffX = OldFloorX - a_NewFloorX;
+		int DiffY = OldFloorY - a_NewFloorY;
+		int DiffZ = OldFloorZ - a_NewFloorZ;
+		for (int x = 0; x < 2; x++)
+		{
+			int cx = a_NewFloorX + x;
+			int OldX = x - DiffX;  // Where would this X be in the old grid?
+			for (int y = 0; y < 2; y++)
+			{
+				int cy = a_NewFloorY + y;
+				int OldY = y - DiffY;  // Where would this Y be in the old grid?
+				for (int z = 0; z < 2; z++)
+				{
+					int cz = a_NewFloorZ + z;
+					int OldZ = z - DiffZ;
+					if ((OldX >= 0) && (OldX < 2) && (OldY >= 0) && (OldY < 2) && (OldZ >= 0) && (OldZ < 2))
+					{
+						(*m_WorkRnds)[x][y][z] = (*OldWorkRnds)[OldX][OldY][OldZ];
+					}
+					else
+					{
+						(*m_WorkRnds)[x][y][z] = (NOISE_DATATYPE)m_Noise.IntNoise3D(cx, cy, cz);
+					}
+				}  // for z
+			}  // for y
+		}  // for x
+		m_CurFloorX = a_NewFloorX;
+		m_CurFloorY = a_NewFloorY;
+		m_CurFloorZ = a_NewFloorZ;
+	}
+
+protected:
+	typedef NOISE_DATATYPE Workspace[2][2][2];
+
+	/** The noise used for generating the values at integral coords. */
+	const cNoise & m_Noise;
+
+	/** The current random values; points to either m_Workspace1 or m_Workspace2 (doublebuffering) */
+	Workspace * m_WorkRnds;
+
+	/** Buffer 1 for workspace doublebuffering, used in Move() */
+	Workspace m_Workspace1;
+
+	/** Buffer 2 for workspace doublebuffering, used in Move() */
+	Workspace m_Workspace2;
+
+	/** The integral coords of the currently calculated WorkRnds[] */
+	int m_CurFloorX, m_CurFloorY, m_CurFloorZ;
+
+	/** The output array where the noise is calculated. */
+	NOISE_DATATYPE * m_Array;
+
+	/** Dimensions of the output array. */
+	int m_SizeX, m_SizeY, m_SizeZ;
+
+	/** Arrays holding the fractional values of the coords in each direction. */
+	const NOISE_DATATYPE * m_FracX;
+	const NOISE_DATATYPE * m_FracY;
+	const NOISE_DATATYPE * m_FracZ;
+} ;
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cInterpolNoise:
+
+template <typename T>
+class cInterpolNoise
+{
+	/** Maximum size, for each direction, of the generated array. */
+	static const int MAX_SIZE = 256;
+
+public:
+	cInterpolNoise(int a_Seed):
+		m_Noise(a_Seed)
+	{
+	}
+
+
+	/** Sets a new seed for the generators. Relays the seed to the underlying noise. */
+	void SetSeed(int a_Seed)
+	{
+		m_Noise.SetSeed(a_Seed);
+	}
+
+
+	/** Fills a 2D array with the values of the noise. */
+	void Generate2D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
+		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY   ///< Noise-space coords of the array in the Y direction
+	) const
+	{
+		ASSERT(a_SizeX > 0);
+		ASSERT(a_SizeY > 0);
+		ASSERT(a_SizeX < MAX_SIZE);
+		ASSERT(a_SizeY < MAX_SIZE);
+		ASSERT(a_StartX < a_EndX);
+		ASSERT(a_StartY < a_EndY);
+	
+		// Calculate the integral and fractional parts of each coord:
+		int FloorX[MAX_SIZE];
+		int FloorY[MAX_SIZE];
+		NOISE_DATATYPE FracX[MAX_SIZE];
+		NOISE_DATATYPE FracY[MAX_SIZE];
+		int SameX[MAX_SIZE];
+		int SameY[MAX_SIZE];
+		int NumSameX, NumSameY;
+		CalcFloorFrac(a_SizeX, a_StartX, a_EndX, FloorX, FracX, SameX, NumSameX);
+		CalcFloorFrac(a_SizeY, a_StartY, a_EndY, FloorY, FracY, SameY, NumSameY);
+	
+		cInterpolCell2D<T> Cell(m_Noise, a_Array, a_SizeX, a_SizeY, FracX, FracY);
+	
+		Cell.InitWorkRnds(FloorX[0], FloorY[0]);
+	
+		// Calculate query values using Cell:
+		int FromY = 0;
+		for (int y = 0; y < NumSameY; y++)
+		{
+			int ToY = FromY + SameY[y];
+			int FromX = 0;
+			int CurFloorY = FloorY[FromY];
+			for (int x = 0; x < NumSameX; x++)
+			{
+				int ToX = FromX + SameX[x];
+				Cell.Generate(FromX, ToX, FromY, ToY);
+				Cell.Move(FloorX[ToX], CurFloorY);
+				FromX = ToX;
+			}  // for x
+			Cell.Move(FloorX[0], FloorY[ToY]);
+			FromY = ToY;
+		}  // for y
+	}
+
+
+	/** Fills a 3D array with the values of the noise. */
+	void Generate3D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
+		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
+		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ   ///< Noise-space coords of the array in the Z direction
+	) const
+	{
+		// Check params:
+		ASSERT(a_SizeX > 1);
+		ASSERT(a_SizeY > 1);
+
+		ASSERT(a_SizeX < MAX_SIZE);
+		ASSERT(a_SizeY < MAX_SIZE);
+		ASSERT(a_SizeZ < MAX_SIZE);
+		ASSERT(a_StartX < a_EndX);
+		ASSERT(a_StartY < a_EndY);
+		ASSERT(a_StartZ < a_EndZ);
+
+		// Calculate the integral and fractional parts of each coord:
+		int FloorX[MAX_SIZE];
+		int FloorY[MAX_SIZE];
+		int FloorZ[MAX_SIZE];
+		NOISE_DATATYPE FracX[MAX_SIZE];
+		NOISE_DATATYPE FracY[MAX_SIZE];
+		NOISE_DATATYPE FracZ[MAX_SIZE];
+		int SameX[MAX_SIZE];
+		int SameY[MAX_SIZE];
+		int SameZ[MAX_SIZE];
+		int NumSameX, NumSameY, NumSameZ;
+		CalcFloorFrac(a_SizeX, a_StartX, a_EndX, FloorX, FracX, SameX, NumSameX);
+		CalcFloorFrac(a_SizeY, a_StartY, a_EndY, FloorY, FracY, SameY, NumSameY);
+		CalcFloorFrac(a_SizeZ, a_StartZ, a_EndZ, FloorZ, FracZ, SameZ, NumSameZ);
+
+		cInterpolCell3D<T> Cell(
+			m_Noise, a_Array,
+			a_SizeX, a_SizeY, a_SizeZ,
+			FracX, FracY, FracZ
+		);
+	
+		Cell.InitWorkRnds(FloorX[0], FloorY[0], FloorZ[0]);
+	
+		// Calculate query values using Cell:
+		int FromZ = 0;
+		for (int z = 0; z < NumSameZ; z++)
+		{
+			int ToZ = FromZ + SameZ[z];
+			int CurFloorZ = FloorZ[FromZ];
+			int FromY = 0;
+			for (int y = 0; y < NumSameY; y++)
+			{
+				int ToY = FromY + SameY[y];
+				int CurFloorY = FloorY[FromY];
+				int FromX = 0;
+				for (int x = 0; x < NumSameX; x++)
+				{
+					int ToX = FromX + SameX[x];
+					Cell.Generate(FromX, ToX, FromY, ToY, FromZ, ToZ);
+					Cell.Move(FloorX[ToX], CurFloorY, CurFloorZ);
+					FromX = ToX;
+				}
+				Cell.Move(FloorX[0], FloorY[ToY], CurFloorZ);
+				FromY = ToY;
+			}  // for y
+			Cell.Move(FloorX[0], FloorY[0], FloorZ[ToZ]);
+			FromZ = ToZ;
+		}  // for z
+	}
+
+protected:
+
+	/** The noise used for the underlying value generation. */
+	cNoise m_Noise;
+
+
+	/** Calculates the integral and fractional parts along one axis.
+	a_Floor will receive the integral parts (array of a_Size ints).
+	a_Frac will receive the fractional parts (array of a_Size floats).
+	a_Same will receive the counts of items that have the same integral parts (array of up to a_Size ints).
+	a_NumSame will receive the count of a_Same elements (total count of different integral parts). */
+	void CalcFloorFrac(
+		int a_Size,
+		NOISE_DATATYPE a_Start, NOISE_DATATYPE a_End,
+		int * a_Floor, NOISE_DATATYPE * a_Frac,
+		int * a_Same, int & a_NumSame
+	) const
+	{
+		ASSERT(a_Size > 0);
+
+		// Calculate the floor and frac values:
+		NOISE_DATATYPE val = a_Start;
+		NOISE_DATATYPE dif = (a_End - a_Start) / (a_Size - 1);
+		for (int i = 0; i < a_Size; i++)
+		{
+			a_Floor[i] = FAST_FLOOR(val);
+			a_Frac[i] = val - a_Floor[i];
+			val += dif;
+		}
+
+		// Mark up the same floor values into a_Same / a_NumSame:
+		int CurFloor = a_Floor[0];
+		int LastSame = 0;
+		a_NumSame = 0;
+		for (int i = 1; i < a_Size; i++)
+		{
+			if (a_Floor[i] != CurFloor)
+			{
+				a_Same[a_NumSame] = i - LastSame;
+				LastSame = i;
+				a_NumSame += 1;
+				CurFloor = a_Floor[i];
+			}
+		}  // for i - a_Floor[]
+		if (LastSame < a_Size)
+		{
+			a_Same[a_NumSame] = a_Size - LastSame;
+			a_NumSame += 1;
+		}
+	}
+};
+
+
+
+
+
+/** A fifth-degree curve for interpolating.
+Implemented as a functor for better chance of inlining. */
+struct Interp5Deg
+{
+	static NOISE_DATATYPE coeff(NOISE_DATATYPE a_Val)
+	{
+		return a_Val * a_Val * a_Val * (a_Val * (a_Val * 6 - 15) + 10);
+	}
+};
+
+typedef cInterpolNoise<Interp5Deg> cInterp5DegNoise;
+
+
+
diff --git a/src/Noise.cpp b/src/Noise/Noise.cpp
index 8fcfe2920..509be7d6c 100644
--- a/src/Noise.cpp
+++ b/src/Noise/Noise.cpp
@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Noise.h"
+#include "OSSupport/Timer.h"
 
 #define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x))
 
@@ -9,10 +10,110 @@
 
 
 
+#if 0
+/** cImprovedPerlin noise test suite:
+- Generate a rather large 2D and 3D noise array and output it to a file
+- Compare performance of cCubicNoise and cImprovedNoise, both in single-value and 3D-array usages */
+static class cImprovedPerlinNoiseTest
+{
+public:
+	cImprovedPerlinNoiseTest(void)
+	{
+		printf("Performing Improved Perlin Noise tests...\n");
+		TestImage();
+		TestSpeed();
+		TestSpeedArr();
+		printf("Improved Perlin Noise tests complete.\n");
+	}
+
+
+	/** Tests the noise by generating 2D and 3D images and dumping them to files. */
+	void TestImage(void)
+	{
+		static const int SIZE_X = 256;
+		static const int SIZE_Y = 256;
+		static const int SIZE_Z = 16;
+
+		cImprovedNoise noise(1);
+		std::unique_ptr<NOISE_DATATYPE[]> arr(new NOISE_DATATYPE[SIZE_X * SIZE_Y * SIZE_Z]);
+		noise.Generate3D(arr.get(), SIZE_X, SIZE_Y, SIZE_Z, 0, 14, 0, 14, 0, 14);
+		Debug3DNoise(arr.get(), SIZE_X, SIZE_Y, SIZE_Z, "ImprovedPerlinNoiseTest3D", 128);
+		noise.Generate2D(arr.get(), SIZE_X, SIZE_Y, 0, 14, 15, 28);
+		Debug2DNoise(arr.get(), SIZE_X, SIZE_Y, "ImprovedPerlinNoiseTest2D", 128);
+	}
+
+
+	/** Tests the speeds of cImprovedPerlin and cCubicNoise when generating individual values. */
+	void TestSpeed(void)
+	{
+		cImprovedNoise improvedNoise(1);
+		cNoise         noise(1);
+		cTimer timer;
+
+		// Measure the improvedNoise:
+		NOISE_DATATYPE sum = 0;
+		long long start = timer.GetNowTime();
+		for (int i = 0; i < 100000000; i++)
+		{
+			sum += improvedNoise.GetValueAt(i, 0, -i);
+		}
+		long long finish = timer.GetNowTime();
+		printf("cImprovedNoise took %.2f seconds; total is %f.\n", static_cast<float>(finish - start) / 1000.0f, sum);
+
+		// Measure the cubicNoise:
+		sum = 0;
+		start = timer.GetNowTime();
+		for (int i = 0; i < 100000000; i++)
+		{
+			sum += noise.IntNoise3D(i, 0, -i);
+		}
+		finish = timer.GetNowTime();
+		printf("cCubicNoise took %.2f seconds; total is %f.\n", static_cast<float>(finish - start) / 1000.0f, sum);
+	}
+
+
+	/** Tests the speeds of cImprovedPerlin and cCubicNoise when generating arrays. */
+	void TestSpeedArr(void)
+	{
+		static const int SIZE_X = 256;
+		static const int SIZE_Y = 256;
+		static const int SIZE_Z = 16;
+
+		std::unique_ptr<NOISE_DATATYPE[]> arr(new NOISE_DATATYPE[SIZE_X * SIZE_Y * SIZE_Z]);
+		cTimer timer;
+		cImprovedNoise improvedNoise(1);
+		cCubicNoise    cubicNoise(1);
+
+		// Measure the improvedNoise:
+		long long start = timer.GetNowTime();
+		for (int i = 0; i < 40; i++)
+		{
+			improvedNoise.Generate3D(arr.get(), SIZE_X, SIZE_Y, SIZE_Z, 0, 14, 0, 14, 0, 14);
+		}
+		long long finish = timer.GetNowTime();
+		printf("cImprovedNoise(arr) took %.2f seconds.\n", static_cast<float>(finish - start) / 1000.0f);
+
+		// Measure the cubicNoise:
+		start = timer.GetNowTime();
+		for (int i = 0; i < 40; i++)
+		{
+			cubicNoise.Generate3D(arr.get(), SIZE_X, SIZE_Y, SIZE_Z, 0, 14, 0, 14, 0, 14);
+		}
+		finish = timer.GetNowTime();
+		printf("cCubicNoise(arr) took %.2f seconds.\n", static_cast<float>(finish - start) / 1000.0f);
+	}
+} g_Test;
+
+#endif
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // Globals:
 
-void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase)
+void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase, NOISE_DATATYPE a_Coeff)
 {
 	const int BUF_SIZE = 512;
 	ASSERT(a_SizeX <= BUF_SIZE);  // Just stretch it, if needed
@@ -29,7 +130,7 @@ void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int
 				unsigned char buf[BUF_SIZE];
 				for (int x = 0; x < a_SizeX; x++)
 				{
-					buf[x] = (unsigned char)(std::min(255, std::max(0, (int)(128 + 32 * a_Noise[idx++]))));
+					buf[x] = static_cast<unsigned char>(Clamp((int)(128 + a_Coeff * a_Noise[idx++]), 0, 255));
 				}
 				f1.Write(buf, a_SizeX);
 			}  // for y
@@ -50,7 +151,7 @@ void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int
 				unsigned char buf[BUF_SIZE];
 				for (int x = 0; x < a_SizeX; x++)
 				{
-					buf[x] = (unsigned char)(std::min(255, std::max(0, (int)(128 + 32 * a_Noise[idx++]))));
+					buf[x] = static_cast<unsigned char>(Clamp((int)(128 + a_Coeff * a_Noise[idx++]), 0, 255));
 				}
 				f2.Write(buf, a_SizeX);
 			}  // for z
@@ -65,7 +166,7 @@ void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int
 
 
 
-void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, const AString & a_FileNameBase)
+void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, const AString & a_FileNameBase, NOISE_DATATYPE a_Coeff)
 {
 	const int BUF_SIZE = 512;
 	ASSERT(a_SizeX <= BUF_SIZE);  // Just stretch it, if needed
@@ -79,7 +180,7 @@ void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, cons
 			unsigned char buf[BUF_SIZE];
 			for (int x = 0; x < a_SizeX; x++)
 			{
-				buf[x] = (unsigned char)(std::min(255, std::max(0, (int)(128 + 32 * a_Noise[idx++]))));
+				buf[x] = static_cast<unsigned char>(Clamp((int)(128 + a_Coeff * a_Noise[idx++]), 0, 255));
 			}
 			f1.Write(buf, a_SizeX);
 		}  // for y
@@ -594,13 +695,6 @@ NOISE_DATATYPE cNoise::CubicNoise3D(NOISE_DATATYPE a_X, NOISE_DATATYPE a_Y, NOIS
 ////////////////////////////////////////////////////////////////////////////////
 // cCubicNoise:
 
-#ifdef _DEBUG
-	int cCubicNoise::m_NumSingleX = 0;
-	int cCubicNoise::m_NumSingleXY = 0;
-	int cCubicNoise::m_NumSingleY = 0;
-	int cCubicNoise::m_NumCalls = 0;
-#endif  // _DEBUG
-
 cCubicNoise::cCubicNoise(int a_Seed) :
 	m_Noise(a_Seed)
 {
@@ -639,23 +733,6 @@ void cCubicNoise::Generate2D(
 	
 	Cell.InitWorkRnds(FloorX[0], FloorY[0]);
 	
-	#ifdef _DEBUG
-		// Statistics on the noise-space coords:
-		if (NumSameX == 1)
-		{
-			m_NumSingleX++;
-			if (NumSameY == 1)
-			{
-				m_NumSingleXY++;
-			}
-		}
-		if (NumSameY == 1)
-		{
-			m_NumSingleY++;
-		}
-		m_NumCalls++;
-	#endif  // _DEBUG
-	
 	// Calculate query values using Cell:
 	int FromY = 0;
 	for (int y = 0; y < NumSameY; y++)
@@ -792,101 +869,28 @@ void cCubicNoise::CalcFloorFrac(
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// cPerlinNoise:
-
-cPerlinNoise::cPerlinNoise(void) :
-	m_Seed(0)
-{
-}
-
-
-
+// cImprovedNoise:
 
-
-cPerlinNoise::cPerlinNoise(int a_Seed) :
-	m_Seed(a_Seed)
-{
-}
-
-
-
-
-
-void cPerlinNoise::SetSeed(int a_Seed)
-{
-	m_Seed = a_Seed;
-}
-
-
-
-
-
-void cPerlinNoise::AddOctave(float a_Frequency, float a_Amplitude)
-{
-	m_Octaves.push_back(cOctave(m_Seed * ((int)m_Octaves.size() + 4) * 4 + 1024, a_Frequency, a_Amplitude));
-}
-
-
-
-
-
-void cPerlinNoise::Generate2D(
-	NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
-	int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
-	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-	NOISE_DATATYPE * a_Workspace                     ///< Workspace that this function can use and trash
-) const
+cImprovedNoise::cImprovedNoise(int a_Seed)
 {
-	if (m_Octaves.empty())
-	{
-		// No work to be done
-		ASSERT(!"Perlin: No octaves to generate!");
-		return;
-	}
-	
-	bool ShouldFreeWorkspace = (a_Workspace == nullptr);
-	int ArrayCount = a_SizeX * a_SizeY;
-	if (ShouldFreeWorkspace)
-	{
-		a_Workspace = new NOISE_DATATYPE[ArrayCount];
-	}
-	
-	// Generate the first octave directly into array:
-	const cOctave & FirstOctave = m_Octaves.front();
-	
-	FirstOctave.m_Noise.Generate2D(
-		a_Workspace, a_SizeX, a_SizeY,
-		a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
-		a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency
-	);
-	NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
-	for (int i = 0; i < ArrayCount; i++)
+	// Initialize the permutations with identity:
+	for (int i = 0; i < 256; i++)
 	{
-		a_Array[i] = a_Workspace[i] * Amplitude;
+		m_Perm[i] = i;
 	}
-	
-	// Add each octave:
-	for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
+
+	// Randomize the permutation table - swap each element with a random other element:
+	cNoise noise(a_Seed);
+	for (int i = 0; i < 256; i++)
 	{
-		// Generate cubic noise for the octave:
-		itr->m_Noise.Generate2D(
-			a_Workspace, a_SizeX, a_SizeY,
-			a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
-			a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency
-		);
-		// Add the cubic noise into the output:
-		NOISE_DATATYPE Amplitude = itr->m_Amplitude;
-		for (int i = 0; i < ArrayCount; i++)
-		{
-			a_Array[i] += a_Workspace[i] * Amplitude;
-		}
+		int rnd = (noise.IntNoise1DInt(i) / 7) % 256;
+		std::swap(m_Perm[i], m_Perm[rnd]);
 	}
-	
-	if (ShouldFreeWorkspace)
+
+	// Copy the lower 256 entries into upper 256 entries:
+	for (int i = 0; i < 256; i++)
 	{
-		delete[] a_Workspace;
-		a_Workspace = nullptr;
+		m_Perm[i + 256] = m_Perm[i];
 	}
 }
 
@@ -894,239 +898,132 @@ void cPerlinNoise::Generate2D(
 
 
 
-void cPerlinNoise::Generate3D(
-	NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
-	int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
-	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-	NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ,  ///< Noise-space coords of the array in the Z direction
-	NOISE_DATATYPE * a_Workspace                     ///< Workspace that this function can use and trash
+void cImprovedNoise::Generate2D(
+	NOISE_DATATYPE * a_Array,
+	int a_SizeX, int a_SizeY,
+	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,
+	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY
 ) const
 {
-	if (m_Octaves.empty())
-	{
-		// No work to be done
-		ASSERT(!"Perlin: No octaves to generate!");
-		return;
-	}
-	
-	bool ShouldFreeWorkspace = (a_Workspace == nullptr);
-	int ArrayCount = a_SizeX * a_SizeY * a_SizeZ;
-	if (ShouldFreeWorkspace)
+	size_t idx = 0;
+	for (int y = 0; y < a_SizeY; y++)
 	{
-		a_Workspace = new NOISE_DATATYPE[ArrayCount];
-	}
-	
-	// Generate the first octave directly into array:
-	const cOctave & FirstOctave = m_Octaves.front();
-
-	FirstOctave.m_Noise.Generate3D(
-		a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
-		a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
-		a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency,
-		a_StartZ * FirstOctave.m_Frequency, a_EndZ * FirstOctave.m_Frequency
-	);
-	NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
-	for (int i = 0; i < ArrayCount; i++)
-	{
-		a_Array[i] = a_Workspace[i] * Amplitude;
-	}
-	
-	// Add each octave:
-	for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
-	{
-		// Generate cubic noise for the octave:
-		itr->m_Noise.Generate3D(
-			a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
-			a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
-			a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency,
-			a_StartZ * itr->m_Frequency, a_EndZ * itr->m_Frequency
-		);
-		// Add the cubic noise into the output:
-		NOISE_DATATYPE Amplitude = itr->m_Amplitude;
-		for (int i = 0; i < ArrayCount; i++)
+		NOISE_DATATYPE ratioY = static_cast<NOISE_DATATYPE>(y) / (a_SizeY - 1);
+		NOISE_DATATYPE noiseY = Lerp(a_StartY, a_EndY, ratioY);
+		int noiseYInt = FAST_FLOOR(noiseY);
+		int yCoord = noiseYInt & 255;
+		NOISE_DATATYPE noiseYFrac = noiseY - noiseYInt;
+		NOISE_DATATYPE fadeY = Fade(noiseYFrac);
+		for (int x = 0; x < a_SizeX; x++)
 		{
-			a_Array[i] += a_Workspace[i] * Amplitude;
-		}
-	}
-	
-	if (ShouldFreeWorkspace)
-	{
-		delete[] a_Workspace;
-		a_Workspace = nullptr;
-	}
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// cRidgedMultiNoise:
-
-cRidgedMultiNoise::cRidgedMultiNoise(void) :
-	m_Seed(0)
-{
-}
-
-
-
-
-
-cRidgedMultiNoise::cRidgedMultiNoise(int a_Seed) :
-	m_Seed(a_Seed)
-{
-}
-
-
-
-
-
-void cRidgedMultiNoise::SetSeed(int a_Seed)
-{
-	m_Seed = a_Seed;
-}
-
-
-
-
-
-void cRidgedMultiNoise::AddOctave(float a_Frequency, float a_Amplitude)
-{
-	m_Octaves.push_back(cOctave(m_Seed * ((int)m_Octaves.size() + 4) * 4 + 1024, a_Frequency, a_Amplitude));
+			NOISE_DATATYPE ratioX = static_cast<NOISE_DATATYPE>(x) / (a_SizeX - 1);
+			NOISE_DATATYPE noiseX = Lerp(a_StartX, a_EndX, ratioX);
+			int noiseXInt = FAST_FLOOR(noiseX);
+			int xCoord = noiseXInt & 255;
+			NOISE_DATATYPE noiseXFrac = noiseX - noiseXInt;
+			NOISE_DATATYPE fadeX = Fade(noiseXFrac);
+
+			// Hash the coordinates:
+			int A  = m_Perm[xCoord] + yCoord;
+			int AA = m_Perm[A];
+			int AB = m_Perm[A + 1];
+			int B  = m_Perm[xCoord + 1] + yCoord;
+			int BA = m_Perm[B];
+			int BB = m_Perm[B + 1];
+
+			// Lerp the gradients:
+			a_Array[idx++] = Lerp(
+				Lerp(Grad(m_Perm[AA], noiseXFrac, noiseYFrac,     0), Grad(m_Perm[BA], noiseXFrac - 1, noiseYFrac,     0), fadeX),
+				Lerp(Grad(m_Perm[AB], noiseXFrac, noiseYFrac - 1, 0), Grad(m_Perm[BB], noiseXFrac - 1, noiseYFrac - 1, 0), fadeX),
+				fadeY
+			);
+		}  // for x
+	}  // for y
 }
 
 
 
 
 
-void cRidgedMultiNoise::Generate2D(
-	NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
-	int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
-	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-	NOISE_DATATYPE * a_Workspace                     ///< Workspace that this function can use and trash
+void cImprovedNoise::Generate3D(
+	NOISE_DATATYPE * a_Array,
+	int a_SizeX, int a_SizeY, int a_SizeZ,
+	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,
+	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,
+	NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ
 ) const
 {
-	if (m_Octaves.empty())
-	{
-		// No work to be done
-		ASSERT(!"RidgedMulti: No octaves to generate!");
-		return;
-	}
-	
-	bool ShouldFreeWorkspace = (a_Workspace == nullptr);
-	int ArrayCount = a_SizeX * a_SizeY;
-	if (ShouldFreeWorkspace)
-	{
-		a_Workspace = new NOISE_DATATYPE[ArrayCount];
-	}
-	
-	// Generate the first octave directly into array:
-	const cOctave & FirstOctave = m_Octaves.front();
-	
-	FirstOctave.m_Noise.Generate2D(
-		a_Workspace, a_SizeX, a_SizeY,
-		a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
-		a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency
-	);
-	NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
-	for (int i = 0; i < ArrayCount; i++)
+	size_t idx = 0;
+	for (int z = 0; z < a_SizeZ; z++)
 	{
-		a_Array[i] = fabs(a_Workspace[i] * Amplitude);
-	}
-	
-	// Add each octave:
-	for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
-	{
-		// Generate cubic noise for the octave:
-		itr->m_Noise.Generate2D(
-			a_Workspace, a_SizeX, a_SizeY,
-			a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
-			a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency
-		);
-		// Add the cubic noise into the output:
-		NOISE_DATATYPE Amplitude = itr->m_Amplitude;
-		for (int i = 0; i < ArrayCount; i++)
+		NOISE_DATATYPE ratioZ = static_cast<NOISE_DATATYPE>(z) / (a_SizeZ - 1);
+		NOISE_DATATYPE noiseZ = Lerp(a_StartZ, a_EndZ, ratioZ);
+		int noiseZInt = FAST_FLOOR(noiseZ);
+		int zCoord = noiseZInt & 255;
+		NOISE_DATATYPE noiseZFrac = noiseZ - noiseZInt;
+		NOISE_DATATYPE fadeZ = Fade(noiseZFrac);
+		for (int y = 0; y < a_SizeY; y++)
 		{
-			a_Array[i] += fabs(a_Workspace[i] * Amplitude);
-		}
-	}
-	
-	if (ShouldFreeWorkspace)
-	{
-		delete[] a_Workspace;
-		a_Workspace = nullptr;
-	}
+			NOISE_DATATYPE ratioY = static_cast<NOISE_DATATYPE>(y) / (a_SizeY - 1);
+			NOISE_DATATYPE noiseY = Lerp(a_StartY, a_EndY, ratioY);
+			int noiseYInt = FAST_FLOOR(noiseY);
+			int yCoord = noiseYInt & 255;
+			NOISE_DATATYPE noiseYFrac = noiseY - noiseYInt;
+			NOISE_DATATYPE fadeY = Fade(noiseYFrac);
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				NOISE_DATATYPE ratioX = static_cast<NOISE_DATATYPE>(x) / (a_SizeX - 1);
+				NOISE_DATATYPE noiseX = Lerp(a_StartX, a_EndX, ratioX);
+				int noiseXInt = FAST_FLOOR(noiseX);
+				int xCoord = noiseXInt & 255;
+				NOISE_DATATYPE noiseXFrac = noiseX - noiseXInt;
+				NOISE_DATATYPE fadeX = Fade(noiseXFrac);
+
+				// Hash the coordinates:
+				int A  = m_Perm[xCoord] + yCoord;
+				int AA = m_Perm[A] + zCoord;
+				int AB = m_Perm[A + 1] + zCoord;
+				int B  = m_Perm[xCoord + 1] + yCoord;
+				int BA = m_Perm[B] + zCoord;
+				int BB = m_Perm[B + 1] + zCoord;
+
+				// Lerp the gradients:
+				// TODO: This may be optimized by swapping the coords and recalculating most lerps only "once every x"
+				a_Array[idx++] = Lerp(
+					Lerp(
+						Lerp(Grad(m_Perm[AA], noiseXFrac, noiseYFrac,     noiseZFrac), Grad(m_Perm[BA], noiseXFrac - 1, noiseYFrac,     noiseZFrac), fadeX),
+						Lerp(Grad(m_Perm[AB], noiseXFrac, noiseYFrac - 1, noiseZFrac), Grad(m_Perm[BB], noiseXFrac - 1, noiseYFrac - 1, noiseZFrac), fadeX),
+						fadeY
+					),
+					Lerp(
+						Lerp(Grad(m_Perm[AA + 1], noiseXFrac, noiseYFrac,     noiseZFrac - 1), Grad(m_Perm[BA + 1], noiseXFrac - 1, noiseYFrac,     noiseZFrac - 1), fadeX),
+						Lerp(Grad(m_Perm[AB + 1], noiseXFrac, noiseYFrac - 1, noiseZFrac - 1), Grad(m_Perm[BB + 1], noiseXFrac - 1, noiseYFrac - 1, noiseZFrac - 1), fadeX),
+						fadeY
+					),
+					fadeZ
+				);
+			}  // for x
+		}  // for y
+	}  // for z
 }
 
 
 
 
 
-void cRidgedMultiNoise::Generate3D(
-	NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
-	int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
-	NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-	NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-	NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ,  ///< Noise-space coords of the array in the Z direction
-	NOISE_DATATYPE * a_Workspace                     ///< Workspace that this function can use and trash
-) const
+NOISE_DATATYPE cImprovedNoise::GetValueAt(int a_X, int a_Y, int a_Z)
 {
-	if (m_Octaves.empty())
-	{
-		// No work to be done
-		ASSERT(!"RidgedMulti: No octaves to generate!");
-		return;
-	}
-	
-	bool ShouldFreeWorkspace = (a_Workspace == nullptr);
-	int ArrayCount = a_SizeX * a_SizeY * a_SizeZ;
-	if (ShouldFreeWorkspace)
-	{
-		a_Workspace = new NOISE_DATATYPE[ArrayCount];
-	}
-	
-	// Generate the first octave directly into array:
-	const cOctave & FirstOctave = m_Octaves.front();
-
-	FirstOctave.m_Noise.Generate3D(
-		a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
-		a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
-		a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency,
-		a_StartZ * FirstOctave.m_Frequency, a_EndZ * FirstOctave.m_Frequency
-	);
-	NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
-	for (int i = 0; i < ArrayCount; i++)
-	{
-		a_Array[i] = a_Workspace[i] * Amplitude;
-	}
-	
-	// Add each octave:
-	for (cOctaves::const_iterator itr = m_Octaves.begin() + 1, end = m_Octaves.end(); itr != end; ++itr)
-	{
-		// Generate cubic noise for the octave:
-		itr->m_Noise.Generate3D(
-			a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
-			a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
-			a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency,
-			a_StartZ * itr->m_Frequency, a_EndZ * itr->m_Frequency
-		);
-		// Add the cubic noise into the output:
-		NOISE_DATATYPE Amplitude = itr->m_Amplitude;
-		for (int i = 0; i < ArrayCount; i++)
-		{
-			a_Array[i] += a_Workspace[i] * Amplitude;
-		}
-	}
-	
-	if (ShouldFreeWorkspace)
-	{
-		delete[] a_Workspace;
-		a_Workspace = nullptr;
-	}
+	// Hash the coordinates:
+	a_X = a_X & 255;
+	a_Y = a_Y & 255;
+	a_Z = a_Z & 255;
+	int A  = m_Perm[a_X] + a_Y;
+	int AA = m_Perm[A] + a_Z;
+
+	return Grad(m_Perm[AA], 1, 1, 1);
 }
 
 
 
 
+
diff --git a/src/Noise.h b/src/Noise/Noise.h
index 9a3f24556..323194bfd 100644
--- a/src/Noise.h
+++ b/src/Noise/Noise.h
@@ -7,22 +7,11 @@
 
 #include <cmath>
 
+/** The datatype used by all the noise generators. */
+typedef float NOISE_DATATYPE;
 
-
-
-
-// Some settings
-#define NOISE_DATATYPE float
-
-
-
-
-
-#ifdef _MSC_VER
-	#define INLINE __forceinline
-#else
-	#define INLINE inline
-#endif
+#include "OctavedNoise.h"
+#include "RidgedNoise.h"
 
 
 
@@ -35,20 +24,20 @@ public:
 	cNoise(const cNoise & a_Noise);
 
 	// The following functions, if not marked INLINE, are about 20 % slower
-	INLINE NOISE_DATATYPE IntNoise1D(int a_X) const;
-	INLINE NOISE_DATATYPE IntNoise2D(int a_X, int a_Y) const;
-	INLINE NOISE_DATATYPE IntNoise3D(int a_X, int a_Y, int a_Z) const;
+	inline NOISE_DATATYPE IntNoise1D(int a_X) const;
+	inline NOISE_DATATYPE IntNoise2D(int a_X, int a_Y) const;
+	inline NOISE_DATATYPE IntNoise3D(int a_X, int a_Y, int a_Z) const;
 
 	// Return a float number in the specified range:
-	INLINE NOISE_DATATYPE IntNoise2DInRange(int a_X, int a_Y, float a_Min, float a_Max) const
+	inline NOISE_DATATYPE IntNoise2DInRange(int a_X, int a_Y, float a_Min, float a_Max) const
 	{
 		return a_Min + std::abs(IntNoise2D(a_X, a_Y)) * (a_Max - a_Min);
 	}
 
 	// Note: These functions have a mod8-irregular chance - each of the mod8 remainders has different chance of occurrence. Divide by 8 to rectify.
-	INLINE int IntNoise1DInt(int a_X) const;
-	INLINE int IntNoise2DInt(int a_X, int a_Y) const;
-	INLINE int IntNoise3DInt(int a_X, int a_Y, int a_Z) const;
+	inline int IntNoise1DInt(int a_X) const;
+	inline int IntNoise2DInt(int a_X, int a_Y) const;
+	inline int IntNoise3DInt(int a_X, int a_Y, int a_Z) const;
 
 	NOISE_DATATYPE LinearNoise1D(NOISE_DATATYPE a_X) const;
 	NOISE_DATATYPE CosineNoise1D(NOISE_DATATYPE a_X) const;
@@ -61,9 +50,9 @@ public:
 
 	void SetSeed(int a_Seed) { m_Seed = a_Seed; }
 
-	INLINE static NOISE_DATATYPE CubicInterpolate (NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_C, NOISE_DATATYPE a_D, NOISE_DATATYPE a_Pct);
-	INLINE static NOISE_DATATYPE CosineInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_Pct);
-	INLINE static NOISE_DATATYPE LinearInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_Pct);
+	inline static NOISE_DATATYPE CubicInterpolate (NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_C, NOISE_DATATYPE a_D, NOISE_DATATYPE a_Pct);
+	inline static NOISE_DATATYPE CosineInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_Pct);
+	inline static NOISE_DATATYPE LinearInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B, NOISE_DATATYPE a_Pct);
 
 private:
 	int m_Seed;
@@ -76,19 +65,15 @@ private:
 class cCubicNoise
 {
 public:
-	static const int MAX_SIZE = 512;  ///< Maximum size of each dimension of the query arrays.
+	/** Maximum size of each dimension of the query arrays. */
+	static const int MAX_SIZE = 512;
 	
 	
+	/** Creates a new instance with the specified seed. */
 	cCubicNoise(int a_Seed);
 	
 	
-	void Generate1D(
-		NOISE_DATATYPE * a_Array,                        ///< Array to generate into
-		int a_SizeX,                                     ///< Count of the array
-		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX   ///< Noise-space coords of the array
-	) const;
-	
-	
+	/** Fills a 2D array with the values of the noise. */
 	void Generate2D(
 		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
 		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
@@ -97,6 +82,7 @@ public:
 	) const;
 	
 	
+	/** Fills a 3D array with the values of the noise. */
 	void Generate3D(
 		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
 		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
@@ -106,163 +92,87 @@ public:
 	) const;
 	
 protected:
-	typedef NOISE_DATATYPE Workspace1D[4];
-	typedef NOISE_DATATYPE Workspace2D[4][4];
-	
-	cNoise m_Noise;  // Used for integral rnd values
-
-	#ifdef _DEBUG
-		// Statistics on the noise-space coords:
-		static int m_NumSingleX;
-		static int m_NumSingleXY;
-		static int m_NumSingleY;
-		static int m_NumCalls;
-	#endif  // _DEBUG
 	
-	/// Calculates the integral and fractional parts along one axis.
+	/** Noise used for integral random values. */
+	cNoise m_Noise;
+
+
+	/** Calculates the integral and fractional parts along one axis.
+	a_Floor will receive the integral parts (array of a_Size ints).
+	a_Frac will receive the fractional parts (array of a_Size floats).
+	a_Same will receive the counts of items that have the same integral parts (array of up to a_Size ints).
+	a_NumSame will receive the count of a_Same elements (total count of different integral parts). */
 	void CalcFloorFrac(
 		int a_Size,
 		NOISE_DATATYPE a_Start, NOISE_DATATYPE a_End,
 		int * a_Floor, NOISE_DATATYPE * a_Frac,
 		int * a_Same, int & a_NumSame
 	) const;
-	
-	void UpdateWorkRnds2DX(
-		Workspace2D & a_WorkRnds,
-		Workspace1D & a_Interps,
-		int a_LastFloorX, int a_NewFloorX,
-		int a_FloorY,
-		NOISE_DATATYPE a_FractionY
-	) const;
 } ;
 
 
 
 
 
-class cPerlinNoise
+/** Improved noise, as described by Ken Perlin: http://mrl.nyu.edu/~perlin/paper445.pdf
+Implementation adapted from Perlin's Java implementation: http://mrl.nyu.edu/~perlin/noise/ */
+class cImprovedNoise
 {
 public:
-	cPerlinNoise(void);
-	cPerlinNoise(int a_Seed);
-	
-	
-	void SetSeed(int a_Seed);
-	
-	void AddOctave(NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude);
-	
-	void Generate1D(
-		NOISE_DATATYPE * a_Array,                        ///< Array to generate into
-		int a_SizeX,                                     ///< Count of the array
-		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
-	) const;
-	
-	
+	/** Constructs a new instance of the noise obbject.
+	Note that this operation is quite expensive (the permutation array being constructed). */
+	cImprovedNoise(int a_Seed);
+
+
+	/** Fills a 2D array with the values of the noise. */
 	void Generate2D(
 		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
 		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
 		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY   ///< Noise-space coords of the array in the Y direction
 	) const;
 	
 	
+	/** Fills a 3D array with the values of the noise. */
 	void Generate3D(
 		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
 		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
 		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
 		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ,  ///< Noise-space coords of the array in the Z direction
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
+		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ   ///< Noise-space coords of the array in the Z direction
 	) const;
-	
+
+	/** Returns the value at the specified integral coords. Used for raw speed measurement. */
+	NOISE_DATATYPE GetValueAt(int a_X, int a_Y, int a_Z);
+
 protected:
-	class cOctave
+
+	/** The permutation table used by the noise function. Initialized using seed. */
+	int m_Perm[512];
+
+
+	/** Calculates the fade curve, 6 * t^5 - 15 * t^4 + 10 * t^3. */
+	inline static NOISE_DATATYPE Fade(NOISE_DATATYPE a_T)
 	{
-	public:
-		cCubicNoise m_Noise;
-		
-		NOISE_DATATYPE m_Frequency;  // Coord multiplier
-		NOISE_DATATYPE m_Amplitude;  // Value multiplier
-		
-		cOctave(int a_Seed, NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude) :
-			m_Noise(a_Seed),
-			m_Frequency(a_Frequency),
-			m_Amplitude(a_Amplitude)
-		{
-		}
-	} ;
-	
-	typedef std::vector<cOctave> cOctaves;
-	
-	int      m_Seed;
-	cOctaves m_Octaves;
-} ;
+		return a_T * a_T * a_T * (a_T * (a_T * 6 - 15) + 10);
+	}
 
+	/** Returns the gradient value based on the hash. */
+	inline static NOISE_DATATYPE Grad(int a_Hash, NOISE_DATATYPE a_X, NOISE_DATATYPE a_Y, NOISE_DATATYPE a_Z)
+	{
+		int hash = a_Hash % 16;
+		NOISE_DATATYPE u = (hash < 8) ? a_X : a_Y;
+		NOISE_DATATYPE v = (hash < 4) ? a_Y : (((hash == 12) || (hash == 14)) ? a_X : a_Z);
+		return (((hash & 1) == 0) ? u : -u) + (((hash & 2) == 0) ? v : -v);
+	}
+};
 
 
 
 
-class cRidgedMultiNoise
-{
-public:
-	cRidgedMultiNoise(void);
-	cRidgedMultiNoise(int a_Seed);
-	
-	
-	void SetSeed(int a_Seed);
-	
-	void AddOctave(NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude);
-	
-	void Generate1D(
-		NOISE_DATATYPE * a_Array,                        ///< Array to generate into
-		int a_SizeX,                                     ///< Count of the array
-		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
-	) const;
-	
-	
-	void Generate2D(
-		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
-		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
-		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
-	) const;
-	
-	
-	void Generate3D(
-		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
-		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
-		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
-		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
-		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ,  ///< Noise-space coords of the array in the Z direction
-		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash
-	) const;
-	
-protected:
-	class cOctave
-	{
-	public:
-		cCubicNoise m_Noise;
-		
-		NOISE_DATATYPE m_Frequency;  // Coord multiplier
-		NOISE_DATATYPE m_Amplitude;  // Value multiplier
-		
-		cOctave(int a_Seed, NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude) :
-			m_Noise(a_Seed),
-			m_Frequency(a_Frequency),
-			m_Amplitude(a_Amplitude)
-		{
-		}
-	} ;
-	
-	typedef std::vector<cOctave> cOctaves;
-	
-	int      m_Seed;
-	cOctaves m_Octaves;
-} ;
+
+typedef cOctavedNoise<cCubicNoise> cPerlinNoise;
+typedef cOctavedNoise<cRidgedNoise<cCubicNoise>> cRidgedMultiNoise;
 
 
 
@@ -376,8 +286,46 @@ NOISE_DATATYPE cNoise::LinearInterpolate(NOISE_DATATYPE a_A, NOISE_DATATYPE a_B,
 ////////////////////////////////////////////////////////////////////////////////
 // Global functions:
 
-extern void Debug2DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, const AString & a_FileNameBase);
-extern void Debug3DNoise(const NOISE_DATATYPE * a_Noise, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase);
+/** Exports the noise array into a file.
+a_Coeff specifies the value that each array value is multiplied by before being converted into a byte. */
+extern void Debug2DNoise(const NOISE_DATATYPE * a_Array, int a_SizeX, int a_SizeY, const AString & a_FileNameBase, NOISE_DATATYPE a_Coeff = 32);
+
+/** Exports the noise array into a set of files, ordered by XY and XZ.
+a_Coeff specifies the value that each array value is multiplied by before being converted into a byte. */
+extern void Debug3DNoise(const NOISE_DATATYPE * a_Array, int a_SizeX, int a_SizeY, int a_SizeZ, const AString & a_FileNameBase, NOISE_DATATYPE a_Coeff = 32);
+
+
+
+
+/** Linearly interpolates between two values.
+Assumes that a_Ratio is in range [0, 1]. */
+inline NOISE_DATATYPE Lerp(NOISE_DATATYPE a_Val1, NOISE_DATATYPE a_Val2, NOISE_DATATYPE a_Ratio)
+{
+	return a_Val1 + (a_Val2 - a_Val1) * a_Ratio;
+}
+
+
+
+
+
+/** Linearly interpolates between two values, clamping the ratio to [0, 1] first. */
+inline NOISE_DATATYPE ClampedLerp(NOISE_DATATYPE a_Val1, NOISE_DATATYPE a_Val2, NOISE_DATATYPE a_Ratio)
+{
+	if (a_Ratio < 0)
+	{
+		return a_Val1;
+	}
+	if (a_Ratio > 1)
+	{
+		return a_Val2;
+	}
+	return Lerp(a_Val1, a_Val2, a_Ratio);
+}
+
+
+
+
+
 
 
 
diff --git a/src/Noise/OctavedNoise.h b/src/Noise/OctavedNoise.h
new file mode 100644
index 000000000..855117289
--- /dev/null
+++ b/src/Noise/OctavedNoise.h
@@ -0,0 +1,192 @@
+
+// OctavedNoise.h
+
+// Implements the cOctavedNoise class template representing a noise generator that layers several octaves of another noise
+
+
+
+
+
+#pragma once
+
+
+
+
+
+template <typename N>
+class cOctavedNoise
+{
+public:
+	cOctavedNoise(int a_Seed = 0):
+		m_Seed(a_Seed)
+	{
+	}
+
+
+	/** Sets a new seed for the generators. Relays the seed to all underlying octaves. */
+	void SetSeed(int a_Seed)
+	{
+		m_Seed = a_Seed;
+		for (auto oct: m_Octaves)
+		{
+			oct->SetSeed(a_Seed);
+		}
+	}
+
+
+	/** Adds a new octave to the list of octaves that compose this noise. */
+	void AddOctave(NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude)
+	{
+		m_Octaves.emplace_back(m_Seed, a_Frequency, a_Amplitude);
+	}
+
+
+	/** Fills a 2D array with the values of the noise. */
+	void Generate2D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
+		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
+		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash.
+	) const
+	{
+		// Check that state is alright:
+		if (m_Octaves.empty())
+		{
+			ASSERT(!"cOctavedNoise: No octaves to generate!");
+			return;
+		}
+
+		// Allocate the workspace on the heap, if it wasn't given:
+		std::unique_ptr<NOISE_DATATYPE[]> workspaceHeap;
+		if (a_Workspace == nullptr)
+		{
+			workspaceHeap.reset(new NOISE_DATATYPE[a_SizeX * a_SizeY]);
+			a_Workspace = workspaceHeap.get();
+		}
+
+		// Generate the first octave directly into array:
+		const cOctave & FirstOctave = m_Octaves.front();
+		int ArrayCount = a_SizeX * a_SizeY;
+		FirstOctave.m_Noise.Generate2D(
+			a_Workspace, a_SizeX, a_SizeY,
+			a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
+			a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency
+		);
+		NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
+		for (int i = 0; i < ArrayCount; i++)
+		{
+			a_Array[i] = a_Workspace[i] * Amplitude;
+		}
+
+		// Add each octave:
+		for (auto itr = m_Octaves.cbegin() + 1, end = m_Octaves.cend(); itr != end; ++itr)
+		{
+			// Generate the noise for the octave:
+			itr->m_Noise.Generate2D(
+				a_Workspace, a_SizeX, a_SizeY,
+				a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
+				a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency
+			);
+			// Add it into the output:
+			NOISE_DATATYPE Amplitude = itr->m_Amplitude;
+			for (int i = 0; i < ArrayCount; i++)
+			{
+				a_Array[i] += a_Workspace[i] * Amplitude;
+			}
+		}  // for itr - m_Octaves[]
+	}
+
+
+	/** Fills a 3D array with the values of the noise. */
+	void Generate3D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
+		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
+		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ,  ///< Noise-space coords of the array in the Z direction
+		NOISE_DATATYPE * a_Workspace = nullptr           ///< Workspace that this function can use and trash, same size as a_Array
+	) const
+	{
+		// Check that state is alright:
+		if (m_Octaves.empty())
+		{
+			ASSERT(!"cOctavedNoise: No octaves to generate!");
+			return;
+		}
+
+		// Allocate the workspace on the heap, if it wasn't given:
+		std::unique_ptr<NOISE_DATATYPE[]> workspaceHeap;
+		if (a_Workspace == nullptr)
+		{
+			workspaceHeap.reset(new NOISE_DATATYPE[a_SizeX * a_SizeY * a_SizeZ]);
+			a_Workspace = workspaceHeap.get();
+		}
+
+		// Generate the first octave directly into array:
+		const cOctave & FirstOctave = m_Octaves.front();
+		int ArrayCount = a_SizeX * a_SizeY * a_SizeZ;
+		FirstOctave.m_Noise.Generate3D(
+			a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
+			a_StartX * FirstOctave.m_Frequency, a_EndX * FirstOctave.m_Frequency,
+			a_StartY * FirstOctave.m_Frequency, a_EndY * FirstOctave.m_Frequency,
+			a_StartZ * FirstOctave.m_Frequency, a_EndZ * FirstOctave.m_Frequency
+		);
+		NOISE_DATATYPE Amplitude = FirstOctave.m_Amplitude;
+		for (int i = 0; i < ArrayCount; i++)
+		{
+			a_Array[i] = a_Workspace[i] * Amplitude;
+		}
+
+		// Add each octave:
+		for (auto itr = m_Octaves.cbegin() + 1, end = m_Octaves.cend(); itr != end; ++itr)
+		{
+			// Generate the noise for the octave:
+			itr->m_Noise.Generate3D(
+				a_Workspace, a_SizeX, a_SizeY, a_SizeZ,
+				a_StartX * itr->m_Frequency, a_EndX * itr->m_Frequency,
+				a_StartY * itr->m_Frequency, a_EndY * itr->m_Frequency,
+				a_StartZ * itr->m_Frequency, a_EndZ * itr->m_Frequency
+			);
+			// Add it into the output:
+			NOISE_DATATYPE Amplitude = itr->m_Amplitude;
+			for (int i = 0; i < ArrayCount; i++)
+			{
+				a_Array[i] += a_Workspace[i] * Amplitude;
+			}
+		}  // for itr - m_Octaves[]
+	}
+
+protected:
+	/** Stores information and state for one octave of the noise. */
+	class cOctave
+	{
+	public:
+		N m_Noise;
+		
+		/** Coord multiplier. */
+		NOISE_DATATYPE m_Frequency;
+
+		/** Value multiplier. */
+		NOISE_DATATYPE m_Amplitude;
+
+		cOctave(int a_Seed, NOISE_DATATYPE a_Frequency, NOISE_DATATYPE a_Amplitude) :
+			m_Noise(a_Seed),
+			m_Frequency(a_Frequency),
+			m_Amplitude(a_Amplitude)
+		{
+		}
+	} ;
+	typedef std::vector<cOctave> cOctaves;
+
+
+	/** The seed used by the underlying generators. */
+	int m_Seed;
+
+	/** The octaves that compose this noise. */
+	cOctaves m_Octaves;
+};
+
+
+
+
diff --git a/src/Noise/RidgedNoise.h b/src/Noise/RidgedNoise.h
new file mode 100644
index 000000000..69b480f60
--- /dev/null
+++ b/src/Noise/RidgedNoise.h
@@ -0,0 +1,91 @@
+
+// RidgedNoise.h
+
+// Implements the cRidgedNoise template class that generates ridged noise based on another noise provider.
+
+
+
+
+
+#pragma once
+
+
+
+
+
+template <typename N>
+class cRidgedNoise
+{
+public:
+	/** Creates a new instance with the seed set to 0. */
+	cRidgedNoise(void):
+		m_Noise(0)
+	{
+	}
+
+
+	/** Creates a new instance with the specified seed. */
+	cRidgedNoise(int a_Seed):
+		m_Noise(a_Seed)
+	{
+	}
+
+
+	/** Sets the seed for the underlying noise. */
+	void SetSeed(int a_Seed)
+	{
+		m_Noise.SetSeed(a_Seed);
+	}
+
+
+	/** Fills a 2D array with the values of the noise. */
+	void Generate2D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y]
+		int a_SizeX, int a_SizeY,                        ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY   ///< Noise-space coords of the array in the Y direction
+	) const
+	{
+		int ArrayCount = a_SizeX * a_SizeY;
+		m_Noise.Generate2D(
+			a_Array, a_SizeX, a_SizeY,
+			a_StartX, a_EndX,
+			a_StartY, a_EndY
+		);
+		for (int i = 0; i < ArrayCount; i++)
+		{
+			a_Array[i] = fabs(a_Array[i]);
+		}
+	}
+
+
+	/** Fills a 3D array with the values of the noise. */
+	void Generate3D(
+		NOISE_DATATYPE * a_Array,                        ///< Array to generate into [x + a_SizeX * y + a_SizeX * a_SizeY * z]
+		int a_SizeX, int a_SizeY, int a_SizeZ,           ///< Count of the array, in each direction
+		NOISE_DATATYPE a_StartX, NOISE_DATATYPE a_EndX,  ///< Noise-space coords of the array in the X direction
+		NOISE_DATATYPE a_StartY, NOISE_DATATYPE a_EndY,  ///< Noise-space coords of the array in the Y direction
+		NOISE_DATATYPE a_StartZ, NOISE_DATATYPE a_EndZ   ///< Noise-space coords of the array in the Z direction
+	) const
+	{
+		int ArrayCount = a_SizeX * a_SizeY * a_SizeZ;
+		m_Noise.Generate2D(
+			a_Array, a_SizeX, a_SizeY, a_SizeZ,
+			a_StartX, a_EndX,
+			a_StartY, a_EndY,
+			a_StartZ, a_EndZ
+		);
+		for (int i = 0; i < ArrayCount; i++)
+		{
+			a_Array[i] = fabs(a_Array[i]);
+		}
+	}
+
+protected:
+	N m_Noise;
+} ;
+
+
+
+
+