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

n/basis: move basis code into inline headers

Browse Source
This commit is contained in:
Danny Robson 2015-06-01 18:42:10 +10:00
parent f6e2e6a409
commit 59909ed860
10 changed files with 338 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -139,12 +139,12 @@ UTIL_FILES = \
noise/basis/constant.cpp \
noise/basis/constant.hpp \
noise/basis/constant.ipp \
noise/basis/value.cpp \
noise/basis/value.hpp \
noise/basis/perlin.cpp \
noise/basis/value.ipp \
noise/basis/perlin.hpp \
noise/basis/worley.cpp \
noise/basis/perlin.ipp \
noise/basis/worley.hpp \
noise/basis/worley.ipp \
noise/fractal/fbm.hpp \
noise/fractal/fbm.ipp \
noise/fractal/hetero.hpp \

127
noise/basis/perlin.cpp
View File

@ -1,127 +0,0 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#include "perlin.hpp"
#include "../../hash/murmur/murmur2.hpp"
using util::noise::basis::perlin;
///////////////////////////////////////////////////////////////////////////////
template <typename T>
util::vector<2,T>
generate (util::point<2,intmax_t> p, uint64_t seed)
{
using util::hash::murmur2::mix;
auto u = mix (seed, mix (uint64_t (p.x), uint64_t (p.y)));
auto v = mix (u, seed);
auto r = util::vector<2,T> {
(u & 0xffff) / T{0xffff},
(v & 0xffff) / T{0xffff}
} * 2 - 1;
CHECK_GE (r, T{-1});
CHECK_LE (r, T{ 1});
return r;
}
///////////////////////////////////////////////////////////////////////////////
template <typename T, util::noise::lerp_t<T> L>
perlin<T,L>::perlin (seed_t _seed):
seed (_seed)
{ ; }
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
perlin<T,L>::perlin ():
seed (time (nullptr))
{ ; }
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
util::range<T>
perlin<T,L>::bounds (void) const
{
return {
-std::sqrt (T{2}) / 2,
std::sqrt (T{2}) / 2
};
}
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
T
perlin<T,L>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int);
// generate the corner positions
auto p0 = p_int + util::vector<2,intmax_t> { 0, 0 };
auto p1 = p_int + util::vector<2,intmax_t> { 1, 0 };
auto p2 = p_int + util::vector<2,intmax_t> { 0, 1 };
auto p3 = p_int + util::vector<2,intmax_t> { 1, 1 };
// generate the corner gradients
auto g0 = generate<T> (p0, this->seed);
auto g1 = generate<T> (p1, this->seed);
auto g2 = generate<T> (p2, this->seed);
auto g3 = generate<T> (p3, this->seed);
// compute the dot products
T v0 = dot (g0, p - p0);
T v1 = dot (g1, p - p1);
T v2 = dot (g2, p - p2);
T v3 = dot (g3, p - p3);
// interpolate the results
auto L0 = L (v0, v1, p_rem.x);
auto L1 = L (v2, v3, p_rem.x);
auto L_ = L (L0, L1, p_rem.y);
return L_;
}
///////////////////////////////////////////////////////////////////////////////
#include "../lerp.hpp"
namespace util { namespace noise { namespace basis {
template struct perlin<float, lerp::linear>;
template struct perlin<float, lerp::cosine>;
template struct perlin<float, lerp::cubic>;
template struct perlin<float, lerp::quintic>;
template struct perlin<float, lerp::trunc>;
template struct perlin<double, lerp::linear>;
template struct perlin<double, lerp::cosine>;
template struct perlin<double, lerp::cubic>;
template struct perlin<double, lerp::quintic>;
template struct perlin<double, lerp::trunc>;
} } }

7
noise/basis/perlin.hpp
View File

@ -30,10 +30,15 @@ namespace util { namespace noise { namespace basis {
perlin ();
range<T> bounds (void) const;
T operator() (util::point<2,T>) const;
T operator() (point<2,T>) const;
seed_t seed;
private:
constexpr vector<2,T> gradient (point<2,intmax_t>) const;
};
} } }
#include "perlin.ipp"
#endif

109
noise/basis/perlin.ipp Normal file
View File

@ -0,0 +1,109 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#ifdef __UTIL_NOISE_BASIS_PERLIN_IPP
#error
#endif
#define __UTIL_NOISE_BASIS_PERLIN_IPP
#include "../../hash/murmur/murmur2.hpp"
namespace util { namespace noise { namespace basis {
///////////////////////////////////////////////////////////////////////////
template <typename T, util::noise::lerp_t<T> L>
perlin<T,L>::perlin (seed_t _seed):
seed (_seed)
{ ; }
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
perlin<T,L>::perlin ():
seed (time (nullptr))
{ ; }
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
util::range<T>
perlin<T,L>::bounds (void) const
{
return {
-std::sqrt (T{2}) / 2,
std::sqrt (T{2}) / 2
};
}
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
T
perlin<T,L>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int);
// generate the corner positions
auto p0 = p_int + util::vector<2,intmax_t> { 0, 0 };
auto p1 = p_int + util::vector<2,intmax_t> { 1, 0 };
auto p2 = p_int + util::vector<2,intmax_t> { 0, 1 };
auto p3 = p_int + util::vector<2,intmax_t> { 1, 1 };
// generate the corner gradients
auto g0 = gradient (p0);
auto g1 = gradient (p1);
auto g2 = gradient (p2);
auto g3 = gradient (p3);
// compute the dot products
T v0 = dot (g0, p - p0);
T v1 = dot (g1, p - p1);
T v2 = dot (g2, p - p2);
T v3 = dot (g3, p - p3);
// interpolate the results
auto L0 = L (v0, v1, p_rem.x);
auto L1 = L (v2, v3, p_rem.x);
auto L_ = L (L0, L1, p_rem.y);
return L_;
}
///////////////////////////////////////////////////////////////////////////
template <typename T, lerp_t<T> L>
constexpr vector<2,T>
perlin<T,L>::gradient (point<2,intmax_t> p) const
{
using util::hash::murmur2::mix;
auto u = mix (seed, mix (uint64_t (p.x), uint64_t (p.y)));
auto v = mix (u, seed);
auto r = util::vector<2,T> {
(u & 0xffff) / T{0xffff},
(v & 0xffff) / T{0xffff}
} * 2 - 1;
CHECK_GE (r, T{-1});
CHECK_LE (r, T{ 1});
return r;
}
} } }

116
noise/basis/value.cpp
View File

@ -1,116 +0,0 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#include "value.hpp"
#include "../../hash/murmur/murmur2.hpp"
using util::noise::basis::value;
///////////////////////////////////////////////////////////////////////////////
// Generate a type from [-UNIT..UNIT]
template <typename T>
T
generate (util::point<2,intmax_t> p, uint64_t seed)
{
using util::hash::murmur2::mix;
T v = mix (
seed,
mix (
uint64_t (p.y),
uint64_t (p.x)
)
) & 0xffff;
v = v / T{0xffff} * 2 - 1;
return v;
}
///////////////////////////////////////////////////////////////////////////////
template <typename T, util::noise::lerp_t<T> L>
value<T,L>::value (seed_t _seed):
seed (_seed)
{ ; }
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
value<T,L>::value ():
seed (time (nullptr))
{ ; }
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
util::range<T>
value<T,L>::bounds (void) const
{
return { -1, 1 };
}
//-----------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
T
value<T,L>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int);
// generate the corner points
auto p0 = p_int + util::vector<2,intmax_t> { 0, 0 };
auto p1 = p_int + util::vector<2,intmax_t> { 1, 0 };
auto p2 = p_int + util::vector<2,intmax_t> { 0, 1 };
auto p3 = p_int + util::vector<2,intmax_t> { 1, 1 };
// Generate the four corner values
T g0 = generate<T> (p0, this->seed);
T g1 = generate<T> (p1, this->seed);
T g2 = generate<T> (p2, this->seed);
T g3 = generate<T> (p3, this->seed);
// Interpolate on one dimension, then the other.
auto l0 = L (g0, g1, p_rem.x);
auto l1 = L (g2, g3, p_rem.x);
auto l_ = L (l0, l1, p_rem.y);
return l_;
}
///////////////////////////////////////////////////////////////////////////////
#include "../lerp.hpp"
namespace util { namespace noise { namespace basis {
template struct value<float, lerp::trunc>;
template struct value<float, lerp::cosine>;
template struct value<float, lerp::linear>;
template struct value<float, lerp::cubic>;
template struct value<float, lerp::quintic>;
template struct value<double, lerp::trunc>;
template struct value<double, lerp::linear>;
template struct value<double, lerp::cubic>;
template struct value<double, lerp::quintic>;
} } }

5
noise/basis/value.hpp
View File

@ -33,7 +33,12 @@ namespace util { namespace noise { namespace basis {
T operator() (util::point<2,T>) const;
seed_t seed;
private:
constexpr T generate (point<2,intmax_t>) const;
};
} } }
#include "value.ipp"
#endif

100
noise/basis/value.ipp Normal file
View File

@ -0,0 +1,100 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#ifdef __UTIL_NOISE_BASIS_VALUE_IPP
#error
#endif
#define __UTIL_NOISE_BASIS_VALIE_IPP
#include "../../hash/murmur/murmur2.hpp"
namespace util { namespace noise { namespace basis {
///////////////////////////////////////////////////////////////////////////
template <typename T, util::noise::lerp_t<T> L>
value<T,L>::value (seed_t _seed):
seed (_seed)
{ ; }
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
value<T,L>::value ():
seed (time (nullptr))
{ ; }
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
util::range<T>
value<T,L>::bounds (void) const
{
return { -1, 1 };
}
//-------------------------------------------------------------------------
template <typename T, util::noise::lerp_t<T> L>
T
value<T,L>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int);
// generate the corner points
auto p0 = p_int + util::vector<2,intmax_t> { 0, 0 };
auto p1 = p_int + util::vector<2,intmax_t> { 1, 0 };
auto p2 = p_int + util::vector<2,intmax_t> { 0, 1 };
auto p3 = p_int + util::vector<2,intmax_t> { 1, 1 };
// Generate the four corner values
T g0 = generate (p0);
T g1 = generate (p1);
T g2 = generate (p2);
T g3 = generate (p3);
// Interpolate on one dimension, then the other.
auto l0 = L (g0, g1, p_rem.x);
auto l1 = L (g2, g3, p_rem.x);
auto l_ = L (l0, l1, p_rem.y);
return l_;
}
///////////////////////////////////////////////////////////////////////////
// Generate a type from [-UNIT..UNIT]
template <typename T, lerp_t<T> L>
constexpr T
value<T,L>::generate (point<2,intmax_t> p) const
{
using util::hash::murmur2::mix;
T v = mix (
seed,
mix (
uint64_t (p.y),
uint64_t (p.x)
)
) & 0xffff;
v = v / T{0xffff} * 2 - 1;
return v;
}
} } }

113
noise/basis/worley.cpp
View File

@ -1,113 +0,0 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#include "worley.hpp"
#include "../../hash/murmur/murmur2.hpp"
using util::noise::basis::worley;
///////////////////////////////////////////////////////////////////////////////
template <typename T>
util::point<2,T>
generate (util::point<2,intmax_t> p, uint64_t seed)
{
using util::hash::murmur2::mix;
auto u = mix (seed, mix (uint64_t (p.x), uint64_t (p.y)));
auto v = mix (u, seed);
auto r = util::point<2,T> {
(u & 0xffff) / T{0xffff},
(v & 0xffff) / T{0xffff}
};
CHECK_LIMIT (r, T{0}, T{1});
return r;
}
///////////////////////////////////////////////////////////////////////////////
template <typename T, size_t F>
worley<T,F>::worley (seed_t _seed):
seed (_seed)
{ ; }
//-----------------------------------------------------------------------------
template <typename T, size_t F>
worley<T,F>::worley ():
worley (time (nullptr))
{ ; }
//-----------------------------------------------------------------------------
template <typename T, size_t F>
util::range<T>
worley<T,F>::bounds (void) const
{
return { 0.0, 1.5 };
}
//-----------------------------------------------------------------------------
template <typename T, size_t F>
T
worley<T,F>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int).template as<point> ();
// setup an array of distances
static constexpr size_t RADIUS = 1;
static constexpr size_t COUNT = pow2 (RADIUS * 2 + 1);
T distances[COUNT] = { std::numeric_limits<T>::quiet_NaN () };
T *cursor = distances;
// record the distances to each candidate point
for (signed y_off = -signed(RADIUS); y_off <= signed(RADIUS) ; ++y_off) {
for (signed x_off = -signed(RADIUS); x_off <= signed(RADIUS); ++x_off) {
auto off = vector<2,intmax_t> {x_off, y_off};
auto pos = generate<T> (p_int + off, this->seed);
CHECK_LIMIT (pos.x, T{0}, T{1});
CHECK_LIMIT (pos.y, T{0}, T{1});
*cursor = distance2 (pos + off, p_rem);
cursor++;
}
}
// find the f'th lowest value
static_assert (F < COUNT, "worley order must be less than search radius");
std::partial_sort (distances, distances + F, distances + COUNT);
CHECK_GE (distances[F], 0);
return distances[F];
}
///////////////////////////////////////////////////////////////////////////////
#include "../lerp.hpp"
namespace util { namespace noise { namespace basis {
template struct worley<float>;
template struct worley<double>;
} } }

6
noise/basis/worley.hpp
View File

@ -32,6 +32,12 @@ namespace util { namespace noise { namespace basis {
T operator() (util::point<2,T>) const;
seed_t seed;
private:
constexpr point<2,T> generate (point<2,intmax_t>) const;
};
} } }
#include "worley.ipp"
#endif

109
noise/basis/worley.ipp Normal file
View File

@ -0,0 +1,109 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
*/
#ifdef __UTIL_NOISE_BASIS_WORLEY_IPP
#error
#endif
#define __UTIL_NOISE_BASIS_WORLEY_IPP
#include "../../debug.hpp"
#include "../../hash/murmur/murmur2.hpp"
namespace util { namespace noise { namespace basis {
///////////////////////////////////////////////////////////////////////////
template <typename T, size_t F>
worley<T,F>::worley (seed_t _seed):
seed (_seed)
{ ; }
//-------------------------------------------------------------------------
template <typename T, size_t F>
worley<T,F>::worley ():
worley (time (nullptr))
{ ; }
//-------------------------------------------------------------------------
template <typename T, size_t F>
util::range<T>
worley<T,F>::bounds (void) const
{
return { 0.0, 1.5 };
}
//-------------------------------------------------------------------------
template <typename T, size_t F>
T
worley<T,F>::operator() (util::point<2,T> p) const
{
// extract integer and fractional parts. be careful to always round down
// (particularly with negatives) and avoid rounding errors.
auto p_int = p.template cast<intmax_t> ();
if (p.x < 0) p_int.x -= 1;
if (p.y < 0) p_int.y -= 1;
auto p_rem = abs (p - p_int).template as<point> ();
// setup an array of distances
static constexpr size_t RADIUS = 1;
static constexpr size_t COUNT = pow2 (RADIUS * 2 + 1);
T distances[COUNT] = { std::numeric_limits<T>::quiet_NaN () };
T *cursor = distances;
// record the distances to each candidate point
for (signed y_off = -signed(RADIUS); y_off <= signed(RADIUS) ; ++y_off) {
for (signed x_off = -signed(RADIUS); x_off <= signed(RADIUS); ++x_off) {
auto off = vector<2,intmax_t> {x_off, y_off};
auto pos = generate (p_int + off);
CHECK_LIMIT (pos.x, T{0}, T{1});
CHECK_LIMIT (pos.y, T{0}, T{1});
*cursor = distance2 (pos + off, p_rem);
cursor++;
}
}
// find the f'th lowest value
static_assert (F < COUNT, "worley order must be less than search radius");
std::partial_sort (distances, distances + F, distances + COUNT);
CHECK_GE (distances[F], 0);
return distances[F];
}
//////////////////////////////////////////////////////////////////////////
template <typename T, size_t F>
constexpr point<2,T>
worley<T,F>::generate (point<2,intmax_t> p) const
{
using util::hash::murmur2::mix;
auto u = mix (seed, mix (uint64_t (p.x), uint64_t (p.y)));
auto v = mix (u, seed);
auto r = util::point<2,T> {
(u & 0xffff) / T{0xffff},
(v & 0xffff) / T{0xffff}
};
CHECK_LIMIT (r, T{0}, T{1});
return r;
}
} } }