diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/system/PseudoNoise.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/system/PseudoNoise.cpp')
-rw-r--r-- | source/blender/freestyle/intern/system/PseudoNoise.cpp | 112 |
1 files changed, 57 insertions, 55 deletions
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 789583591ab..877cdee0814 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -27,92 +27,94 @@ static int modf_to_index(Freestyle::real x, unsigned int range) { - if (isfinite(x)) { - Freestyle::real tmp; - int i = abs((int)(modf(x, &tmp) * range)); - BLI_assert(i >= 0 && i < range); - return i; - } - else { - return 0; - } + if (isfinite(x)) { + Freestyle::real tmp; + int i = abs((int)(modf(x, &tmp) * range)); + BLI_assert(i >= 0 && i < range); + return i; + } + else { + return 0; + } } namespace Freestyle { real PseudoNoise::_values[]; -PseudoNoise::PseudoNoise() {} +PseudoNoise::PseudoNoise() +{ +} void PseudoNoise::init(long seed) { - RandGen::srand48(seed); - for (unsigned int i = 0; i < NB_VALUE_NOISE; i++) - _values[i] = -1.0 + 2.0 * RandGen::drand48(); + RandGen::srand48(seed); + for (unsigned int i = 0; i < NB_VALUE_NOISE; i++) + _values[i] = -1.0 + 2.0 * RandGen::drand48(); } real PseudoNoise::linearNoise(real x) { - real tmp; - int i = modf_to_index(x, NB_VALUE_NOISE); - real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE]; - real t = modf(x * NB_VALUE_NOISE, &tmp); - return x1 * (1 - t) + x2 * t; + real tmp; + int i = modf_to_index(x, NB_VALUE_NOISE); + real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE]; + real t = modf(x * NB_VALUE_NOISE, &tmp); + return x1 * (1 - t) + x2 * t; } static real LanczosWindowed(real t) { - if (fabs(t) > 2) - return 0; - if (fabs(t) < M_EPSILON) - return 1.0; - return sin(M_PI * t) / (M_PI * t) * sin(M_PI * t / 2.0) / (M_PI * t / 2.0); + if (fabs(t) > 2) + return 0; + if (fabs(t) < M_EPSILON) + return 1.0; + return sin(M_PI * t) / (M_PI * t) * sin(M_PI * t / 2.0) / (M_PI * t / 2.0); } real PseudoNoise::smoothNoise(real x) { - real tmp; - int i = modf_to_index(x, NB_VALUE_NOISE); - int h = i - 1; - if (UNLIKELY(h < 0)) { - h = NB_VALUE_NOISE + h; - } - - real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE]; - real x0 = _values[h], x3 = _values[(i + 2) % NB_VALUE_NOISE]; - - real t = modf(x * NB_VALUE_NOISE, &tmp); - real y0 = LanczosWindowed(-1 -t); - real y1 = LanczosWindowed(-t); - real y2 = LanczosWindowed(1 - t); - real y3 = LanczosWindowed(2 - t); + real tmp; + int i = modf_to_index(x, NB_VALUE_NOISE); + int h = i - 1; + if (UNLIKELY(h < 0)) { + h = NB_VALUE_NOISE + h; + } + + real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE]; + real x0 = _values[h], x3 = _values[(i + 2) % NB_VALUE_NOISE]; + + real t = modf(x * NB_VALUE_NOISE, &tmp); + real y0 = LanczosWindowed(-1 - t); + real y1 = LanczosWindowed(-t); + real y2 = LanczosWindowed(1 - t); + real y3 = LanczosWindowed(2 - t); #if 0 - cerr << "x0=" << x0 << " x1=" << x1 << " x2=" << x2 << " x3=" << x3 << endl; - cerr << "y0=" << y0 << " y1=" << y1 << " y2=" << y2 << " y3=" << y3 << " :" << endl; + cerr << "x0=" << x0 << " x1=" << x1 << " x2=" << x2 << " x3=" << x3 << endl; + cerr << "y0=" << y0 << " y1=" << y1 << " y2=" << y2 << " y3=" << y3 << " :" << endl; #endif - return (x0 * y0 + x1 * y1 + x2 * y2 + x3 * y3) / (y0 + y1 + y2 + y3); + return (x0 * y0 + x1 * y1 + x2 * y2 + x3 * y3) / (y0 + y1 + y2 + y3); } real PseudoNoise::turbulenceSmooth(real x, unsigned nbOctave) { - real y = 0; - real k = 1.0; - for (unsigned int i = 0; i < nbOctave; i++) { - y = y + k * smoothNoise(x * k); - k = k / 2.0; - } - return y; + real y = 0; + real k = 1.0; + for (unsigned int i = 0; i < nbOctave; i++) { + y = y + k * smoothNoise(x * k); + k = k / 2.0; + } + return y; } real PseudoNoise::turbulenceLinear(real x, unsigned nbOctave) { - real y = 0; - real k = 1.0; - for (unsigned int i = 0; i < nbOctave; i++) { - y = y + k * linearNoise(x * k); - k = k / 2.0; - } - return y; + real y = 0; + real k = 1.0; + for (unsigned int i = 0; i < nbOctave; i++) { + y = y + k * linearNoise(x * k); + k = k / 2.0; + } + return y; } } /* namespace Freestyle */ |