X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Flineargradient.cpp;h=603e76125758cdecb99ebe18c70ed71610344b49;hb=c25902b514d64fd65c96ed56171bcd205d19d699;hp=f067666c7fab7947c7e9ea1d3c5010b35e383ae3;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp index f067666..603e761 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp @@ -1,18 +1,22 @@ -/*! ======================================================================== -** Synfig -** Template File -** $Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file lineargradient.cpp +** \brief Template Header ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** 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 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. +** +** 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 ** ** === N O T E S =========================================================== ** @@ -49,7 +53,7 @@ SYNFIG_LAYER_SET_NAME(LinearGradient,"linear_gradient"); SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient")); SYNFIG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients")); SYNFIG_LAYER_SET_VERSION(LinearGradient,"0.0"); -SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id$"); /* === P R O C E D U R E S ================================================= */ @@ -78,10 +82,10 @@ inline Color LinearGradient::color_func(const Point &point, float supersample)const { Real dist(point*diff-p1*diff); - + if(loop) dist-=floor(dist); - + if(zigzag) { dist*=2.0; @@ -93,14 +97,20 @@ LinearGradient::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(); } } @@ -128,13 +138,13 @@ LinearGradient::hit_check(synfig::Context context, const synfig::Point &point)co bool LinearGradient::set_param(const String & param, const ValueBase &value) { - if(param=="p1" && value.same_as(p1)) + if(param=="p1" && value.same_type_as(p1)) { p1=value.get(p1); sync(); return true; } - if(param=="p2" && value.same_as(p2)) + if(param=="p2" && value.same_type_as(p2)) { p2=value.get(p2); sync(); @@ -142,12 +152,12 @@ LinearGradient::set_param(const String & param, const ValueBase &value) } //IMPORT(p1); //IMPORT(p2); - - + + IMPORT(gradient); IMPORT(loop); IMPORT(zigzag); - return Layer_Composite::set_param(param,value); + return Layer_Composite::set_param(param,value); } ValueBase @@ -158,18 +168,18 @@ LinearGradient::get_param(const String & param)const EXPORT(gradient); EXPORT(loop); EXPORT(zigzag); - + EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Layer::Vocab LinearGradient::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - + ret.push_back(ParamDesc("p1") .set_local_name(_("Point 1")) .set_connect("p2") @@ -186,7 +196,7 @@ LinearGradient::get_param_vocab()const ret.push_back(ParamDesc("zigzag") .set_local_name(_("ZigZag")) ); - + return ret; } @@ -218,7 +228,7 @@ LinearGradient::accelerated_render(Context context,Surface *surface,int quality, return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -227,7 +237,7 @@ LinearGradient::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