X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fnoise.h;h=1ea78d638a661cfe53e9d60c646ee787a86b071e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b997a3a50454355fabc97adc4b46b9a6e2a0794a;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.h b/synfig-core/trunk/src/modules/mod_noise/noise.h
index b997a3a..1ea78d6 100644
--- a/synfig-core/trunk/src/modules/mod_noise/noise.h
+++ b/synfig-core/trunk/src/modules/mod_noise/noise.h
@@ -1,38 +1,40 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file noise.h
-**	\brief Template Header
+**	\brief Header file for implementation of the "Noise Gradient" layer
 **
-**	$Id: noise.h,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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_NOISE_H
-#define __SINFG_NOISE_H
+#ifndef __SYNFIG_NOISE_H
+#define __SYNFIG_NOISE_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/vector.h>
-#include <sinfg/valuenode.h>
+#include <synfig/vector.h>
+#include <synfig/valuenode.h>
 
-#include <sinfg/layer_composite.h>
-#include <sinfg/gradient.h>
-#include <sinfg/time.h>
-#include "random.h"
+#include <synfig/layer_composite.h>
+#include <synfig/gradient.h>
+#include <synfig/time.h>
+#include "random_noise.h"
 
 /* === M A C R O S ========================================================= */
 
@@ -40,43 +42,43 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class Noise : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform
+class Noise : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
-	SINFG_LAYER_MODULE_EXT
+	SYNFIG_LAYER_MODULE_EXT
 
 private:
 
-	sinfg::Vector size;
+	synfig::Vector size;
 
-	Random random;
-	int smooth;
+	RandomNoise random;
+	RandomNoise::SmoothType smooth;
 	int detail;
 	bool do_alpha;
-	sinfg::Gradient gradient;
-	sinfg::Real speed;
+	synfig::Gradient gradient;
+	synfig::Real speed;
 	bool turbulent;
 	bool do_displacement;
-	sinfg::Vector displacement;
-	
+	synfig::Vector displacement;
+
 	//void sync();
-	mutable sinfg::Time curr_time;
-	
+	mutable synfig::Time curr_time;
+
 	bool super_sample;
 
-	sinfg::Color color_func(const sinfg::Point &x, float supersample,sinfg::Context context)const;
+	synfig::Color color_func(const synfig::Point &x, float supersample,synfig::Context context)const;
 
-	float calc_supersample(const sinfg::Point &x, float pw,float ph)const;
+	float calc_supersample(const synfig::Point &x, float pw,float ph)const;
 
 public:
 	Noise();
-	
-	virtual bool set_param(const sinfg::String &param, const sinfg::ValueBase &value);
-	virtual sinfg::ValueBase get_param(const sinfg::String &param)const;
-	virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const;
-	virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)const;
-	sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const;	
-	virtual void set_time(sinfg::Context context, sinfg::Time time)const;
-	virtual void set_time(sinfg::Context context, sinfg::Time time, const sinfg::Point &point)const;
+
+	virtual bool set_param(const synfig::String &param, const synfig::ValueBase &value);
+	virtual synfig::ValueBase get_param(const synfig::String &param)const;
+	virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
+	virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;
+	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	virtual void set_time(synfig::Context context, synfig::Time time)const;
+	virtual void set_time(synfig::Context context, synfig::Time time, const synfig::Point &point)const;
 
 	virtual Vocab get_param_vocab()const;
 };