nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Expose the perlin class publically

Browse Source
This commit is contained in:
Danny Robson 2012-05-17 14:37:56 +10:00
parent 3b8f4597bf
commit fd64e95a7d
2 changed files with 95 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
perlin.cpp
View File

@ -34,24 +34,17 @@
#define LERP(a,b,t) lerp::quintic (a, b, t) #define LERP(a,b,t) lerp::quintic (a, b, t)
struct params {
typedef size_t seed_t;
unsigned octaves;
double persistence;
double frequency;
seed_t seed;
// Just a random generator [-1.0, 1.0] // Just a random generator [-1.0, 1.0]
double double
generate (intmax_t x, intmax_t y) const { util::perlin::generate (intmax_t x, intmax_t y) const {
intmax_t n = x + 257 * y; intmax_t n = x + 257 * y;
n = (n << 13U) ^ n ^ (intmax_t)seed; n = (n << 13U) ^ n ^ (intmax_t)seed;
return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0); return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);
} }
double double
eval (double x, double y) const { util::perlin::eval (double x, double y) const {
intmax_t x_int = intmax_t (x); intmax_t x_int = intmax_t (x);
double x_fac = x - x_int; double x_fac = x - x_int;
intmax_t y_int = intmax_t (y); intmax_t y_int = intmax_t (y);
@ -69,8 +62,9 @@ struct params {
y_fac); y_fac);
} }
double double
sample (double x, double y) const { util::perlin::sample (double x, double y) const {
double total = 0.0; double total = 0.0;
for (size_t i = 0; i < octaves; ++i) { for (size_t i = 0; i < octaves; ++i) {
@ -84,28 +78,34 @@ struct params {
return (1.0 + total) / 2.0; return (1.0 + total) / 2.0;
} }
params ():
util::perlin::perlin ():
octaves (3), octaves (3),
persistence (0.5),
frequency (25.0), frequency (25.0),
persistence (0.5),
seed (util::random<size_t> ()) seed (util::random<size_t> ())
{ ; } { ; }
};
static void util::perlin::perlin (unsigned _octaves,
perlin2d (uint8_t *restrict pixels, size_t width, size_t height, const params& p) { double _frequency,
for (size_t y = 0; y < height; ++y) double _persistence,
for (size_t x = 0; x < width; ++x) { seed_t _seed):
double v = p.sample (x / double (width), y / double (height)); /*perlin2d (x / double (width), octaves (_octaves),
y / double (height), frequency (_frequency),
(size_t)pixels);*/ persistence (_persistence),
pixels[x + y * width] = v * std::numeric_limits<uint8_t>::max (); seed (_seed)
} { ; }
}
void void
perlin2d (uint8_t *restrict pixels, size_t width, size_t height) { util::perlin2d (uint8_t *restrict pixels,
perlin2d (pixels, width, height, params ()); size_t width,
size_t height,
const perlin &p) {
for (size_t y = 0; y < height; ++y)
for (size_t x = 0; x < width; ++x) {
double v = p.sample (x / double (width), y / double (height));
pixels[x + y * width] = v * std::numeric_limits<uint8_t>::max ();
}
} }

26
perlin.hpp
View File

@ -24,6 +24,30 @@
#include <cstdlib> #include <cstdlib>
void perlin2d (uint8_t *restrict pixels, size_t width, size_t height); namespace util {
struct perlin {
typedef size_t seed_t;
unsigned octaves;
double frequency;
double persistence;
seed_t seed;
perlin ();
perlin (unsigned octaves,
double frequency,
double persistence,
seed_t seed);
double sample (double x, double y) const;
protected:
double generate (intmax_t x, intmax_t y) const;
double eval (double x, double y) const;
};
void perlin2d (uint8_t *restrict pixels, size_t width, size_t height, const perlin&);
}
#endif #endif