Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_noise / distort.cpp

diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
index 49b5572..1660c7d 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp
+++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file noise.cpp
-**     \brief blehh
+/*!    \file distort.cpp
+**     \brief Implementation of the "Noise Distort" layer
 **
-**     $Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -52,10 +53,10 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(NoiseDistort);
 SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
-SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort"));
-SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions"));
+SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,N_("Noise Distort"));
+SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,N_("Distortions"));
 SYNFIG_LAYER_SET_VERSION(NoiseDistort,"0.0");
-SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -65,7 +66,7 @@ NoiseDistort::NoiseDistort():
        size(1,1)
 {
        set_blend_method(Color::BLEND_STRAIGHT);
-       smooth=2;
+       smooth=RandomNoise::SMOOTH_COSINE;
        detail=4;
        speed=0;
        random.set_seed(time(NULL));
@@ -74,7 +75,7 @@ NoiseDistort::NoiseDistort():
 }
 
 inline Color
-NoiseDistort::color_func(const Point &point, float supersample,Context context)const
+NoiseDistort::color_func(const Point &point, float /*supersample*/,Context context)const
 {
        Color ret(0,0,0,0);
 
@@ -84,7 +85,8 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c
        int i;
        Time time;
        time=speed*curr_time;
-       int smooth((!speed && smooth==3)?5:smooth);
+       RandomNoise::SmoothType temp_smooth(smooth);
+       RandomNoise::SmoothType smooth((!speed && temp_smooth == RandomNoise::SMOOTH_SPLINE) ? RandomNoise::SMOOTH_FAST_SPLINE : temp_smooth);
 
        {
                Vector vect(0,0);
@@ -120,7 +122,7 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c
 }
 
 inline float
-NoiseDistort::calc_supersample(const synfig::Point &x, float pw,float ph)const
+NoiseDistort::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const
 {
        return 0.0f;
 }
@@ -154,7 +156,7 @@ NoiseDistort::hit_check(synfig::Context context, const synfig::Point &point)cons
 bool
 NoiseDistort::set_param(const String & param, const ValueBase &value)
 {
-       if(param=="seed" && value.same_as(int()))
+       if(param=="seed" && value.same_type_as(int()))
        {
                random.set_seed(value.get(int()));
                return true;
@@ -199,17 +201,17 @@ NoiseDistort::get_param_vocab()const
                .set_local_name(_("Size"))
        );
        ret.push_back(ParamDesc("seed")
-               .set_local_name(_("Random Seed"))
+               .set_local_name(_("RandomNoise Seed"))
        );
        ret.push_back(ParamDesc("smooth")
                .set_local_name(_("Interpolation"))
                .set_description(_("What type of interpolation to use"))
                .set_hint("enum")
-               .add_enum_value(0,"nearest",_("Nearest Neighbor"))
-               .add_enum_value(1,"linear",_("Linear"))
-               .add_enum_value(2,"cosine",_("Cosine"))
-               .add_enum_value(3,"spline",_("Spline"))
-               .add_enum_value(4,"cubic",_("Cubic"))
+               .add_enum_value(RandomNoise::SMOOTH_DEFAULT,    "nearest",      _("Nearest Neighbor"))
+               .add_enum_value(RandomNoise::SMOOTH_LINEAR,     "linear",       _("Linear"))
+               .add_enum_value(RandomNoise::SMOOTH_COSINE,     "cosine",       _("Cosine"))
+               .add_enum_value(RandomNoise::SMOOTH_SPLINE,     "spline",       _("Spline"))
+               .add_enum_value(RandomNoise::SMOOTH_CUBIC,      "cubic",        _("Cubic"))
        );
        ret.push_back(ParamDesc("detail")
                .set_local_name(_("Detail"))