X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_filter%2Fhalftone2.cpp;h=177f6a0d0ddfd90d78f8c21e7ad9b0fdf252ec34;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cc5872cf1c2a3d64145a416c7c02efb9248393fd;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
index cc5872c..177f6a0 100644
--- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file halftone2.cpp
-**	\brief blehh
+**	\brief Implementation of the "Halftone 2" layer
 **
-**	$Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007-2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -53,10 +54,10 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Halftone2);
 SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
-SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone2"));
-SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters"));
 SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
-SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id: halftone2.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -66,11 +67,11 @@ Halftone2::Halftone2():
 	color_dark(Color::black()),
 	color_light(Color::white())
 {
-	halftone.offset=(synfig::Point(0,0));
+	halftone.origin=(synfig::Point(0,0));
 	halftone.size=(synfig::Vector(0.25,0.25));
 	halftone.angle=(Angle::zero());
 	halftone.type=TYPE_SYMMETRIC;
-	
+
 	set_blend_method(Color::BLEND_STRAIGHT);
 }
 
@@ -85,21 +86,21 @@ Halftone2::color_func(const Point &point, float supersample,const Color& color)c
 	else if(amount>=1.0f)
 		halfcolor=color_light;
 	else
-		halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT);		
-	
+		halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT);
+
 	halfcolor.set_a(color.get_a());
 
 	return halfcolor;
 }
 
 inline float
-Halftone2::calc_supersample(const synfig::Point &x, float pw,float ph)const
+Halftone2::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
 {
 	return abs(pw/(halftone.size).mag());
 }
 
 synfig::Layer::Handle
-Halftone2::hit_check(synfig::Context context, const synfig::Point &point)const
+Halftone2::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const
 {
 	return const_cast<Halftone2*>(this);
 }
@@ -113,9 +114,11 @@ Halftone2::set_param(const String & param, const ValueBase &value)
 	IMPORT_AS(halftone.size,"size");
 	IMPORT_AS(halftone.type,"type");
 	IMPORT_AS(halftone.angle,"angle");
-	IMPORT_AS(halftone.offset,"offset");
-	
-	return Layer_Composite::set_param(param,value);	
+	IMPORT_AS(halftone.origin,"origin");
+
+	IMPORT_AS(halftone.origin,"offset");
+
+	return Layer_Composite::set_param(param,value);
 }
 
 ValueBase
@@ -124,34 +127,34 @@ Halftone2::get_param(const String & param)const
 	EXPORT_AS(halftone.size,"size");
 	EXPORT_AS(halftone.type,"type");
 	EXPORT_AS(halftone.angle,"angle");
-	EXPORT_AS(halftone.offset,"offset");
+	EXPORT_AS(halftone.origin,"origin");
 
 	EXPORT(color_dark);
 	EXPORT(color_light);
-	
+
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return Layer_Composite::get_param(param);	
+
+	return Layer_Composite::get_param(param);
 }
 
 Layer::Vocab
 Halftone2::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
-	
-	ret.push_back(ParamDesc("offset")
-		.set_local_name(_("Mask Offset"))
+
+	ret.push_back(ParamDesc("origin")
+		.set_local_name(_("Mask Origin"))
 		.set_is_distance()
 	);
 	ret.push_back(ParamDesc("angle")
 		.set_local_name(_("Mask Angle"))
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 	ret.push_back(ParamDesc("size")
 		.set_local_name(_("Mask Size"))
 		.set_is_distance()
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 	ret.push_back(ParamDesc("color_light")
 		.set_local_name(_("Light Color"))
@@ -168,7 +171,7 @@ Halftone2::get_param_vocab()const
 		.add_enum_value(TYPE_DIAMOND,"diamond",_("Diamond"))
 		.add_enum_value(TYPE_STRIPE,"stripe",_("Stripe"))
 	);
-	
+
 	return ret;
 }
 
@@ -193,7 +196,7 @@ Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
 		return false;
 	if(get_amount()==0)
 		return true;
-		
+
 	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
 	const Point tl(renddesc.get_tl());
 	const int w(surface->get_w());
@@ -203,7 +206,7 @@ Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
 	Surface::pen pen(surface->begin());
 	Point pos;
 	int x,y;
-	
+
 	if(is_solid_color())
 	{
 		for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
@@ -233,7 +236,7 @@ Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons
 					)
 				);
 	}
-	
+
 	// Mark our progress as finished
 	if(cb && !cb->amount_complete(10000,10000))
 		return false;