-/* === S I N F G =========================================================== */
-/*! \file noise.cpp
-** \brief blehh
+/* === S Y N F I G ========================================================= */
+/*! \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 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
-** 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
*/
/* ========================================================================= */
#include "distort.h"
-#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>
#endif
/* === M A C R O S ========================================================= */
-using namespace sinfg;
+using namespace synfig;
using namespace std;
using namespace etl;
/* === G L O B A L S ======================================================= */
-SINFG_LAYER_INIT(NoiseDistort);
-SINFG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
-SINFG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort"));
-SINFG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions"));
-SINFG_LAYER_SET_VERSION(NoiseDistort,"0.0");
-SINFG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_LAYER_INIT(NoiseDistort);
+SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
+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$");
/* === P R O C E D U R E S ================================================= */
size(1,1)
{
set_blend_method(Color::BLEND_STRAIGHT);
- smooth=2;
+ smooth=RandomNoise::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);
-
+
float x(point[0]/size[0]*(1<<detail));
float y(point[1]/size[1]*(1<<detail));
-
+
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);
for(i=0;i<detail;i++)
if(vect[0]<-1)vect[0]=-1;if(vect[0]>1)vect[0]=1;
if(vect[1]<-1)vect[1]=-1;if(vect[1]>1)vect[1]=1;
-
+
if(turbulent)
{
vect[0]=abs(vect[0]);
vect[1]=abs(vect[1]);
}
-
+
x/=2.0f;
y/=2.0f;
}
}
vect[0]=(vect[0]-0.5f)*displacement[0];
vect[1]=(vect[1]-0.5f)*displacement[1];
-
+
ret=context.get_color(point+vect);
}
return ret;
}
inline float
-NoiseDistort::calc_supersample(const sinfg::Point &x, float pw,float ph)const
+NoiseDistort::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const
{
return 0.0f;
}
void
-NoiseDistort::set_time(sinfg::Context context, sinfg::Time t)const
+NoiseDistort::set_time(synfig::Context context, synfig::Time t)const
{
curr_time=t;
context.set_time(t);
}
void
-NoiseDistort::set_time(sinfg::Context context, sinfg::Time t, const sinfg::Point &point)const
+NoiseDistort::set_time(synfig::Context context, synfig::Time t, const synfig::Point &point)const
{
curr_time=t;
context.set_time(t,point);
}
-sinfg::Layer::Handle
-NoiseDistort::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+NoiseDistort::hit_check(synfig::Context context, const synfig::Point &point)const
{
if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5)
return const_cast<NoiseDistort*>(this);
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;
IMPORT(detail);
IMPORT(turbulent);
IMPORT(displacement);
- return Layer_Composite::set_param(param,value);
+ return Layer_Composite::set_param(param,value);
}
ValueBase
EXPORT(detail);
EXPORT(displacement);
EXPORT(turbulent);
-
+
EXPORT_NAME();
EXPORT_VERSION();
-
- return Layer_Composite::get_param(param);
+
+ return Layer_Composite::get_param(param);
}
Layer::Vocab
NoiseDistort::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
-
+
ret.push_back(ParamDesc("displacement")
.set_local_name(_("Displacement"))
);
.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"))
ret.push_back(ParamDesc("turbulent")
.set_local_name(_("Turbulent"))
);
-
+
return ret;
}
if(Color::is_onto(get_blend_method()))
return context.get_full_bounding_rect();
-
+
Rect bounds(context.get_full_bounding_rect().expand_x(displacement[0]).expand_y(displacement[1]));
-
+
return bounds;
}
return true;
}
-
+
int x,y;
Surface::pen pen(surface->begin());
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)
projects / synfig.git / blobdiff