From beb09459a38eb7f953bfe7e78affa504af20d857 Mon Sep 17 00:00:00 2001 From: dooglus Date: Sun, 11 Nov 2007 11:25:06 +0000 Subject: [PATCH] Add new convert type: aTan2. git-svn-id: http://svn.voria.com/code@1132 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_atan2.cpp | 180 +++++++++++++++++++++++ synfig-core/trunk/src/synfig/valuenode_atan2.h | 83 +++++++++++ 4 files changed, 267 insertions(+), 2 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_atan2.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_atan2.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index c5d8b35..39f3998 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_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 +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_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_atan2.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 21dabca..3654ab9 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -60,6 +60,7 @@ #include "valuenode_gradientrotate.h" #include "valuenode_sine.h" #include "valuenode_cos.h" +#include "valuenode_atan2.h" #include "valuenode_exp.h" #include "valuenode_switch.h" @@ -128,6 +129,7 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_GradientRotate, "gradient_rotate", _("Gradient Rotate") ); ADD_VALUENODE(ValueNode_Sine, "sine", _("Sine") ); ADD_VALUENODE(ValueNode_Cos, "cos", _("Cos") ); + ADD_VALUENODE(ValueNode_Atan2, "atan2", _("aTan2") ); ADD_VALUENODE(ValueNode_Exp, "exp", _("Exponential") ); ADD_VALUENODE(ValueNode_Switch, "switch", _("Switch") ); diff --git a/synfig-core/trunk/src/synfig/valuenode_atan2.cpp b/synfig-core/trunk/src/synfig/valuenode_atan2.cpp new file mode 100644 index 0000000..dc63017 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_atan2.cpp @@ -0,0 +1,180 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_atan2.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_atan2.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_Atan2::ValueNode_Atan2(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_ANGLE: + set_link("x",ValueNode_Const::create(Angle::cos(value.get(Angle())).get())); + set_link("y",ValueNode_Const::create(Angle::sin(value.get(Angle())).get())); + break; + default: + throw Exception::BadType(ValueBase::type_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_Atan2::create_new()const +{ + return new ValueNode_Atan2(get_type()); +} + +ValueNode_Atan2* +ValueNode_Atan2::create(const ValueBase &x) +{ + return new ValueNode_Atan2(x); +} + +ValueNode_Atan2::~ValueNode_Atan2() +{ + unlink_all(); +} + +ValueBase +ValueNode_Atan2::operator()(Time t)const +{ + return Angle::tan((*y_)(t).get(Real()), + (*x_)(t).get(Real())); +} + + +String +ValueNode_Atan2::get_name()const +{ + return "atan2"; +} + +String +ValueNode_Atan2::get_local_name()const +{ + return _("aTan2"); +} + +bool +ValueNode_Atan2::check_type(ValueBase::Type type) +{ + return type==ValueBase::TYPE_ANGLE; +} + +bool +ValueNode_Atan2::set_link_vfunc(int i,ValueNode::Handle x) +{ + assert(i==0 || i==1); + if(i==0) + { + x_=x; + signal_child_changed()(i);signal_value_changed()(); + return true; + } + if(i==1) + { + y_=x; + signal_child_changed()(i);signal_value_changed()(); + return true; + } + return false; +} + +ValueNode::LooseHandle +ValueNode_Atan2::get_link_vfunc(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return x_; + if(i==1) + return y_; + + return 0; +} + +int +ValueNode_Atan2::link_count()const +{ + return 2; +} + +String +ValueNode_Atan2::link_name(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return "x"; + if(i==1) + return "y"; + return String(); +} + +String +ValueNode_Atan2::link_local_name(int i)const +{ + assert(i==0 || i==1); + if(i==0) + return _("X"); + if(i==1) + return _("Y"); + return String(); +} + +int +ValueNode_Atan2::get_link_index_from_name(const String &name)const +{ + if(name=="x") + return 0; + if(name=="y") + return 1; + + throw Exception::BadLinkName(name); +} diff --git a/synfig-core/trunk/src/synfig/valuenode_atan2.h b/synfig-core/trunk/src/synfig/valuenode_atan2.h new file mode 100644 index 0000000..dfedc44 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_atan2.h @@ -0,0 +1,83 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_atan2.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_ATAN2_H +#define __SYNFIG_VALUENODE_ATAN2_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_Atan2 : public LinkableValueNode +{ + ValueNode::RHandle x_; + ValueNode::RHandle y_; + + ValueNode_Atan2(const ValueBase &value); + +public: + + typedef etl::handle Handle; + typedef etl::handle ConstHandle; + + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_Atan2(); + + 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_Atan2* create(const ValueBase &x); +}; // END of class ValueNode_Atan2 + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4