From 88bdf68564de9e59d3915488c3d650a19fc64b70 Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 8 Mar 2008 12:06:20 +0000 Subject: [PATCH 1/1] Add new ValueNode "Vector Angle" for calculating an angle from a vector. git-svn-id: http://svn.voria.com/code@1880 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 4 +- synfig-core/trunk/src/synfig/valuenode.cpp | 3 + .../trunk/src/synfig/valuenode_vectorangle.cpp | 166 +++++++++++++++++++++ .../trunk/src/synfig/valuenode_vectorangle.h | 82 ++++++++++ 4 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectorangle.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectorangle.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index b5880bc..f6ea2d1 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -34,7 +34,7 @@ VALUENODEHEADERS = \ valuenode_radialcomposite.h valuenode_range.h valuenode_reciprocal.h valuenode_reference.h \ valuenode_repeat_gradient.h 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_twotone.h + valuenode_timedswap.h valuenode_timeloop.h valuenode_twotone.h valuenode_vectorangle.h VALUENODESOURCES = \ valuenode_add.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp valuenode_blinecalctangent.cpp \ valuenode_blinecalcvertex.cpp valuenode_blinecalcwidth.cpp valuenode_blinereversetangent.cpp \ @@ -43,7 +43,7 @@ VALUENODESOURCES = \ valuenode_radialcomposite.cpp valuenode_range.cpp valuenode_reciprocal.cpp valuenode_reference.cpp \ valuenode_repeat_gradient.cpp 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_twotone.cpp + valuenode_timedswap.cpp valuenode_timeloop.cpp valuenode_twotone.cpp valuenode_vectorangle.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 c9d697b..a8e0fde 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -72,6 +72,7 @@ #include "valuenode_duplicate.h" #include "valuenode_integer.h" #include "valuenode_step.h" +#include "valuenode_vectorangle.h" #include "layer.h" @@ -153,6 +154,8 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_Step, "step", _("Step"), RELEASE_VERSION_0_61_08); // SVN r1691 ADD_VALUENODE(ValueNode_BLineCalcWidth, "blinecalcwidth", _("BLine Width"), RELEASE_VERSION_0_61_08); // SVN r1694 + ADD_VALUENODE(ValueNode_VectorAngle, "vectorangle", _("Vector Angle"), RELEASE_VERSION_0_61_09); // SVN r???? + #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_vectorangle.cpp b/synfig-core/trunk/src/synfig/valuenode_vectorangle.cpp new file mode 100644 index 0000000..8d8d7e7 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_vectorangle.cpp @@ -0,0 +1,166 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_vectorangle.cpp +** \brief Implementation of the "Vector Angle" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 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_vectorangle.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_VectorAngle::ValueNode_VectorAngle(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_ANGLE: + set_link("vector",ValueNode_Const::create(Vector(Angle::cos(value.get(Angle())).get(), + Angle::sin(value.get(Angle())).get()))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_VectorAngle::create_new()const +{ + return new ValueNode_VectorAngle(get_type()); +} + +ValueNode_VectorAngle* +ValueNode_VectorAngle::create(const ValueBase &x) +{ + return new ValueNode_VectorAngle(x); +} + +ValueNode_VectorAngle::~ValueNode_VectorAngle() +{ + unlink_all(); +} + +ValueBase +ValueNode_VectorAngle::operator()(Time t)const +{ + return (*vector_)(t).get(Vector()).angle(); +} + + +bool +ValueNode_VectorAngle::set_link_vfunc(int i,ValueNode::Handle value) +{ + assert(i>=0 && i=0 && i=0 && i=0 && i Handle; + typedef etl::handle ConstHandle; + + + virtual ValueBase operator()(Time t)const; + + virtual ~ValueNode_VectorAngle(); + + 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_VectorAngle* create(const ValueBase &x); +}; // END of class ValueNode_VectorAngle + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4