From: pabs3 <pabs3@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sun, 3 May 2009 04:07:37 +0000 (+0000)
Subject: Apply patch #21: add boolean ValueNode conversions. Thanks to nikitakit.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1891afee8b0ad9e67c56b1c262a940a0bb5042cb;p=synfig.git

Apply patch #21: add boolean ValueNode conversions. Thanks to nikitakit.

git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2364 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/AUTHORS b/synfig-core/trunk/AUTHORS
index 8e6c4fe..d6d0efc 100644
--- a/synfig-core/trunk/AUTHORS
+++ b/synfig-core/trunk/AUTHORS
@@ -17,6 +17,7 @@ Gerco Ballintijn
 Daniel Hornung (rubikcube)
 Sean Bartell (wtachi)
 Cyril Brulebois (KiBi)
+Nikita Kitaev (nikitakit)
 
 Translators:
 
diff --git a/synfig-core/trunk/README b/synfig-core/trunk/README
index db8a784..d7ce63c 100644
--- a/synfig-core/trunk/README
+++ b/synfig-core/trunk/README
@@ -31,6 +31,7 @@ Copyright 2006-2007 Paul Wise
 Copyright 2007-2008 Chris Moore
 Copyright 2008 Carlos López
 Copyright 2008 Gerco Ballintijn
+Copyright 2009 Nikita Kitaev
 
 Licence
 
diff --git a/synfig-core/trunk/po/POTFILES.in b/synfig-core/trunk/po/POTFILES.in
index c37c4cf..5da5584 100644
--- a/synfig-core/trunk/po/POTFILES.in
+++ b/synfig-core/trunk/po/POTFILES.in
@@ -281,6 +281,8 @@ src/synfig/valuenode.cpp
 src/synfig/valuenode.h
 src/synfig/valuenode_add.cpp
 src/synfig/valuenode_add.h
+src/synfig/valuenode_and.cpp
+src/synfig/valuenode_and.h
 src/synfig/valuenode_animated.cpp
 src/synfig/valuenode_animated.h
 src/synfig/valuenode_bline.cpp
@@ -295,6 +297,8 @@ src/synfig/valuenode_composite.cpp
 src/synfig/valuenode_composite.h
 src/synfig/valuenode_const.cpp
 src/synfig/valuenode_const.h
+src/synfig/valuenode_compare.cpp
+src/synfig/valuenode_compare.h
 src/synfig/valuenode_cos.cpp
 src/synfig/valuenode_cos.h
 src/synfig/valuenode_duplicate.cpp
@@ -311,6 +315,12 @@ src/synfig/valuenode_join.cpp
 src/synfig/valuenode_join.h
 src/synfig/valuenode_linear.cpp
 src/synfig/valuenode_linear.h
+src/synfig/valuenode_not.cpp
+src/synfig/valuenode_not.h
+src/synfig/valuenode_or.cpp
+src/synfig/valuenode_or.h
+src/synfig/valuenode_pow.cpp
+src/synfig/valuenode_pow.h
 src/synfig/valuenode_radialcomposite.cpp
 src/synfig/valuenode_radialcomposite.h
 src/synfig/valuenode_range.cpp
diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am
index 88a6b90..4ed8b13 100644
--- a/synfig-core/trunk/src/synfig/Makefile.am
+++ b/synfig-core/trunk/src/synfig/Makefile.am
@@ -61,6 +61,7 @@ IMPORTERSOURCES = \
 
 VALUENODEHEADERS = \
 	valuenode_add.h \
+	valuenode_and.h \
 	valuenode_anglestring.h \
 	valuenode_animated.h \
 	valuenode_atan2.h \
@@ -69,6 +70,7 @@ VALUENODEHEADERS = \
 	valuenode_blinecalcvertex.h \
 	valuenode_blinecalcwidth.h \
 	valuenode_blinereversetangent.h \
+	valuenode_compare.h \
 	valuenode_composite.h \
 	valuenode_const.h \
 	valuenode_cos.h \
@@ -84,6 +86,8 @@ VALUENODEHEADERS = \
 	valuenode_join.h \
 	valuenode_linear.h \
 	valuenode_log.h \
+	valuenode_not.h \
+	valuenode_or.h \
 	valuenode_pow.h \
 	valuenode_radialcomposite.h \
 	valuenode_range.h \
@@ -110,6 +114,7 @@ VALUENODEHEADERS = \
 
 VALUENODESOURCES = \
 	valuenode_add.cpp \
+	valuenode_and.cpp \
 	valuenode_anglestring.cpp \
 	valuenode_animated.cpp \
 	valuenode_atan2.cpp \
@@ -118,6 +123,7 @@ VALUENODESOURCES = \
 	valuenode_blinecalcvertex.cpp \
 	valuenode_blinecalcwidth.cpp \
 	valuenode_blinereversetangent.cpp \
+	valuenode_compare.cpp \
 	valuenode_composite.cpp \
 	valuenode_const.cpp \
 	valuenode_cos.cpp \
@@ -133,6 +139,8 @@ VALUENODESOURCES = \
 	valuenode_join.cpp \
 	valuenode_linear.cpp \
 	valuenode_log.cpp \
+	valuenode_not.cpp \
+	valuenode_or.cpp \
 	valuenode_pow.cpp \
 	valuenode_radialcomposite.cpp \
 	valuenode_range.cpp \
diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp
index 21645c8..d1e3256 100644
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -87,6 +87,10 @@
 #include "valuenode_intstring.h"
 #include "valuenode_log.h"
 #include "valuenode_pow.h"
+#include "valuenode_compare.h"
+#include "valuenode_not.h"
+#include "valuenode_and.h"
+#include "valuenode_or.h"
 
 #include "layer.h"
 
@@ -182,7 +186,11 @@ ValueNode::subsys_init()
 	ADD_VALUENODE(ValueNode_Logarithm,		  "logarithm",		  _("Logarithm"),		 RELEASE_VERSION_0_61_09); // SVN r2034
 
 	ADD_VALUENODE(ValueNode_Greyed,			  "greyed",			  _("Greyed"),			 RELEASE_VERSION_0_61_10); // SVN r2305
-	ADD_VALUENODE(ValueNode_Pow,		  "power",		  _("Power"),		 RELEASE_VERSION_0_61_09); // SVN r2362
+	ADD_VALUENODE(ValueNode_Pow,		      "power",		      _("Power"),		     RELEASE_VERSION_0_61_10); // SVN r2362
+	ADD_VALUENODE(ValueNode_Compare,		  "compare",  	 	  _("Compare"),			 RELEASE_VERSION_0_61_10); // SVN r2364
+	ADD_VALUENODE(ValueNode_Not,		      "not",			  _("Not"),				 RELEASE_VERSION_0_61_10); // SVN r2364
+	ADD_VALUENODE(ValueNode_And,		      "and",			  _("And"),				 RELEASE_VERSION_0_61_10); // SVN r2364
+	ADD_VALUENODE(ValueNode_Or,		          "or",			  _("Or"),					 RELEASE_VERSION_0_61_10); // SVN r2364
 
 #undef ADD_VALUENODE
 #undef ADD_VALUENODE2
diff --git a/synfig-core/trunk/src/synfig/valuenode_and.cpp b/synfig-core/trunk/src/synfig/valuenode_and.cpp
new file mode 100644
index 0000000..974485c
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_and.cpp
@@ -0,0 +1,168 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_and.cpp
+**	\brief Implementation of the "And" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_and.h"
+#include "valuenode_const.h"
+#include "general.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_And::ValueNode_And(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	bool value(x.get(bool()));
+
+	set_link("link1",        ValueNode_Const::create(bool(true)));
+	set_link("link2",        ValueNode_Const::create(bool(false)));
+	if (value)
+		set_link("link2",ValueNode_Const::create(bool(true)));
+}
+
+ValueNode_And*
+ValueNode_And::create(const ValueBase &x)
+{
+	return new ValueNode_And(x);
+}
+
+LinkableValueNode*
+ValueNode_And::create_new()const
+{
+	return new ValueNode_And(get_type());
+}
+
+ValueNode_And::~ValueNode_And()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_And::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(link1_,    ValueBase::TYPE_BOOL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(link2_,    ValueBase::TYPE_BOOL);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_And::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return link1_;
+	if(i==1) return link2_;
+	return 0;
+}
+
+int
+ValueNode_And::link_count()const
+{
+	return 2;
+}
+
+String
+ValueNode_And::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return _("Link1");
+	if(i==1) return _("Link2");
+	return String();
+}
+
+String
+ValueNode_And::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return "link1";
+	if(i==1) return "link2";
+	return String();
+}
+
+int
+ValueNode_And::get_link_index_from_name(const String &name)const
+{
+	if(name=="link1")    return 0;
+	if(name=="link2")    return 1;
+
+	throw Exception::BadLinkName(name);
+}
+
+ValueBase
+ValueNode_And::operator()(Time t)const
+{
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	bool link1     = (*link1_)   (t).get(bool());
+	bool link2     = (*link2_)   (t).get(bool());
+
+	return (link1 && link2);
+}
+
+String
+ValueNode_And::get_name()const
+{
+	return "and";
+}
+
+String
+ValueNode_And::get_local_name()const
+{
+	return _("AND");
+}
+
+bool
+ValueNode_And::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_BOOL;
+}
diff --git a/synfig-core/trunk/src/synfig/valuenode_and.h b/synfig-core/trunk/src/synfig/valuenode_and.h
new file mode 100644
index 0000000..8a13014
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_and.h
@@ -0,0 +1,81 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_and.h
+**	\brief Header file for implementation of the "And" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_AND_H
+#define __SYNFIG_VALUENODE_AND_H
+
+/* === H E A D E R S ======================================================= */
+
+#include "valuenode.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_And : public LinkableValueNode
+{
+	ValueNode::RHandle link1_;
+	ValueNode::RHandle link2_;
+
+public:
+	typedef etl::handle<ValueNode_And> Handle;
+	typedef etl::handle<const ValueNode_And> ConstHandle;
+
+	ValueNode_And(const ValueBase &x);
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_And();
+
+	virtual String get_name()const;
+	virtual String get_local_name()const;
+
+
+	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
+	virtual int link_count()const;
+	virtual String link_name(int i)const;
+
+	virtual String link_local_name(int i)const;
+	virtual int get_link_index_from_name(const String &name)const;
+
+protected:
+	LinkableValueNode* create_new()const;
+	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
+
+public:
+	using synfig::LinkableValueNode::get_link_vfunc;
+
+	using synfig::LinkableValueNode::set_link_vfunc;
+	static bool check_type(ValueBase::Type type);
+	static ValueNode_And* create(const ValueBase &x);
+}; // END of class ValueNode_And
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/synfig-core/trunk/src/synfig/valuenode_compare.cpp b/synfig-core/trunk/src/synfig/valuenode_compare.cpp
new file mode 100644
index 0000000..68c3427
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_compare.cpp
@@ -0,0 +1,197 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_compare.cpp
+**	\brief Implementation of the "Compare" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_compare.h"
+#include "valuenode_const.h"
+#include "general.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_Compare::ValueNode_Compare(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	bool value(x.get(bool()));
+
+	set_link("lhs",          ValueNode_Const::create(Real(0)));
+	set_link("rhs",          ValueNode_Const::create(Real(0)));
+	set_link("greater",      ValueNode_Const::create(bool(false)));
+	if (value)
+		set_link("equal",ValueNode_Const::create(bool(true)));
+	else
+		set_link("equal",ValueNode_Const::create(bool(false)));
+	set_link("less",         ValueNode_Const::create(bool(false)));
+}
+
+ValueNode_Compare*
+ValueNode_Compare::create(const ValueBase &x)
+{
+	return new ValueNode_Compare(x);
+}
+
+LinkableValueNode*
+ValueNode_Compare::create_new()const
+{
+	return new ValueNode_Compare(get_type());
+}
+
+ValueNode_Compare::~ValueNode_Compare()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_Compare::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(lhs_,      ValueBase::TYPE_REAL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(rhs_,      ValueBase::TYPE_REAL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(greater_,  ValueBase::TYPE_BOOL);
+	case 3: CHECK_TYPE_AND_SET_VALUE(equal_,    ValueBase::TYPE_BOOL);
+	case 4: CHECK_TYPE_AND_SET_VALUE(less_,     ValueBase::TYPE_BOOL);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Compare::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return lhs_;
+	if(i==1) return rhs_;
+	if(i==2) return greater_;
+	if(i==3) return equal_;
+	if(i==4) return less_;
+	return 0;
+}
+
+int
+ValueNode_Compare::link_count()const
+{
+	return 5;
+}
+
+String
+ValueNode_Compare::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return _("LHS");
+	if(i==1) return _("RHS");
+	if(i==2) return _("Greater Than");
+	if(i==3) return _("Equal to");
+	if(i==4) return _("Less Than");
+	return String();
+}
+
+String
+ValueNode_Compare::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return "lhs";
+	if(i==1) return "rhs";
+	if(i==2) return "greater";
+	if(i==3) return "equal";
+	if(i==4) return "less";
+	return String();
+}
+
+int
+ValueNode_Compare::get_link_index_from_name(const String &name)const
+{
+	if(name=="lhs")     return 0;
+	if(name=="rhs")     return 1;
+	if(name=="greater") return 2;
+	if(name=="equal")   return 3;
+	if(name=="less")    return 4;
+
+	throw Exception::BadLinkName(name);
+}
+
+ValueBase
+ValueNode_Compare::operator()(Time t)const
+{
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	Real lhs      = (*lhs_)     (t).get(Real());
+	Real rhs      = (*rhs_)     (t).get(Real());
+	Real greater  = (*greater_) (t).get(bool());
+	Real equal    = (*equal_)   (t).get(bool());
+	Real less     = (*less_)    (t).get(bool());
+
+	if (greater && lhs > rhs)
+		return true;
+	if (equal && lhs == rhs)
+		return true;
+	if (less && lhs < rhs)
+		return true;
+
+	return false;
+}
+
+String
+ValueNode_Compare::get_name()const
+{
+	return "compare";
+}
+
+String
+ValueNode_Compare::get_local_name()const
+{
+	return _("Compare");
+}
+
+bool
+ValueNode_Compare::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_BOOL;
+}
diff --git a/synfig-core/trunk/src/synfig/valuenode_compare.h b/synfig-core/trunk/src/synfig/valuenode_compare.h
new file mode 100644
index 0000000..da156de
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_compare.h
@@ -0,0 +1,85 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_compare.h
+**	\brief Header file for implementation of the "Compare" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_COMPARE_H
+#define __SYNFIG_VALUENODE_COMPARE_H
+
+/* === H E A D E R S ======================================================= */
+
+#include "valuenode.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_Compare : public LinkableValueNode
+{
+	ValueNode::RHandle lhs_;
+	ValueNode::RHandle rhs_;
+	ValueNode::RHandle greater_;
+	ValueNode::RHandle equal_;
+	ValueNode::RHandle less_;
+
+public:
+	typedef etl::handle<ValueNode_Compare> Handle;
+	typedef etl::handle<const ValueNode_Compare> ConstHandle;
+
+	ValueNode_Compare(const ValueBase &x);
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_Compare();
+
+	virtual String get_name()const;
+	virtual String get_local_name()const;
+
+
+	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
+	virtual int link_count()const;
+	virtual String link_name(int i)const;
+
+	virtual String link_local_name(int i)const;
+	virtual int get_link_index_from_name(const String &name)const;
+
+protected:
+	LinkableValueNode* create_new()const;
+	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
+
+public:
+	using synfig::LinkableValueNode::get_link_vfunc;
+
+	using synfig::LinkableValueNode::set_link_vfunc;
+	static bool check_type(ValueBase::Type type);
+	static ValueNode_Compare* create(const ValueBase &x);
+}; // END of class ValueNode_Compare
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/synfig-core/trunk/src/synfig/valuenode_not.cpp b/synfig-core/trunk/src/synfig/valuenode_not.cpp
new file mode 100644
index 0000000..b7ca310
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_not.cpp
@@ -0,0 +1,159 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_not.cpp
+**	\brief Implementation of the "Not" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_not.h"
+#include "valuenode_const.h"
+#include "general.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_Not::ValueNode_Not(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	bool value(x.get(bool()));
+
+	set_link("link",         ValueNode_Const::create(!value));
+}
+
+ValueNode_Not*
+ValueNode_Not::create(const ValueBase &x)
+{
+	return new ValueNode_Not(x);
+}
+
+LinkableValueNode*
+ValueNode_Not::create_new()const
+{
+	return new ValueNode_Not(get_type());
+}
+
+ValueNode_Not::~ValueNode_Not()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_Not::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(link_,     ValueBase::TYPE_BOOL);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Not::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return link_;
+	return 0;
+}
+
+int
+ValueNode_Not::link_count()const
+{
+	return 1;
+}
+
+String
+ValueNode_Not::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return _("Link");
+	return String();
+}
+
+String
+ValueNode_Not::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return "link";
+	return String();
+}
+
+int
+ValueNode_Not::get_link_index_from_name(const String &name)const
+{
+	if(name=="link")     return 0;
+
+	throw Exception::BadLinkName(name);
+}
+
+ValueBase
+ValueNode_Not::operator()(Time t)const
+{
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	bool link      = (*link_)    (t).get(bool());
+
+	return !link;
+}
+
+String
+ValueNode_Not::get_name()const
+{
+	return "not";
+}
+
+String
+ValueNode_Not::get_local_name()const
+{
+	return _("NOT");
+}
+
+bool
+ValueNode_Not::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_BOOL;
+}
diff --git a/synfig-core/trunk/src/synfig/valuenode_not.h b/synfig-core/trunk/src/synfig/valuenode_not.h
new file mode 100644
index 0000000..084a1b1
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_not.h
@@ -0,0 +1,80 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_not.h
+**	\brief Header file for implementation of the "Not" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_NOT_H
+#define __SYNFIG_VALUENODE_NOT_H
+
+/* === H E A D E R S ======================================================= */
+
+#include "valuenode.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_Not : public LinkableValueNode
+{
+	ValueNode::RHandle link_;
+
+public:
+	typedef etl::handle<ValueNode_Not> Handle;
+	typedef etl::handle<const ValueNode_Not> ConstHandle;
+
+	ValueNode_Not(const ValueBase &x);
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_Not();
+
+	virtual String get_name()const;
+	virtual String get_local_name()const;
+
+
+	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
+	virtual int link_count()const;
+	virtual String link_name(int i)const;
+
+	virtual String link_local_name(int i)const;
+	virtual int get_link_index_from_name(const String &name)const;
+
+protected:
+	LinkableValueNode* create_new()const;
+	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
+
+public:
+	using synfig::LinkableValueNode::get_link_vfunc;
+
+	using synfig::LinkableValueNode::set_link_vfunc;
+	static bool check_type(ValueBase::Type type);
+	static ValueNode_Not* create(const ValueBase &x);
+}; // END of class ValueNode_Not
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif
diff --git a/synfig-core/trunk/src/synfig/valuenode_or.cpp b/synfig-core/trunk/src/synfig/valuenode_or.cpp
new file mode 100644
index 0000000..a2d9e71
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_or.cpp
@@ -0,0 +1,168 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_or.cpp
+**	\brief Implementation of the "Or" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_or.h"
+#include "valuenode_const.h"
+#include "general.h"
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace std;
+using namespace etl;
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_Or::ValueNode_Or(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	bool value(x.get(bool()));
+
+	set_link("link1",        ValueNode_Const::create(bool(false)));
+	set_link("link2",        ValueNode_Const::create(bool(false)));
+	if (value)
+		set_link("link1",ValueNode_Const::create(bool(true)));
+}
+
+ValueNode_Or*
+ValueNode_Or::create(const ValueBase &x)
+{
+	return new ValueNode_Or(x);
+}
+
+LinkableValueNode*
+ValueNode_Or::create_new()const
+{
+	return new ValueNode_Or(get_type());
+}
+
+ValueNode_Or::~ValueNode_Or()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_Or::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(link1_,    ValueBase::TYPE_BOOL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(link2_,    ValueBase::TYPE_BOOL);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Or::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return link1_;
+	if(i==1) return link2_;
+	return 0;
+}
+
+int
+ValueNode_Or::link_count()const
+{
+	return 2;
+}
+
+String
+ValueNode_Or::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return _("Link1");
+	if(i==1) return _("Link2");
+	return String();
+}
+
+String
+ValueNode_Or::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return "link1";
+	if(i==1) return "link2";
+	return String();
+}
+
+int
+ValueNode_Or::get_link_index_from_name(const String &name)const
+{
+	if(name=="link1")    return 0;
+	if(name=="link2")    return 1;
+
+	throw Exception::BadLinkName(name);
+}
+
+ValueBase
+ValueNode_Or::operator()(Time t)const
+{
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	bool link1     = (*link1_)   (t).get(bool());
+	bool link2     = (*link2_)   (t).get(bool());
+
+	return (link1 || link2);
+}
+
+String
+ValueNode_Or::get_name()const
+{
+	return "or";
+}
+
+String
+ValueNode_Or::get_local_name()const
+{
+	return _("OR");
+}
+
+bool
+ValueNode_Or::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_BOOL;
+}
diff --git a/synfig-core/trunk/src/synfig/valuenode_or.h b/synfig-core/trunk/src/synfig/valuenode_or.h
new file mode 100644
index 0000000..b69a521
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_or.h
@@ -0,0 +1,81 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_or.h
+**	\brief Header file for implementation of the "Or" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2009 Nikita Kitaev
+**
+**	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
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_OR_H
+#define __SYNFIG_VALUENODE_OR_H
+
+/* === H E A D E R S ======================================================= */
+
+#include "valuenode.h"
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_Or : public LinkableValueNode
+{
+	ValueNode::RHandle link1_;
+	ValueNode::RHandle link2_;
+
+public:
+	typedef etl::handle<ValueNode_Or> Handle;
+	typedef etl::handle<const ValueNode_Or> ConstHandle;
+
+	ValueNode_Or(const ValueBase &x);
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_Or();
+
+	virtual String get_name()const;
+	virtual String get_local_name()const;
+
+
+	virtual ValueNode::LooseHandle get_link_vfunc(int i)const;
+	virtual int link_count()const;
+	virtual String link_name(int i)const;
+
+	virtual String link_local_name(int i)const;
+	virtual int get_link_index_from_name(const String &name)const;
+
+protected:
+	LinkableValueNode* create_new()const;
+	virtual bool set_link_vfunc(int i,ValueNode::Handle x);
+
+public:
+	using synfig::LinkableValueNode::get_link_vfunc;
+
+	using synfig::LinkableValueNode::set_link_vfunc;
+	static bool check_type(ValueBase::Type type);
+	static ValueNode_Or* create(const ValueBase &x);
+}; // END of class ValueNode_Or
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif