X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_particle%2Frandom.cpp;h=ebdff92474e481d874f4638ee40e9f282790ce6c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1fcc00d8bc2f73e9f48bbc7c093c18d6906c9616;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_particle/random.cpp b/synfig-core/trunk/src/modules/mod_particle/random.cpp
index 1fcc00d..ebdff92 100644
--- a/synfig-core/trunk/src/modules/mod_particle/random.cpp
+++ b/synfig-core/trunk/src/modules/mod_particle/random.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -37,6 +38,8 @@
 
 /* === M A C R O S ========================================================= */
 
+#define PI	(3.1415927)
+
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -57,6 +60,10 @@ Random::set_seed(int x)
 	t_mask=rand()+rand()*RAND_MAX;
 }
 
+// this picks one of the POOL_SIZE (256) preset values out of the pool
+// and scales it to be in the range (-1, 1).  is that what it was
+// intended to do?  the distribution is pretty terrible, too, with
+// some elements being picked a hundred times more often than others
 float
 Random::operator()(const int salt,const int x,const int y,const int t)const
 {
@@ -70,7 +77,7 @@ Random::operator()(const int salt,const int x,const int y,const int t)const
 }
 
 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));
@@ -78,10 +85,11 @@ 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];
 
@@ -138,7 +146,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)
@@ -146,8 +154,8 @@ 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);
 
@@ -161,7 +169,7 @@ 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);
 
@@ -211,15 +219,15 @@ 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));
 		int y((int)floor(yf));
 		float a=xf-x;
 		float b=yf-y;
-		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;
 		float c=1.0-a;
 		float d=1.0-b;
 		int x2=x+1,y2=y+1;
@@ -235,12 +243,12 @@ 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;
@@ -258,7 +266,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));
@@ -298,7 +306,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);
 	}
 }