From 73104d3288136dade7035bb45b5bd1a49c520576 Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 8 Mar 2008 12:30:42 +0000 Subject: [PATCH] Add ValueNodes "Vector X" and "Vector Y" for calculating the X and Y components of a vector. git-svn-id: http://svn.voria.com/code@1882 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 4 +- synfig-core/trunk/src/synfig/valuenode.cpp | 4 + synfig-core/trunk/src/synfig/valuenode_vectorx.cpp | 165 +++++++++++++++++++++ synfig-core/trunk/src/synfig/valuenode_vectorx.h | 82 ++++++++++ synfig-core/trunk/src/synfig/valuenode_vectory.cpp | 165 +++++++++++++++++++++ synfig-core/trunk/src/synfig/valuenode_vectory.h | 82 ++++++++++ 6 files changed, 500 insertions(+), 2 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectorx.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectorx.h create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectory.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_vectory.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index 8db63ec..9197443 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -35,7 +35,7 @@ VALUENODEHEADERS = \ 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_vectorangle.h \ - valuenode_vectorlength.h + valuenode_vectorlength.h valuenode_vectorx.h valuenode_vectory.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 \ @@ -45,7 +45,7 @@ VALUENODESOURCES = \ 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_vectorangle.cpp \ - valuenode_vectorlength.cpp + valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.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 6320fd9..f5a1b67 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -74,6 +74,8 @@ #include "valuenode_step.h" #include "valuenode_vectorangle.h" #include "valuenode_vectorlength.h" +#include "valuenode_vectorx.h" +#include "valuenode_vectory.h" #include "layer.h" @@ -157,6 +159,8 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_VectorAngle, "vectorangle", _("Vector Angle"), RELEASE_VERSION_0_61_09); // SVN r1880 ADD_VALUENODE(ValueNode_VectorLength, "vectorlength", _("Vector Length"), RELEASE_VERSION_0_61_09); // SVN r1881 + ADD_VALUENODE(ValueNode_VectorX, "vectorx", _("Vector X"), RELEASE_VERSION_0_61_09); // SVN r1882 + ADD_VALUENODE(ValueNode_VectorY, "vectory", _("Vector Y"), RELEASE_VERSION_0_61_09); // SVN r1882 #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_vectorx.cpp b/synfig-core/trunk/src/synfig/valuenode_vectorx.cpp new file mode 100644 index 0000000..6d60ba8 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_vectorx.cpp @@ -0,0 +1,165 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_vectorx.cpp +** \brief Implementation of the "Vector X" 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_vectorx.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_VectorX::ValueNode_VectorX(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_REAL: + set_link("vector",ValueNode_Const::create(Vector(value.get(Real()), 0))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_VectorX::create_new()const +{ + return new ValueNode_VectorX(get_type()); +} + +ValueNode_VectorX* +ValueNode_VectorX::create(const ValueBase &x) +{ + return new ValueNode_VectorX(x); +} + +ValueNode_VectorX::~ValueNode_VectorX() +{ + unlink_all(); +} + +ValueBase +ValueNode_VectorX::operator()(Time t)const +{ + return (*vector_)(t).get(Vector())[0]; +} + + +bool +ValueNode_VectorX::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_VectorX(); + + 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_VectorX* create(const ValueBase &x); +}; // END of class ValueNode_VectorX + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-core/trunk/src/synfig/valuenode_vectory.cpp b/synfig-core/trunk/src/synfig/valuenode_vectory.cpp new file mode 100644 index 0000000..fe32229 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_vectory.cpp @@ -0,0 +1,165 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_vectory.cpp +** \brief Implementation of the "Vector Y" 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_vectory.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_VectorY::ValueNode_VectorY(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_REAL: + set_link("vector",ValueNode_Const::create(Vector(0, value.get(Real())))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_VectorY::create_new()const +{ + return new ValueNode_VectorY(get_type()); +} + +ValueNode_VectorY* +ValueNode_VectorY::create(const ValueBase &x) +{ + return new ValueNode_VectorY(x); +} + +ValueNode_VectorY::~ValueNode_VectorY() +{ + unlink_all(); +} + +ValueBase +ValueNode_VectorY::operator()(Time t)const +{ + return (*vector_)(t).get(Vector())[1]; +} + + +bool +ValueNode_VectorY::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_VectorY(); + + 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_VectorY* create(const ValueBase &x); +}; // END of class ValueNode_VectorY + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4