From c1bc26f5ac49529976e682fbdb9eff2da11eb709 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 27 Dec 2007 20:39:20 +0000 Subject: [PATCH] Added new convert type "Reciprocal" to convert x to 1/x. git-svn-id: http://svn.voria.com/code@1238 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 4 +- synfig-core/trunk/src/synfig/valuenode.cpp | 2 + .../trunk/src/synfig/valuenode_reciprocal.cpp | 179 +++++++++++++++++++++ .../trunk/src/synfig/valuenode_reciprocal.h | 83 ++++++++++ 4 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_reciprocal.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_reciprocal.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index 613b45e..dc5fad6 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -14,8 +14,8 @@ TARGETSOURCES=target_scanline.cpp target_tile.cpp target_multi.cpp target_null.c IMPORTERHEADERS=listimporter.h IMPORTERSOURCES=listimporter.cpp -VALUENODEHEADERS=valuenode_exp.h valuenode_sine.h valuenode_cos.h valuenode_atan2.h valuenode_radialcomposite.h valuenode_bline.h valuenode_blinecalcvertex.h valuenode_blinecalctangent.h valuenode_blinereversetangent.h valuenode_segcalcvertex.h valuenode_segcalctangent.h valuenode_twotone.h valuenode_repeat_gradient.h valuenode_stripes.h valuenode_add.h valuenode_subtract.h valuenode_const.h valuenode_range.h valuenode_reference.h valuenode_linear.h valuenode_composite.h valuenode_dynamiclist.h valuenode_animated.h valuenode_scale.h valuenode_timedswap.h valuenode_gradientrotate.h valuenode_switch.h valuenode_timeloop.h -VALUENODESOURCES=valuenode_exp.cpp valuenode_sine.cpp valuenode_cos.cpp valuenode_atan2.cpp valuenode_radialcomposite.cpp valuenode_bline.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalctangent.cpp valuenode_blinereversetangent.cpp valuenode_segcalcvertex.cpp valuenode_segcalctangent.cpp valuenode_twotone.cpp valuenode_repeat_gradient.cpp valuenode_stripes.cpp valuenode_add.cpp valuenode_subtract.cpp valuenode_const.cpp valuenode_range.cpp valuenode_reference.cpp valuenode_linear.cpp valuenode_composite.cpp valuenode_dynamiclist.cpp valuenode_animated.cpp valuenode_scale.cpp valuenode_timedswap.cpp valuenode_gradientrotate.cpp valuenode_switch.cpp valuenode_timeloop.cpp +VALUENODEHEADERS=valuenode_exp.h valuenode_sine.h valuenode_cos.h valuenode_atan2.h valuenode_radialcomposite.h valuenode_bline.h valuenode_blinecalcvertex.h valuenode_blinecalctangent.h valuenode_blinereversetangent.h valuenode_segcalcvertex.h valuenode_segcalctangent.h valuenode_twotone.h valuenode_repeat_gradient.h valuenode_stripes.h valuenode_add.h valuenode_subtract.h valuenode_const.h valuenode_range.h valuenode_reference.h valuenode_linear.h valuenode_composite.h valuenode_dynamiclist.h valuenode_animated.h valuenode_scale.h valuenode_timedswap.h valuenode_gradientrotate.h valuenode_switch.h valuenode_timeloop.h valuenode_reciprocal.h +VALUENODESOURCES=valuenode_exp.cpp valuenode_sine.cpp valuenode_cos.cpp valuenode_atan2.cpp valuenode_radialcomposite.cpp valuenode_bline.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalctangent.cpp valuenode_blinereversetangent.cpp valuenode_segcalcvertex.cpp valuenode_segcalctangent.cpp valuenode_twotone.cpp valuenode_repeat_gradient.cpp valuenode_stripes.cpp valuenode_add.cpp valuenode_subtract.cpp valuenode_const.cpp valuenode_range.cpp valuenode_reference.cpp valuenode_linear.cpp valuenode_composite.cpp valuenode_dynamiclist.cpp valuenode_animated.cpp valuenode_scale.cpp valuenode_timedswap.cpp valuenode_gradientrotate.cpp valuenode_switch.cpp valuenode_timeloop.cpp valuenode_reciprocal.cpp VALUEHEADERS=blinepoint.h gradient.h value.h VALUESOURCES=blinepoint.cpp gradient.cpp value.cpp diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 827ef4f..297f2dd 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -65,6 +65,7 @@ #include "valuenode_exp.h" #include "valuenode_switch.h" #include "valuenode_timeloop.h" +#include "valuenode_reciprocal.h" #include "layer.h" @@ -136,6 +137,7 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_Exp, "exp", _("Exponential") ); ADD_VALUENODE(ValueNode_Switch, "switch", _("Switch") ); ADD_VALUENODE(ValueNode_TimeLoop, "timeloop", _("Time Loop") ); + ADD_VALUENODE(ValueNode_Reciprocal, "reciprocal", _("Reciprocal") ); #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_reciprocal.cpp b/synfig-core/trunk/src/synfig/valuenode_reciprocal.cpp new file mode 100644 index 0000000..4af2051 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_reciprocal.cpp @@ -0,0 +1,179 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_reciprocal.cpp +** \brief Implementation of the "Reciprocal" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 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 +** 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 +#endif + +#include "valuenode_reciprocal.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_Reciprocal::ValueNode_Reciprocal(const ValueBase::Type &x): + LinkableValueNode(x) +{ +} + +ValueNode_Reciprocal::ValueNode_Reciprocal(const ValueNode::Handle &x): + LinkableValueNode(x->get_type()) +{ + set_link("link", x); + set_link("epsilon", ValueNode_Const::create(Real(0.000001))); + set_link("infinite", ValueNode_Const::create(Real(999999.0))); +} + +ValueNode_Reciprocal* +ValueNode_Reciprocal::create(const ValueBase &x) +{ + return new ValueNode_Reciprocal(ValueNode_Const::create(x)); +} + +LinkableValueNode* +ValueNode_Reciprocal::create_new()const +{ + return new ValueNode_Reciprocal(get_type()); +} + +ValueNode_Reciprocal::~ValueNode_Reciprocal() +{ + unlink_all(); +} + +bool +ValueNode_Reciprocal::set_link_vfunc(int i,ValueNode::Handle x) +{ + assert(i >= 0 && i < link_count()); + switch(i) + { + case 0: link_ = x; break; + case 1: epsilon_ = x; break; + case 2: infinite_ = x; break; + default: return false; + } + + signal_child_changed()(i); + signal_value_changed()(); + return true; +} + +ValueNode::LooseHandle +ValueNode_Reciprocal::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_Reciprocal::link_count()const +{ + return 3; +} + +String +ValueNode_Reciprocal::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_Reciprocal::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_Reciprocal::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_Reciprocal::operator()(Time t)const +{ + Real link = (*link_) (t).get(Real()); + Real epsilon = (*epsilon_) (t).get(Real()); + Real infinite = (*infinite_)(t).get(Real()); + + if (abs(link) < epsilon) + if (link < 0) + return -infinite; + else + return infinite; + else + return 1.0f / link; +} + +String +ValueNode_Reciprocal::get_name()const +{ + return "reciprocal"; +} + +String +ValueNode_Reciprocal::get_local_name()const +{ + return _("Reciprocal"); +} + +bool +ValueNode_Reciprocal::check_type(ValueBase::Type type) +{ + return type==ValueBase::TYPE_REAL; +} diff --git a/synfig-core/trunk/src/synfig/valuenode_reciprocal.h b/synfig-core/trunk/src/synfig/valuenode_reciprocal.h new file mode 100644 index 0000000..820fca3 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_reciprocal.h @@ -0,0 +1,83 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_reciprocal.h +** \brief Header file for implementation of the "Reciprocal" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 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 +** 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_RECIPROCAL_H +#define __SYNFIG_VALUENODE_RECIPROCAL_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_Reciprocal : public LinkableValueNode +{ + ValueNode::RHandle link_; + ValueNode::RHandle epsilon_; + ValueNode::RHandle infinite_; + +public: + typedef etl::handle Handle; + typedef etl::handle ConstHandle; + + ValueNode_Reciprocal(const ValueBase::Type &x); + ValueNode_Reciprocal(const ValueNode::Handle &x); + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_Reciprocal(); + + 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_Reciprocal* create(const ValueBase &x); +}; // END of class ValueNode_Reciprocal + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4