X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fdistort.cpp;h=837189edcf69523493260e8b3a17f926ad4df02b;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=5175bd4c161c172a6d9fbf986cc011edbef86d9f;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;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 5175bd4..837189e 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp @@ -1,20 +1,21 @@ /* === S Y N F I G ========================================================= */ -/*! \file noise.cpp +/*! \file distort.cpp ** \brief blehh ** -** $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 ** -** 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 */ /* ========================================================================= */ @@ -54,7 +55,7 @@ SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort"); SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort")); SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("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 ================================================= */ @@ -73,18 +74,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,14 +114,14 @@ 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 synfig::Point &x, float pw,float ph)const +NoiseDistort::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const { return 0.0f; } @@ -153,7 +155,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; @@ -164,7 +166,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 +180,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")) ); @@ -219,7 +221,7 @@ NoiseDistort::get_param_vocab()const ret.push_back(ParamDesc("turbulent") .set_local_name(_("Turbulent")) ); - + return ret; } @@ -242,9 +244,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 +268,7 @@ NoiseDistort::accelerated_render(Context context,Surface *surface,int quality, c return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -275,7 +277,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