From 02132a5a2f9e5b5fd0fc5198574fba0319c1a885 Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 6 Nov 2007 23:03:18 +0000 Subject: [PATCH] Add a 'cos' convert type, to go with 'sine'. git-svn-id: http://svn.voria.com/code@1111 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 4 +- synfig-core/trunk/src/synfig/valuenode.cpp | 2 + synfig-core/trunk/src/synfig/valuenode_cos.cpp | 183 +++++++++++++++++++++++++ synfig-core/trunk/src/synfig/valuenode_cos.h | 83 +++++++++++ 4 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_cos.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_cos.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index 08166a4..016dc84 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -16,8 +16,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_radialcomposite.h valuenode_bline.h valuenode_blinecalcvertex.h valuenode_blinecalctangent.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 -VALUENODESOURCES=valuenode_exp.cpp valuenode_sine.cpp valuenode_radialcomposite.cpp valuenode_bline.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalctangent.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 +VALUENODEHEADERS=valuenode_exp.h valuenode_sine.h valuenode_cos.h valuenode_radialcomposite.h valuenode_bline.h valuenode_blinecalcvertex.h valuenode_blinecalctangent.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 +VALUENODESOURCES=valuenode_exp.cpp valuenode_sine.cpp valuenode_cos.cpp valuenode_radialcomposite.cpp valuenode_bline.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalctangent.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 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 6ef7c9a..21dabca 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -59,6 +59,7 @@ #include "valuenode_radialcomposite.h" #include "valuenode_gradientrotate.h" #include "valuenode_sine.h" +#include "valuenode_cos.h" #include "valuenode_exp.h" #include "valuenode_switch.h" @@ -126,6 +127,7 @@ ValueNode::subsys_init() ADD_VALUENODE2(ValueNode_DynamicList, "dynamic_list", _("Dynamic List") ); ADD_VALUENODE(ValueNode_GradientRotate, "gradient_rotate", _("Gradient Rotate") ); ADD_VALUENODE(ValueNode_Sine, "sine", _("Sine") ); + ADD_VALUENODE(ValueNode_Cos, "cos", _("Cos") ); ADD_VALUENODE(ValueNode_Exp, "exp", _("Exponential") ); ADD_VALUENODE(ValueNode_Switch, "switch", _("Switch") ); diff --git a/synfig-core/trunk/src/synfig/valuenode_cos.cpp b/synfig-core/trunk/src/synfig/valuenode_cos.cpp new file mode 100644 index 0000000..50543b2 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_cos.cpp @@ -0,0 +1,183 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_cos.cpp +** \brief Template File +** +** $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_cos.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_Cos::ValueNode_Cos(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_REAL: + set_link("angle",ValueNode_Const::create(Angle::deg(90))); + set_link("amp",ValueNode_Const::create(value.get(Real()))); + break; + default: + throw Exception::BadType(ValueBase::type_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_Cos::create_new()const +{ + return new ValueNode_Cos(get_type()); +} + +ValueNode_Cos* +ValueNode_Cos::create(const ValueBase &x) +{ + return new ValueNode_Cos(x); +} + +ValueNode_Cos::~ValueNode_Cos() +{ + unlink_all(); +} + +ValueBase +ValueNode_Cos::operator()(Time t)const +{ + return + Angle::cos( + (*angle_)(t).get(Angle()) + ).get() * (*amp_)(t).get(Real()) + ; +} + + +String +ValueNode_Cos::get_name()const +{ + return "cos"; +} + +String +ValueNode_Cos::get_local_name()const +{ + return _("Cos"); +} + +bool +ValueNode_Cos::check_type(ValueBase::Type type) +{ + return type==ValueBase::TYPE_REAL; +} + +bool +ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle x) +{ + assert(i==0 || i==1); + if(i==0) + { + angle_=x; + signal_child_changed()(i);signal_value_changed()(); + return true; + } + if(i==1) + { + amp_=x; + signal_child_changed()(i);signal_value_changed()(); + return true; + } + return false; +} + +ValueNode::LooseHandle +ValueNode_Cos::get_link_vfunc(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return angle_; + if(i==1) + return amp_; + + return 0; +} + +int +ValueNode_Cos::link_count()const +{ + return 2; +} + +String +ValueNode_Cos::link_name(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return "angle"; + if(i==1) + return "amp"; + return String(); +} + +String +ValueNode_Cos::link_local_name(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return _("Angle"); + if(i==1) + return _("Amplitude"); + return String(); +} + +int +ValueNode_Cos::get_link_index_from_name(const String &name)const +{ + if(name=="angle") + return 0; + if(name=="amp") + return 1; + + throw Exception::BadLinkName(name); +} diff --git a/synfig-core/trunk/src/synfig/valuenode_cos.h b/synfig-core/trunk/src/synfig/valuenode_cos.h new file mode 100644 index 0000000..8b7231b --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_cos.h @@ -0,0 +1,83 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_cos.h +** \brief Template Header +** +** $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_COS_H +#define __SYNFIG_VALUENODE_COS_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_Cos : public LinkableValueNode +{ + ValueNode::RHandle angle_; + ValueNode::RHandle amp_; + + ValueNode_Cos(const ValueBase &value); + +public: + + typedef etl::handle Handle; + typedef etl::handle ConstHandle; + + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_Cos(); + + 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_Cos* create(const ValueBase &x); +}; // END of class ValueNode_Cos + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4