From 735eb4c55a793352bf90dc0f0fdcb59e3c2b2a09 Mon Sep 17 00:00:00 2001 From: dooglus Date: Wed, 10 Oct 2007 03:21:31 +0000 Subject: [PATCH] Use 'ftime' instead of 'f' as the floating point time variable to make it easier to search for. git-svn-id: http://svn.voria.com/code@885 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/mod_noise/noise.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.cpp b/synfig-core/trunk/src/modules/mod_noise/noise.cpp index 1bfa73c..309efc9 100644 --- a/synfig-core/trunk/src/modules/mod_noise/noise.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/noise.cpp @@ -98,7 +98,7 @@ Noise::color_func(const Point &point, float pixel_size,Context /*context*/)const time=speed*curr_time; Random::SmoothType smooth((!speed && Noise::smooth == Random::SMOOTH_SPLINE) ? Random::SMOOTH_FAST_SPLINE : Noise::smooth); - float t(time); + float ftime(time); { float amount=0.0f; @@ -107,15 +107,15 @@ Noise::color_func(const Point &point, float pixel_size,Context /*context*/)const float alpha=0.0f; for(i=0;i1)amount=1; if(super_sample&&pixel_size) { - amount2=random(smooth,0+(detail-i)*5,x2,y,t)+amount2*0.5; + amount2=random(smooth,0+(detail-i)*5,x2,y,ftime)+amount2*0.5; if(amount2<-1)amount2=-1;if(amount2>1)amount2=1; - amount3=random(smooth,0+(detail-i)*5,x,y2,t)+amount3*0.5; + amount3=random(smooth,0+(detail-i)*5,x,y2,ftime)+amount3*0.5; if(amount3<-1)amount3=-1;if(amount3>1)amount3=1; if(turbulent) @@ -130,7 +130,7 @@ Noise::color_func(const Point &point, float pixel_size,Context /*context*/)const if(do_alpha) { - alpha=random(smooth,3+(detail-i)*5,x,y,t)+alpha*0.5; + alpha=random(smooth,3+(detail-i)*5,x,y,ftime)+alpha*0.5; if(alpha<-1)alpha=-1;if(alpha>1)alpha=1; } @@ -142,7 +142,7 @@ Noise::color_func(const Point &point, float pixel_size,Context /*context*/)const x*=0.5f; y*=0.5f; - //t*=0.5f; + //ftime*=0.5f; } if(!turbulent) -- 2.7.4