-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file noise.cpp
-** \brief blehh
+** \brief Implementation of the "Noise Gradient" layer
**
-** $Id: noise.cpp,v 1.2 2005/01/13 06:48:39 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 "noise.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(Noise);
-SINFG_LAYER_SET_NAME(Noise,"noise");
-SINFG_LAYER_SET_LOCAL_NAME(Noise,_("Noise Gradient"));
-SINFG_LAYER_SET_CATEGORY(Noise,_("Gradients"));
-SINFG_LAYER_SET_VERSION(Noise,"0.0");
-SINFG_LAYER_SET_CVS_ID(Noise,"$Id: noise.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $");
+SYNFIG_LAYER_INIT(Noise);
+SYNFIG_LAYER_SET_NAME(Noise,"noise");
+SYNFIG_LAYER_SET_LOCAL_NAME(Noise,N_("Noise Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(Noise,N_("Gradients"));
+SYNFIG_LAYER_SET_VERSION(Noise,"0.0");
+SYNFIG_LAYER_SET_CVS_ID(Noise,"$Id$");
/* === P R O C E D U R E S ================================================= */
size(1,1),
gradient(Color::black(), Color::white())
{
- smooth=2;
+ smooth=RandomNoise::SMOOTH_COSINE;
detail=4;
speed=0;
do_alpha=false;
inline Color
-Noise::color_func(const Point &point, float pixel_size,Context context)const
+Noise::color_func(const Point &point, float pixel_size,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));
float x2(0),y2(0);
-
+
if(super_sample&&pixel_size)
{
x2=(point[0]+pixel_size)/size[0]*(1<<detail);
y2=(point[1]+pixel_size)/size[1]*(1<<detail);
}
-
+
int i;
Time time;
time=speed*curr_time;
- int smooth((!speed && Noise::smooth==3)?5:Noise::smooth);
-
- float t(time);
+ RandomNoise::SmoothType smooth((!speed && Noise::smooth == RandomNoise::SMOOTH_SPLINE) ? RandomNoise::SMOOTH_FAST_SPLINE : Noise::smooth);
+
+ float ftime(time);
{
float amount=0.0f;
float alpha=0.0f;
for(i=0;i<detail;i++)
{
- amount=random(smooth,0+(detail-i)*5,x,y,t)+amount*0.5;
+ amount=random(smooth,0+(detail-i)*5,x,y,ftime)+amount*0.5;
if(amount<-1)amount=-1;if(amount>1)amount=1;
-
+
if(super_sample&&pixel_size)
{
- amount2=random(smooth,0+(detail-i)*5,x2,y,t)+amount2*0.5;
+ amount2=random(smooth,0+(detail-i)*5,x2,y,ftime)+amount2*0.5;
if(amount2<-1)amount2=-1;if(amount2>1)amount2=1;
- amount3=random(smooth,0+(detail-i)*5,x,y2,t)+amount3*0.5;
+ amount3=random(smooth,0+(detail-i)*5,x,y2,ftime)+amount3*0.5;
if(amount3<-1)amount3=-1;if(amount3>1)amount3=1;
if(turbulent)
x2*=0.5f;
y2*=0.5f;
}
-
+
if(do_alpha)
{
- alpha=random(smooth,3+(detail-i)*5,x,y,t)+alpha*0.5;
+ alpha=random(smooth,3+(detail-i)*5,x,y,ftime)+alpha*0.5;
if(alpha<-1)alpha=-1;if(alpha>1)alpha=1;
}
-
+
if(turbulent)
{
amount=abs(amount);
alpha=abs(alpha);
}
-
+
x*=0.5f;
y*=0.5f;
- //t*=0.5f;
+ //ftime*=0.5f;
}
if(!turbulent)
amount3=amount3/2.0f+0.5f;
}
}
-
+
if(super_sample && pixel_size)
ret=gradient(amount,max(amount3,max(amount,amount2))-min(amount3,min(amount,amount2)));
else
}
inline float
-Noise::calc_supersample(const sinfg::Point &x, float pw,float ph)const
+Noise::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const
{
return 0.0f;
}
void
-Noise::set_time(sinfg::Context context, sinfg::Time t)const
+Noise::set_time(synfig::Context context, synfig::Time t)const
{
curr_time=t;
context.set_time(t);
}
void
-Noise::set_time(sinfg::Context context, sinfg::Time t, const sinfg::Point &point)const
+Noise::set_time(synfig::Context context, synfig::Time t, const synfig::Point &point)const
{
curr_time=t;
context.set_time(t,point);
}
-sinfg::Layer::Handle
-Noise::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+Noise::hit_check(synfig::Context context, const synfig::Point &point)const
{
if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5)
return const_cast<Noise*>(this);
bool
Noise::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(gradient);
IMPORT(turbulent);
IMPORT(super_sample);
-
- return Layer_Composite::set_param(param,value);
+
+ return Layer_Composite::set_param(param,value);
}
ValueBase
EXPORT(detail);
EXPORT(do_alpha);
EXPORT(gradient);
- EXPORT(turbulent)
+ EXPORT(turbulent)
EXPORT(super_sample);
-
+
EXPORT_NAME();
EXPORT_VERSION();
-
- return Layer_Composite::get_param(param);
+
+ return Layer_Composite::get_param(param);
}
Layer::Vocab
Noise::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
-
+
ret.push_back(ParamDesc("gradient")
.set_local_name(_("Gradient"))
);
ret.push_back(ParamDesc("seed")
- .set_local_name(_("Random Seed"))
+ .set_local_name(_("RandomNoise Seed"))
);
ret.push_back(ParamDesc("size")
.set_local_name(_("Size"))
.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("super_sample")
.set_local_name(_("Super Sampling"))
);
-
+
return ret;
}
return true;
}
-
+
int x,y;
Surface::pen pen(surface->begin());
float supersampleradius((abs(pw)+abs(ph))*0.5f);
if(quality>=8)
supersampleradius=0;
-
+
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