X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fradialgradient.cpp;h=8359032eb0a7a68000d3ae11eb287a1b8441d985;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=e4d26dd6cdd6a46ff4e83463507f37f4454fd202;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp index e4d26dd..8359032 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ -/*! \file layer_solidcolor.cpp +/* === S Y N F I G ========================================================= */ +/*! \file mod_gradient/radialgradient.cpp ** \brief Template Header ** -** $Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** 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 */ /* ========================================================================= */ @@ -28,14 +29,14 @@ # include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "radialgradient.h" @@ -45,16 +46,16 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ -SINFG_LAYER_INIT(RadialGradient); -SINFG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); -SINFG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); -SINFG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); -SINFG_LAYER_SET_VERSION(RadialGradient,"0.1"); -SINFG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_INIT(RadialGradient); +SYNFIG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); +SYNFIG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); +SYNFIG_LAYER_SET_VERSION(RadialGradient,"0.1"); +SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id$"); /* === P R O C E D U R E S ================================================= */ @@ -71,7 +72,7 @@ RadialGradient::RadialGradient(): zigzag(false) { } - + bool RadialGradient::set_param(const String & param, const ValueBase &value) { @@ -80,7 +81,7 @@ RadialGradient::set_param(const String & param, const ValueBase &value) IMPORT(radius); IMPORT(loop); IMPORT(zigzag); - + return Layer_Composite::set_param(param,value); } @@ -92,18 +93,18 @@ RadialGradient::get_param(const String ¶m)const EXPORT(radius); EXPORT(loop); EXPORT(zigzag); - + EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Layer::Vocab RadialGradient::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - + ret.push_back(ParamDesc("gradient") .set_local_name(_("Gradient")) ); @@ -111,7 +112,7 @@ RadialGradient::get_param_vocab()const ret.push_back(ParamDesc("center") .set_local_name(_("Center")) ); - + ret.push_back(ParamDesc("radius") .set_local_name(_("Radius")) .set_description(_("This is the radius of the circle")) @@ -124,9 +125,9 @@ RadialGradient::get_param_vocab()const ); ret.push_back(ParamDesc("zigzag") - .set_local_name(_("Zig-Zag")) + .set_local_name(_("ZigZag")) ); - + return ret; } @@ -134,7 +135,7 @@ inline Color RadialGradient::color_func(const Point &point, float supersample)const { Real dist((point-center).mag()/radius); - + if(zigzag) { dist*=2.0; @@ -148,31 +149,37 @@ RadialGradient::color_func(const Point &point, float supersample)const 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); + if (zigzag) pool+=gradient(1.0-right*0.5,right).premult_alpha()*right/supersample; + else 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); + if (zigzag) pool+=gradient(left*0.5,left).premult_alpha()*left/supersample; + else pool+=gradient(1.0-left*0.5,left).premult_alpha()*left/supersample; return pool.demult_alpha(); } } - + return gradient(dist,supersample); } float -RadialGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const +RadialGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { // return sqrt(pw*pw+ph*ph)/radius; return 1.2*pw/radius; } -sinfg::Layer::Handle -RadialGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const +synfig::Layer::Handle +RadialGradient::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); @@ -193,7 +200,7 @@ RadialGradient::get_color(Context context, const Point &pos)const else return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); } - + bool RadialGradient::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { @@ -211,7 +218,7 @@ RadialGradient::accelerated_render(Context context,Surface *surface,int quality, return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -220,7 +227,7 @@ RadialGradient::accelerated_render(Context context,Surface *surface,int quality, Point tl(renddesc.get_tl()); const int w(surface->get_w()); const int h(surface->get_h()); - + if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT) { for(y=0,pos[1]=tl[1];y