X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fxorpattern.cpp;h=df7c6bd54ed35fbcf2401aebe46fba57d9824e08;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=702cc35fe6adbe4bb5d871c36c0528bf3f5acd37;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp
index 702cc35..df7c6bd 100644
--- a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp
@@ -1,18 +1,23 @@
-/*! ========================================================================
-** Synfig
-** Template File
-** $Id: xorpattern.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file xorpattern.cpp
+**	\brief Implementation of the "XOR Pattern" layer
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	$Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007-2008 Chris Moore
 **
-** 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 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.
+**
+**	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
 **
 ** === N O T E S ===========================================================
 **
@@ -45,65 +50,104 @@
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(XORPattern);
-SYNFIG_LAYER_SET_NAME(XORPattern,"XORPattern");
-SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,_("XOR Pattern"));
-SYNFIG_LAYER_SET_CATEGORY(XORPattern,_("Other"));
+SYNFIG_LAYER_SET_NAME(XORPattern,"xor_pattern");
+SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,N_("XOR Pattern"));
+SYNFIG_LAYER_SET_CATEGORY(XORPattern,N_("Other"));
 SYNFIG_LAYER_SET_VERSION(XORPattern,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(XORPattern,"$Id: xorpattern.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(XORPattern,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
 /* === M E T H O D S ======================================================= */
 
 XORPattern::XORPattern():
-	pos(0.125,0.125),
+	Layer_Composite	(1.0,Color::BLEND_STRAIGHT),
+	origin(0.125,0.125),
 	size(0.25,0.25)
 {
 }
-	
+
 bool
 XORPattern::set_param(const String & param, const ValueBase &value)
 {
-	IMPORT(pos);
+	IMPORT(origin);
 	IMPORT(size);
-	return false;
+
+	IMPORT_AS(origin,"pos");
+
+	return Layer_Composite::set_param(param,value);
 }
 
 ValueBase
 XORPattern::get_param(const String & param)const
 {
-	EXPORT(pos);
+	EXPORT(origin);
 	EXPORT(size);
-	
+
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return ValueBase();	
+
+	return Layer_Composite::get_param(param);
 }
 
 Color
 XORPattern::get_color(Context context, const Point &point)const
 {
-	unsigned int a=(unsigned int)floor((point[0]+pos[0])/size[0]), b=(unsigned int)floor((point[1]+pos[1])/size[1]);
+	if(get_amount()==0.0)
+		return context.get_color(point);
+
+	unsigned int a=(unsigned int)floor((point[0]-origin[0])/size[0]), b=(unsigned int)floor((point[1]-origin[1])/size[1]);
 	unsigned char rindex=(a^b);
 	unsigned char gindex=(a^(~b))*4;
 	unsigned char bindex=~(a^b)*2;
 
-	return Color((Color::value_type)rindex/(Color::value_type)255.0,(Color::value_type)gindex/(Color::value_type)255.0,(Color::value_type)bindex/(Color::value_type)255.0,1.0);
+	Color color((Color::value_type)rindex/(Color::value_type)255.0,
+				(Color::value_type)gindex/(Color::value_type)255.0,
+				(Color::value_type)bindex/(Color::value_type)255.0,
+				1.0);
+
+	if(get_amount() == 1 && get_blend_method() == Color::BLEND_STRAIGHT)
+		return color;
+	else
+		return Color::blend(color,context.get_color(point),get_amount(),get_blend_method());
+
 }
-	
+
 Layer::Vocab
 XORPattern::get_param_vocab()const
 {
-	Layer::Vocab ret;
-	
-	ret.push_back(ParamDesc("pos")
-		.set_local_name(_("Offset"))
+	Layer::Vocab ret(Layer_Composite::get_param_vocab());
+
+	ret.push_back(ParamDesc("origin")
+		.set_local_name(_("Origin"))
 	);
 	ret.push_back(ParamDesc("size")
 		.set_local_name(_("Size"))
-		.set_origin("pos")
+		.set_origin("origin")
 	);
-	
+
 	return ret;
 }
+
+synfig::Layer::Handle
+XORPattern::hit_check(synfig::Context context, const synfig::Point &getpos)const
+{
+	// if we have a zero amount
+	if(get_amount()==0.0)
+		// then the click passes down to our context
+		return context.hit_check(getpos);
+
+	synfig::Layer::Handle tmp;
+	// if we are behind the context, and the click hits something in the context
+	if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(getpos)))
+		// then return the thing it hit in the context
+		return tmp;
+
+	// if we're using an 'onto' blend method and the click missed the context
+	if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(getpos)))
+		// then it misses everything
+		return 0;
+
+	// otherwise the click hit us, since we're the size of the whole plane
+	return const_cast<XORPattern*>(this);
+}