X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;h=0ff63465ef1f4d9e1584ca24eeb971cf48b6fbb2;hb=6cc8cddfa878d0436918fcbcf6d38c0c150b9dd3;hp=c94b6f63863d7b091414dbb117f663a91f4ad162;hpb=f3811d84dcb407eb7c6915d524b3902b9535fb3e;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp index c94b6f6..0ff6346 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -151,14 +151,18 @@ SpiralGradient::color_func(const Point &pos, float supersample)const dist-=floor(dist); if(dist+supersample*0.5>1.0) { - Color pool(gradient(dist,supersample*0.5).premult_alpha()*(1.0-(dist-supersample*0.5))); - pool+=gradient((dist+supersample*0.5)-1.0,supersample*0.5).premult_alpha()*((dist+supersample*0.5)-1.0); + float left(supersample*0.5-(dist-1.0)); + float right(supersample*0.5+(dist-1.0)); + Color pool(gradient(1.0-(left*0.5),left).premult_alpha()*left/supersample); + pool+=gradient(right*0.5,right).premult_alpha()*right/supersample; return pool.demult_alpha(); } if(dist-supersample*0.5<0.0) { - Color pool(gradient(dist,supersample*0.5).premult_alpha()*(dist+supersample*0.5)); - pool+=gradient(1.0-(dist-supersample*0.5),supersample*0.5).premult_alpha()*(-(dist-supersample*0.5)); + float left(supersample*0.5-dist); + float right(supersample*0.5+dist); + Color pool(gradient(right*0.5,right).premult_alpha()*right/supersample); + pool+=gradient(1.0-left*0.5,left).premult_alpha()*left/supersample; return pool.demult_alpha(); }