Initial commit, basic infrastructure
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
#config
|
||||
INCLUDES+=.
|
||||
LIBS+=
|
||||
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
|
||||
|
||||
#source
|
||||
CXXSRC=$(wildcard *.cpp)
|
||||
|
||||
#objects
|
||||
OBJDIR=obj
|
||||
OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
|
||||
|
||||
#output
|
||||
OUTDIR=..
|
||||
OUT=$(addprefix $(OUTDIR)/,libcommon.a)
|
||||
|
||||
#targets
|
||||
all: $(OBJ) $(OUT)
|
||||
ar -crs $(OUT) $(OBJ)
|
||||
|
||||
$(OBJ): | $(OBJDIR)
|
||||
|
||||
$(OUT): | $(OUTDIR)
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
$(OUTDIR):
|
||||
mkdir $(OUTDIR)
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
||||
|
||||
clean:
|
||||
$(RM) *.o *.a *.exe
|
||||
|
||||
rebuild: clean all
|
||||
@@ -0,0 +1,91 @@
|
||||
/* Copyright: (c) Kayne Ruse 2014
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*/
|
||||
#include "perlin_noise.hpp"
|
||||
|
||||
#include "vector2.hpp"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
//-------------------------
|
||||
//Public access members
|
||||
//-------------------------
|
||||
|
||||
double SimpleRNG::operator()(double x) {
|
||||
x = x * seed * 345589144.0 + 1123581321.0;
|
||||
return fmod(x, 21795.0);
|
||||
};
|
||||
|
||||
Vector2 PerlinNoise::Gradient(Vector2 pos) {
|
||||
//could cache this result
|
||||
double j = rng(pos.y*pos.y + pos.x * 144);
|
||||
double i = rng(pos.x*pos.x + pos.y * 144);
|
||||
Vector2 v(i, j);
|
||||
v.Normalize();
|
||||
return v;
|
||||
}
|
||||
|
||||
double PerlinNoise::Influcence(Vector2 gridPoint, Vector2 queryPoint) {
|
||||
return ScalarProduct(Gradient(gridPoint), queryPoint - gridPoint);
|
||||
}
|
||||
|
||||
double PerlinNoise::Noise(double x, double y, double width, double height) {
|
||||
Vector2 point = {x, y};
|
||||
|
||||
x = Snap(x, width);
|
||||
y = Snap(y, height);
|
||||
|
||||
//determine the grid points
|
||||
Vector2 tl = {x, y};
|
||||
Vector2 tr = {x + width, y};
|
||||
Vector2 bl = {x, y + height};
|
||||
Vector2 br = {x + width, y + height};
|
||||
|
||||
//influence equasion
|
||||
double s = Influcence(tl, point);
|
||||
double t = Influcence(tr, point);
|
||||
double u = Influcence(bl, point);
|
||||
double v = Influcence(br, point);
|
||||
|
||||
//get the noise
|
||||
double a = s + Curve((t - s) / width);
|
||||
double b = u + Curve((v - u) / width);
|
||||
return a + Curve((b - a) / height);
|
||||
}
|
||||
|
||||
//-------------------------
|
||||
//Static utility functions
|
||||
//-------------------------
|
||||
|
||||
double PerlinNoise::Curve(double x) {
|
||||
//param: 0 to 1 inclusive
|
||||
return 3.0 * pow(x, 2.0) - 2.0 * pow(x, 3.0);
|
||||
}
|
||||
|
||||
double PerlinNoise::Snap(double x, double base) {
|
||||
//snap to a grid (floating point version)
|
||||
return floor(x / base) * base;
|
||||
}
|
||||
|
||||
double PerlinNoise::ScalarProduct(Vector2 lhs, Vector2 rhs) {
|
||||
//the dot product
|
||||
return lhs.x * rhs.x + lhs.y * rhs.y;
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
/* Copyright: (c) Kayne Ruse 2014
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*/
|
||||
#ifndef PERLINNOISE_HPP_
|
||||
#define PERLINNOISE_HPP_
|
||||
|
||||
#include "vector2.hpp"
|
||||
|
||||
class SimpleRNG {
|
||||
public:
|
||||
SimpleRNG() = default;
|
||||
SimpleRNG(double x) { SetSeed(x); }
|
||||
|
||||
double SetSeed(double s) { return seed = s; }
|
||||
double GetSeed() { return seed; }
|
||||
|
||||
double operator()(double x);
|
||||
|
||||
private:
|
||||
double seed = 8891.0;
|
||||
};
|
||||
|
||||
class PerlinNoise {
|
||||
public:
|
||||
PerlinNoise() = default;
|
||||
~PerlinNoise() = default;
|
||||
|
||||
Vector2 Gradient(Vector2);
|
||||
double Influcence(Vector2 gridPoint, Vector2 queryPoint);
|
||||
|
||||
double Noise(double x, double y, double width, double height);
|
||||
private:
|
||||
static inline double Curve(double x);
|
||||
static inline double Snap(double x, double base);
|
||||
static inline double ScalarProduct(Vector2 lhs, Vector2 rhs);
|
||||
|
||||
SimpleRNG rng;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,108 @@
|
||||
/* Copyright: (c) Kayne Ruse 2013, 2014
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any damages
|
||||
* arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any purpose,
|
||||
* including commercial applications, and to alter it and redistribute it
|
||||
* freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you must not
|
||||
* claim that you wrote the original software. If you use this software
|
||||
* in a product, an acknowledgment in the product documentation would be
|
||||
* appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and must not be
|
||||
* misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*/
|
||||
#ifndef VECTOR2_HPP_
|
||||
#define VECTOR2_HPP_
|
||||
|
||||
#include <type_traits>
|
||||
#include <stdexcept>
|
||||
#include <cmath>
|
||||
|
||||
class Vector2 {
|
||||
public:
|
||||
double x, y;
|
||||
|
||||
Vector2() = default;
|
||||
Vector2(double i, double j): x(i), y(j) {};
|
||||
~Vector2() = default;
|
||||
Vector2& operator=(Vector2 const&) = default;
|
||||
|
||||
double Length() const {
|
||||
return sqrt(x*x+y*y);
|
||||
}
|
||||
double SquaredLength() const {
|
||||
return x*x+y*y;
|
||||
}
|
||||
void Normalize() {
|
||||
double l = Length();
|
||||
x /= l;
|
||||
y /= l;
|
||||
}
|
||||
|
||||
//Arithmetic operators
|
||||
Vector2 operator+(Vector2 v) const {
|
||||
Vector2 ret;
|
||||
ret.x = x + v.x;
|
||||
ret.y = y + v.y;
|
||||
return ret;
|
||||
}
|
||||
Vector2 operator-(Vector2 v) const {
|
||||
Vector2 ret;
|
||||
ret.x = x - v.x;
|
||||
ret.y = y - v.y;
|
||||
return ret;
|
||||
}
|
||||
Vector2 operator*(Vector2 v) const {
|
||||
Vector2 ret;
|
||||
ret.x = x * v.x;
|
||||
ret.y = y * v.y;
|
||||
return ret;
|
||||
}
|
||||
Vector2 operator*(double d) const {
|
||||
Vector2 ret;
|
||||
ret.x = x * d;
|
||||
ret.y = y * d;
|
||||
return ret;
|
||||
}
|
||||
|
||||
Vector2 operator/(Vector2 v) {
|
||||
if (!v.x || !v.y)
|
||||
throw(std::domain_error("Divide by zero"));
|
||||
Vector2 ret;
|
||||
ret.x = x / v.x;
|
||||
ret.y = y / v.y;
|
||||
return ret;
|
||||
}
|
||||
Vector2 operator/(double d) {
|
||||
if (!d)
|
||||
throw(std::domain_error("Divide by zero"));
|
||||
Vector2 ret;
|
||||
ret.x = x / d;
|
||||
ret.y = y / d;
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
|
||||
bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
|
||||
|
||||
//member templates (curry the above operators)
|
||||
template<typename T> Vector2 operator+=(T t) { return *this = *this + t; }
|
||||
template<typename T> Vector2 operator-=(T t) { return *this = *this - t; }
|
||||
template<typename T> Vector2 operator*=(T t) { return *this = *this * t; }
|
||||
template<typename T> Vector2 operator/=(T t) { return *this = *this / t; }
|
||||
template<typename T> bool operator==(T t) { return (x == t && y == t); }
|
||||
template<typename T> bool operator!=(T t) { return (x != t || y != t); }
|
||||
};
|
||||
|
||||
//This is explicitly a POD
|
||||
static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user