X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fdistort.cpp;h=1660c7dba474eadb702e8e718e08566dc314a660;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=fe9eb02facb2fb2c2141354a1fe203923f705917;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp index fe9eb02..1660c7d 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp @@ -1,20 +1,22 @@ -/* === 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 */ /* ========================================================================= */ @@ -30,31 +32,31 @@ #include "distort.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #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 ================================================= */ @@ -64,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)); @@ -73,18 +75,19 @@ 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); - + float x(point[0]/size[0]*(1<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; } @@ -112,34 +115,34 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c } 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(this); @@ -153,7 +156,7 @@ NoiseDistort::hit_check(sinfg::Context context, const sinfg::Point &point)const 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; @@ -164,7 +167,7 @@ NoiseDistort::set_param(const String & param, const ValueBase &value) IMPORT(detail); IMPORT(turbulent); IMPORT(displacement); - return Layer_Composite::set_param(param,value); + return Layer_Composite::set_param(param,value); } ValueBase @@ -178,18 +181,18 @@ NoiseDistort::get_param(const String & param)const 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")) ); @@ -198,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")) @@ -219,7 +222,7 @@ NoiseDistort::get_param_vocab()const ret.push_back(ParamDesc("turbulent") .set_local_name(_("Turbulent")) ); - + return ret; } @@ -242,9 +245,9 @@ NoiseDistort::get_bounding_rect(Context context)const 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; } @@ -266,7 +269,7 @@ NoiseDistort::accelerated_render(Context context,Surface *surface,int quality, c return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -275,7 +278,7 @@ NoiseDistort::accelerated_render(Context context,Surface *surface,int quality, c 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