X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;h=c4330a870b90873c94a725e7216888580d092d6e;hb=28f28705612902c15cd0702cc891fba35bf2d2df;hp=8386c2504af4016cf2f4ae87a651441287fadae2;hpb=16b3beced25134bef064705568ecb893a6be4e79;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 8386c25..c4330a8 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file spiralgradient.cpp ** \brief Template Header ** @@ -28,14 +28,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "spiralgradient.h" @@ -45,16 +45,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(SpiralGradient); -SINFG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient")); -SINFG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(SpiralGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(SpiralGradient,"$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); +SYNFIG_LAYER_INIT(SpiralGradient); +SYNFIG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient")); +SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(SpiralGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(SpiralGradient,"$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $"); /* === P R O C E D U R E S ================================================= */ @@ -165,13 +165,13 @@ SpiralGradient::color_func(const Point &pos, float supersample)const } float -SpiralGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const { return (1.41421*pw/radius+(1.41421*pw/Point(x-center).mag())/(PI*2))*0.5; } -sinfg::Layer::Handle -SpiralGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +SpiralGradient::hit_check(synfig::Context context, const synfig::Point &point)const { if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5) return const_cast(this);