Zoom layers change the size of their content's bounding box. Fixed the get_full_boun...

[synfig.git] / synfig-core / trunk / src / modules / lyr_std / radialgradient.cpp

diff --git a/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp b/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp
index de36ed8..373ac26 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/radialgradient.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file layer_solidcolor.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file lyr_std/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 <config.h>
 #endif
 
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
 
 #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 &param)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"))
@@ -125,7 +126,7 @@ RadialGradient::get_param_vocab()const
        ret.push_back(ParamDesc("zigzag")
                .set_local_name(_("Zig-Zag"))
        );
-       
+
        return ret;
 }
 
@@ -133,7 +134,7 @@ inline Color
 RadialGradient::color_func(const Point &point, float supersample)const
 {
        Real dist((point-center).mag()/radius);
-       
+
        if(zigzag)
        {
                dist*=2.0;
@@ -172,20 +173,20 @@ RadialGradient::color_func(const Point &point, float supersample)const
                        }
                }
        }
-       
+
        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<RadialGradient*>(this);
@@ -206,7 +207,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
 {
@@ -224,7 +225,7 @@ RadialGradient::accelerated_render(Context context,Surface *surface,int quality,
                        return true;
        }
 
-               
+
        int x,y;
 
        Surface::pen pen(surface->begin());
@@ -233,7 +234,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<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)