From b035e8067b5b072d68e7de25fe635079d70de8ec Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 8 Mar 2008 15:44:13 +0000 Subject: [PATCH] Add ValueNode "Dot Product". git-svn-id: http://svn.voria.com/code@1891 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/Makefile.am | 30 ++-- synfig-core/trunk/src/synfig/valuenode.cpp | 2 + .../trunk/src/synfig/valuenode_dotproduct.cpp | 194 +++++++++++++++++++++ .../trunk/src/synfig/valuenode_dotproduct.h | 83 +++++++++ 4 files changed, 295 insertions(+), 14 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_dotproduct.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_dotproduct.h diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index 963b88b..cae1d0d 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -29,23 +29,25 @@ IMPORTERSOURCES = \ VALUENODEHEADERS = \ valuenode_add.h valuenode_animated.h valuenode_atan2.h valuenode_bline.h valuenode_blinecalctangent.h \ valuenode_blinecalcvertex.h valuenode_blinecalcwidth.h valuenode_blinereversetangent.h \ - valuenode_composite.h valuenode_const.h valuenode_cos.h valuenode_duplicate.h valuenode_dynamiclist.h \ - valuenode_exp.h valuenode_gradientcolor.h valuenode_gradientrotate.h valuenode_integer.h \ - valuenode_linear.h 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_vectorangle.h valuenode_vectorlength.h valuenode_vectorx.h valuenode_vectory.h + valuenode_composite.h valuenode_const.h valuenode_cos.h valuenode_dotproduct.h valuenode_duplicate.h \ + valuenode_dynamiclist.h valuenode_exp.h valuenode_gradientcolor.h valuenode_gradientrotate.h \ + valuenode_integer.h valuenode_linear.h 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_vectorangle.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 \ - valuenode_composite.cpp valuenode_const.cpp valuenode_cos.cpp valuenode_duplicate.cpp valuenode_dynamiclist.cpp \ - valuenode_exp.cpp valuenode_gradientcolor.cpp valuenode_gradientrotate.cpp valuenode_integer.cpp \ - valuenode_linear.cpp 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_vectorangle.cpp valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp + valuenode_composite.cpp valuenode_const.cpp valuenode_cos.cpp valuenode_dotproduct.cpp valuenode_duplicate.cpp \ + valuenode_dynamiclist.cpp valuenode_exp.cpp valuenode_gradientcolor.cpp valuenode_gradientrotate.cpp \ + valuenode_integer.cpp valuenode_linear.cpp 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_vectorangle.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 ea08ddd..3c9302a 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -77,6 +77,7 @@ #include "valuenode_vectorx.h" #include "valuenode_vectory.h" #include "valuenode_gradientcolor.h" +#include "valuenode_dotproduct.h" #include "layer.h" @@ -163,6 +164,7 @@ ValueNode::subsys_init() 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 ADD_VALUENODE(ValueNode_GradientColor, "gradientcolor", _("Gradient Color"), RELEASE_VERSION_0_61_09); // SVN r1885 + ADD_VALUENODE(ValueNode_DotProduct, "dotproduct", _("Dot Product"), RELEASE_VERSION_0_61_09); // SVN r1891 #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_dotproduct.cpp b/synfig-core/trunk/src/synfig/valuenode_dotproduct.cpp new file mode 100644 index 0000000..20f8ae5 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_dotproduct.cpp @@ -0,0 +1,194 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_dotproduct.cpp +** \brief Implementation of the "DotProduct" valuenode conversion. +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 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_dotproduct.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_DotProduct::ValueNode_DotProduct(const ValueBase &value): + LinkableValueNode(value.get_type()) +{ + switch(value.get_type()) + { + case ValueBase::TYPE_REAL: + set_link("lhs",ValueNode_Const::create(Vector(1,0))); + set_link("rhs",ValueNode_Const::create(Vector(0,1))); + break; + case ValueBase::TYPE_ANGLE: + set_link("lhs",ValueNode_Const::create(Vector(1,0))); + set_link("rhs",ValueNode_Const::create(Vector(0,1))); + break; + default: + throw Exception::BadType(ValueBase::type_local_name(value.get_type())); + } + + DCAST_HACK_ENABLE(); +} + +LinkableValueNode* +ValueNode_DotProduct::create_new()const +{ + return new ValueNode_DotProduct(get_type()); +} + +ValueNode_DotProduct* +ValueNode_DotProduct::create(const ValueBase &x) +{ + return new ValueNode_DotProduct(x); +} + +ValueNode_DotProduct::~ValueNode_DotProduct() +{ + unlink_all(); +} + +ValueBase +ValueNode_DotProduct::operator()(Time t)const +{ + Vector lhs((*lhs_)(t).get(Vector())); + Vector rhs((*rhs_)(t).get(Vector())); + + switch (get_type()) + { + case ValueBase::TYPE_ANGLE: + return Angle::cos(lhs * rhs / lhs.mag() / rhs.mag()).mod(); + case ValueBase::TYPE_REAL: + return lhs * rhs; + } + + assert(0); + return ValueBase(); +} + +String +ValueNode_DotProduct::get_name()const +{ + return "dotproduct"; +} + +String +ValueNode_DotProduct::get_local_name()const +{ + return _("Dot Product"); +} + +bool +ValueNode_DotProduct::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_DotProduct(); + + 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_DotProduct* create(const ValueBase &x); +}; // END of class ValueNode_DotProduct + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4