/* === S Y N F I G ========================================================= */
/*! \file distort.cpp
-** \brief blehh
+** \brief Implementation of the "Noise Distort" layer
**
** $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
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$");
size(1,1)
{
set_blend_method(Color::BLEND_STRAIGHT);
- smooth=2;
+ smooth=Random::SMOOTH_COSINE;
detail=4;
speed=0;
random.set_seed(time(NULL));
}
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);
int i;
Time time;
time=speed*curr_time;
- int smooth((!speed && smooth==3)?5:smooth);
+ Random::SmoothType temp_smooth(smooth);
+ Random::SmoothType smooth((!speed && temp_smooth == Random::SMOOTH_SPLINE) ? Random::SMOOTH_FAST_SPLINE : temp_smooth);
{
Vector vect(0,0);
}
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;
}
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;
.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(Random::SMOOTH_DEFAULT, "nearest", _("Nearest Neighbor"))
+ .add_enum_value(Random::SMOOTH_LINEAR, "linear", _("Linear"))
+ .add_enum_value(Random::SMOOTH_COSINE, "cosine", _("Cosine"))
+ .add_enum_value(Random::SMOOTH_SPLINE, "spline", _("Spline"))
+ .add_enum_value(Random::SMOOTH_CUBIC, "cubic", _("Cubic"))
);
ret.push_back(ParamDesc("detail")
.set_local_name(_("Detail"))