X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnoise.hpp;h=cbfd48ee441ad62722490a8f51e4c4150a58484a;hb=1121e49e7cad94ce4efd0a02c72a44469c81494e;hp=30bf5279defb3d36b5f2fed5548135d25a561191;hpb=f62562b0f87d571bd7b32ae2f8ca659c24e9911b;p=blank.git

diff --git a/src/noise.hpp b/src/noise.hpp
index 30bf527..cbfd48e 100644
--- a/src/noise.hpp
+++ b/src/noise.hpp
@@ -1,29 +1,99 @@
 #ifndef BLANK_NOISE_HPP_
 #define BLANK_NOISE_HPP_
 
+#include <cstdint>
+#include <limits>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
+class GaloisLFSR {
+
+public:
+	// seed should be non-zero
+	explicit GaloisLFSR(std::uint64_t seed) noexcept;
+
+	// get the next bit
+	bool operator ()() noexcept;
+
+	template<class T>
+	T operator ()(T &out) noexcept {
+		constexpr int num_bits =
+			std::numeric_limits<T>::digits +
+			std::numeric_limits<T>::is_signed;
+		for (int i = 0; i < num_bits; ++i) {
+			operator ()();
+		}
+		return out = static_cast<T>(state);
+	}
+
+private:
+	std::uint64_t state;
+	// bits 64, 63, 61, and 60 set to 1 (counting from 1 lo to hi)
+	static constexpr std::uint64_t mask = 0xD800000000000000;
+
+};
+
+
 /// (3D only) adaptation of Stefan Gustavson's SimplexNoise java class
 class SimplexNoise {
 
 public:
-	explicit SimplexNoise(unsigned int seed);
+	explicit SimplexNoise(unsigned int seed) noexcept;
 
-	float operator ()(const glm::vec3 &) const;
+	float operator ()(const glm::vec3 &) const noexcept;
 
 private:
-	unsigned char Perm(size_t idx) const;
-	const glm::vec3 &Grad(size_t idx) const;
+	int Perm(int idx) const noexcept;
+	int Perm12(int idx) const noexcept;
+	const glm::vec3 &Grad(int idx) const noexcept;
 
 private:
-	unsigned char perm[256];
+	int perm[512];
+	int perm12[512];
 	glm::vec3 grad[12];
 
 };
 
+
+/// implementation of Worley noise (aka Cell or Voroni noise)
+class WorleyNoise {
+
+public:
+	explicit WorleyNoise(unsigned int seed) noexcept;
+
+	float operator ()(const glm::vec3 &) const noexcept;
+
+private:
+	const unsigned int seed;
+	const int num_points;
+
+};
+
+
+template<class Noise>
+float OctaveNoise(
+	const Noise &noise,
+	const glm::vec3 &in,
+	int num,
+	float persistence,
+	float frequency = 1.0f,
+	float amplitude = 1.0f,
+	float growth = 2.0f
+) {
+	float total = 0.0f;
+	float max = 0.0f;
+	for (int i = 0; i < num; ++i) {
+		total += noise(in * frequency) * amplitude;
+		max += amplitude;
+		amplitude *= persistence;
+		frequency *= growth;
+	}
+
+	return total / max;
+}
+
 }
 
 #endif