X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Frandom.cpp;h=7bc87e5029afae0152d3f3283c709dca15d1a5e5;hb=74c9d19d99ddb6fea06ba49660b031f968da1145;hp=f2858f96552a96e3a74e7f2a560288b14099fe7a;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_noise/random.cpp b/synfig-core/trunk/src/modules/mod_noise/random.cpp index f2858f9..7bc87e5 100644 --- a/synfig-core/trunk/src/modules/mod_noise/random.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/random.cpp @@ -1,20 +1,22 @@ /* === S Y N F I G ========================================================= */ -/*! \file noise.cpp +/*! \file mod_noise/random.cpp ** \brief blehh ** -** $Id: random.cpp,v 1.6 2005/01/17 02:00:19 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -29,43 +31,11 @@ #endif #include "random.h" +#include #include #include #endif -// A fast 32-bit linear congruential random number generator -class quick_rng -{ - unsigned long next; -public: - quick_rng(unsigned long seed):next(seed) { } - - void set_seed(unsigned long x) - { - next=x; - } - - unsigned long i32() - { - static const unsigned long a(1664525); - static const unsigned long c(1013904223); - - return next=next*a+c; - } - - unsigned long i16() - { - return i32()>>16; - } - - float f() - { - static const float m(int(65535)); - - return float(i16())/m; - } -}; - /* === M A C R O S ========================================================= */ #define PI (3.1415927) @@ -81,7 +51,7 @@ Random::set_seed(int x) { seed_=x; } - + float Random::operator()(const int salt,const int x,const int y,const int t)const { @@ -89,19 +59,19 @@ Random::operator()(const int salt,const int x,const int y,const int t)const static const unsigned int b(11213); static const unsigned int c(36979); static const unsigned int d(31337); - + quick_rng rng( ( static_cast(x+y) * a ) ^ ( static_cast(y+t) * b ) ^ ( static_cast(t+x) * c ) ^ - ( static_cast(seed_+salt) * d ) + ( static_cast(seed_+salt) * d ) ); - + return rng.f() * 2.0f - 1.0f; } float -Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const +Random::operator()(SmoothType smooth,int subseed,float xf,float yf,float tf)const { int x((int)floor(xf)); int y((int)floor(yf)); @@ -109,34 +79,33 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const switch(smooth) { - case 4: // cubic + case SMOOTH_CUBIC: // cubic { #define f(j,i,k) ((*this)(subseed,i,j,k)) //Using catmull rom interpolation because it doesn't blur at all + // ( http://www.gamedev.net/reference/articles/article1497.asp ) //bezier curve with intermediate ctrl pts: 0.5/3(p(i+1) - p(i-1)) and similar float xfa [4], tfa[4]; - + //precalculate indices (all clamped) and offset const int xa[] = {x-1,x,x+1,x+2}; - const int ya[] = {y-1,y,y+1,y+2}; - const int ta[] = {t-1,t,t+1,t+2}; - + const float dx(xf-x); const float dy(yf-y); const float dt(tf-t); - + //figure polynomials for each point - const float txf[] = + const float txf[] = { 0.5*dx*(dx*(dx*(-1) + 2) - 1), //-t + 2t^2 -t^3 0.5*(dx*(dx*(3*dx - 5)) + 2), //2 - 5t^2 + 3t^3 0.5*dx*(dx*(-3*dx + 4) + 1), //t + 4t^2 - 3t^3 0.5*dx*dx*(dx-1) //-t^2 + t^3 }; - - const float tyf[] = + + const float tyf[] = { 0.5*dy*(dy*(dy*(-1) + 2) - 1), //-t + 2t^2 -t^3 0.5*(dy*(dy*(3*dy - 5)) + 2), //2 - 5t^2 + 3t^3 @@ -144,15 +113,15 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const 0.5*dy*dy*(dy-1) //-t^2 + t^3 }; - const float ttf[] = + const float ttf[] = { 0.5*dt*(dt*(dt*(-1) + 2) - 1), //-t + 2t^2 -t^3 0.5*(dt*(dt*(3*dt - 5)) + 2), //2 - 5t^2 + 3t^3 0.5*dt*(dt*(-3*dt + 4) + 1), //t + 4t^2 - 3t^3 0.5*dt*dt*(dt-1) //-t^2 + t^3 }; - - //evaluate polynomial for each row + + //evaluate polynomial for each row for(int i = 0; i < 4; ++i) { for(int j = 0; j < 4; ++j) @@ -161,7 +130,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const } xfa[i] = tfa[0]*txf[0] + tfa[1]*txf[1] + tfa[2]*txf[2] + tfa[3]*txf[3]; } - + //return the cumulative column evaluation return xfa[0]*tyf[0] + xfa[1]*tyf[1] + xfa[2]*tyf[2] + xfa[3]*tyf[3]; #undef f @@ -169,7 +138,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const break; - case 5: // Fast Spline (non-animated) + case SMOOTH_FAST_SPLINE: // Fast Spline (non-animated) { #define P(x) (((x)>0)?((x)*(x)*(x)):0.0f) #define R(x) ( P(x+2) - 4.0f*P(x+1) + 6.0f*P(x) - 4.0f*P(x-1) )*(1.0f/6.0f) @@ -177,11 +146,11 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const #define FT(i,j,k) ((*this)(subseed,i+x,j+y,k+t)*(R((i)-a)*R(b-(j))*R((k)-c))) #define Z(i,j) ret+=F(i,j) #define ZT(i,j,k) ret+=FT(i,j,k) -#define X(i,j) // placeholder... To make box more symetric -#define XT(i,j,k) // placeholder... To make box more symetric - +#define X(i,j) // placeholder... To make box more symmetric +#define XT(i,j,k) // placeholder... To make box more symmetric + float a(xf-x), b(yf-y); - + // Interpolate float ret(F(0,0)); Z(-1,-1); Z(-1, 0); Z(-1, 1); Z(-1, 2); @@ -191,11 +160,11 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const return ret; } - - case 3: // Spline (animated) + + case SMOOTH_SPLINE: // Spline (animated) { float a(xf-x), b(yf-y), c(tf-t); - + // Interpolate float ret(FT(0,0,0)); ZT(-1,-1,-1); ZT(-1, 0,-1); ZT(-1, 1,-1); ZT(-1, 2,-1); @@ -217,7 +186,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const ZT( 0,-1, 2); ZT( 0, 0, 2); ZT( 0, 1, 2); ZT( 0, 2, 2); ZT( 1,-1, 2); ZT( 1, 0, 2); ZT( 1, 1, 2); ZT( 1, 2, 2); ZT( 2,-1, 2); ZT( 2, 0, 2); ZT( 2, 1, 2); ZT( 2, 2, 2); - + return ret; /* @@ -242,7 +211,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const #undef P #undef R - case 2: // Cosine + case SMOOTH_COSINE: if((float)t==tf) { int x((int)floor(xf)); @@ -266,19 +235,19 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const float b=yf-y; float c=tf-t; - a=(1.0f-cos(a*3.1415927))*0.5f; - b=(1.0f-cos(b*3.1415927))*0.5f; - + a=(1.0f-cos(a*PI))*0.5f; + b=(1.0f-cos(b*PI))*0.5f; + // We don't perform this on the time axis, otherwise we won't // get smooth motion - //c=(1.0f-cos(c*3.1415927))*0.5f; - + //c=(1.0f-cos(c*PI))*0.5f; + float d=1.0-a; float e=1.0-b; float f=1.0-c; - + int x2=x+1,y2=y+1,t2=t+1; - + return (*this)(subseed,x,y,t)*(d*e*f)+ (*this)(subseed,x2,y,t)*(a*e*f)+ @@ -289,7 +258,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const (*this)(subseed,x,y2,t2)*(d*b*c)+ (*this)(subseed,x2,y2,t2)*(a*b*c); } - case 1: // Linear + case SMOOTH_LINEAR: if((float)t==tf) { int x((int)floor(xf)); @@ -307,17 +276,17 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const } else { - + float a=xf-x; float b=yf-y; float c=tf-t; - + float d=1.0-a; float e=1.0-b; float f=1.0-c; - + int x2=x+1,y2=y+1,t2=t+1; - + return (*this)(subseed,x,y,t)*(d*e*f)+ (*this)(subseed,x2,y,t)*(a*e*f)+ @@ -329,7 +298,7 @@ Random::operator()(int smooth,int subseed,float xf,float yf,float tf)const (*this)(subseed,x2,y2,t2)*(a*b*c); } default: - case 0: + case SMOOTH_DEFAULT: return (*this)(subseed,x,y,t); } }