From: genete <genete@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Thu, 28 Aug 2008 09:06:23 +0000 (+0000)
Subject: Apply 2004406: New add new Logarithm Valuenode
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=376a3dcd5c49955bebcb04543446e7378b8ef298;p=synfig.git

Apply 2004406: New add new Logarithm Valuenode


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

diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am
index 080b1e0..745767e 100644
--- a/synfig-core/trunk/src/synfig/Makefile.am
+++ b/synfig-core/trunk/src/synfig/Makefile.am
@@ -37,7 +37,7 @@ VALUENODEHEADERS = \
 	valuenode_scale.h   valuenode_segcalctangent.h   valuenode_segcalcvertex.h   valuenode_sine.h			\
 	valuenode_step.h   valuenode_stripes.h   valuenode_subtract.h   valuenode_switch.h   valuenode_timedswap.h	\
 	valuenode_timeloop.h   valuenode_timestring.h   valuenode_twotone.h   valuenode_vectorangle.h			\
-	valuenode_vectorlength.h   valuenode_vectorx.h   valuenode_vectory.h
+	valuenode_vectorlength.h   valuenode_vectorx.h   valuenode_vectory.h valuenode_log.h
 VALUENODESOURCES = \
 	valuenode_add.cpp valuenode_anglestring.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp	\
 	valuenode_blinecalctangent.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalcwidth.cpp			\
@@ -49,7 +49,7 @@ VALUENODESOURCES = \
 	valuenode_scale.cpp valuenode_segcalctangent.cpp valuenode_segcalcvertex.cpp valuenode_sine.cpp			\
 	valuenode_step.cpp valuenode_stripes.cpp valuenode_subtract.cpp valuenode_switch.cpp valuenode_timedswap.cpp	\
 	valuenode_timeloop.cpp valuenode_timestring.cpp valuenode_twotone.cpp valuenode_vectorangle.cpp			\
-	valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp
+	valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp valuenode_log.cpp
 
 VALUEHEADERS = \
 	blinepoint.h   gradient.h   value.h
diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp
index e10da1f..3242c84 100644
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -83,6 +83,7 @@
 #include "valuenode_join.h"
 #include "valuenode_anglestring.h"
 #include "valuenode_intstring.h"
+#include "valuenode_log.h"
 
 #include "layer.h"
 
@@ -175,6 +176,7 @@ ValueNode::subsys_init()
 	ADD_VALUENODE(ValueNode_Join,			  "join",			  _("Joined List"),		 RELEASE_VERSION_0_61_09); // SVN r2007
 	ADD_VALUENODE(ValueNode_AngleString,	  "anglestring",	  _("Angle String"),	 RELEASE_VERSION_0_61_09); // SVN r2010
 	ADD_VALUENODE(ValueNode_IntString,		  "intstring",		  _("Int String"),		 RELEASE_VERSION_0_61_09); // SVN r2010
+	ADD_VALUENODE(ValueNode_Logarithm,		  "logarithm",		  _("Logarithm"),		 RELEASE_VERSION_0_61_09); // SVN r2034
 
 #undef ADD_VALUENODE
 #undef ADD_VALUENODE2
diff --git a/synfig-core/trunk/src/synfig/valuenode_log.cpp b/synfig-core/trunk/src/synfig/valuenode_log.cpp
new file mode 100644
index 0000000..b44a452
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_log.cpp
@@ -0,0 +1,183 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_log.cpp
+**	\brief Implementation of the "Natural Logarithm" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+**      Copyright (c) 2008 Carlos López
+**
+**	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_log.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_Logarithm::ValueNode_Logarithm(const ValueBase &x):
+	LinkableValueNode(x.get_type())
+{
+	Real value(x.get(Real()));
+	Real infinity(999999.0);
+	Real epsilon(0.000001);
+
+	value = exp(value);
+	
+	set_link("link",     ValueNode_Const::create(Real(value)));
+	set_link("epsilon",  ValueNode_Const::create(Real(epsilon)));
+	set_link("infinite", ValueNode_Const::create(Real(infinity)));
+}
+
+ValueNode_Logarithm*
+ValueNode_Logarithm::create(const ValueBase &x)
+{
+	return new ValueNode_Logarithm(x);
+}
+
+LinkableValueNode*
+ValueNode_Logarithm::create_new()const
+{
+	return new ValueNode_Logarithm(get_type());
+}
+
+ValueNode_Logarithm::~ValueNode_Logarithm()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_Logarithm::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_REAL);
+	case 1: CHECK_TYPE_AND_SET_VALUE(epsilon_,  ValueBase::TYPE_REAL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(infinite_, ValueBase::TYPE_REAL);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Logarithm::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return link_;
+	if(i==1) return epsilon_;
+	if(i==2) return infinite_;
+
+	return 0;
+}
+
+int
+ValueNode_Logarithm::link_count()const
+{
+	return 3;
+}
+
+String
+ValueNode_Logarithm::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return _("Link");
+	if(i==1) return _("Epsilon");
+	if(i==2) return _("Infinite");
+	return String();
+}
+
+String
+ValueNode_Logarithm::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0) return "link";
+	if(i==1) return "epsilon";
+	if(i==2) return "infinite";
+	return String();
+}
+
+int
+ValueNode_Logarithm::get_link_index_from_name(const String &name)const
+{
+	if(name=="link")     return 0;
+	if(name=="epsilon")  return 1;
+	if(name=="infinite") return 2;
+
+	throw Exception::BadLinkName(name);
+}
+
+ValueBase
+ValueNode_Logarithm::operator()(Time t)const
+{
+	Real link     = (*link_)    (t).get(Real());
+	Real epsilon  = (*epsilon_) (t).get(Real());
+	Real infinite = (*infinite_)(t).get(Real());
+
+	if (epsilon < 0.00000001)
+		epsilon = 0.00000001;
+
+	if (link < epsilon)
+			return -infinite;
+	else
+		return log(link);
+}
+
+String
+ValueNode_Logarithm::get_name()const
+{
+	return "logarithm";
+}
+
+String
+ValueNode_Logarithm::get_local_name()const
+{
+	return _("Logarithm");
+}
+
+bool
+ValueNode_Logarithm::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_REAL;
+}
+
+ 	  	 
diff --git a/synfig-core/trunk/src/synfig/valuenode_log.h b/synfig-core/trunk/src/synfig/valuenode_log.h
new file mode 100644
index 0000000..b7016bc
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_log.h
@@ -0,0 +1,85 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_log.h
+**	\brief Header file for implementation of the "Natural Logarithm" valuenode conversion.
+**
+**	$Id$
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
+**      Copyright (c) 2008 Carlos López
+**
+**	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_LOGARITHM_H
+#define __SYNFIG_VALUENODE_LOGARITHM_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_Logarithm : public LinkableValueNode
+{
+	ValueNode::RHandle link_;
+	ValueNode::RHandle epsilon_;
+	ValueNode::RHandle infinite_;
+
+public:
+	typedef etl::handle<ValueNode_Logarithm> Handle;
+	typedef etl::handle<const ValueNode_Logarithm> ConstHandle;
+
+	ValueNode_Logarithm(const ValueBase &x);
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_Logarithm();
+
+	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_Logarithm* create(const ValueBase &x);
+}; // END of class ValueNode_Logarithm
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif
+
+