X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fconicalgradient.cpp;h=69a04c759be608fe4ce608a13e10fbb02d7618a2;hb=6e6b8ce1d75be6a6b99d2cc955faeeea80d62c26;hp=7a6ba1c8b871e13d0908da0d08d9110a1e00f9a6;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp index 7a6ba1c..69a04c7 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp @@ -5,16 +5,17 @@ ** $Id: conicalgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ ** ** \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 */ /* ========================================================================= */ @@ -71,7 +72,7 @@ ConicalGradient::ConicalGradient(): symmetric(false) { } - + bool ConicalGradient::set_param(const String & param, const ValueBase &value) { @@ -92,15 +93,15 @@ ConicalGradient::get_param(const String ¶m)const EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Layer::Vocab ConicalGradient::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - + ret.push_back(ParamDesc("gradient") .set_local_name(_("Gradient")) ); @@ -108,7 +109,7 @@ ConicalGradient::get_param_vocab()const ret.push_back(ParamDesc("center") .set_local_name(_("Center")) ); - + ret.push_back(ParamDesc("angle") .set_local_name(_("Angle")) .set_origin("center") @@ -117,7 +118,7 @@ ConicalGradient::get_param_vocab()const ret.push_back(ParamDesc("symmetric") .set_local_name(_("Symmetric")) ); - + return ret; } @@ -128,7 +129,7 @@ ConicalGradient::color_func(const Point &pos, float supersample)const Angle::rot a=Angle::tan(-centered[1],centered[0]).mod(); a+=angle; Real dist(a.mod().get()); - + dist-=floor(dist); if(symmetric) @@ -206,13 +207,13 @@ Color ConicalGradient::get_color(Context context, const Point &pos)const { const Color color(color_func(pos)); - + if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT) return color; else return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); } - + bool ConicalGradient::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { @@ -230,7 +231,7 @@ ConicalGradient::accelerated_render(Context context,Surface *surface,int quality return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -239,7 +240,7 @@ ConicalGradient::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) { if(quality<9)