From fae8a5ec5b6e370e8bd49c8791209473fffcb389 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 14 Feb 2008 16:58:23 +0000 Subject: [PATCH] Add a new valuenode 'Bline Width' for finding the width of a bline at an arbitrary point along the curve. git-svn-id: http://svn.voria.com/code@1694 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/po/POTFILES.in | 2 + synfig-core/trunk/src/synfig/Makefile.am | 30 +-- synfig-core/trunk/src/synfig/valuenode.cpp | 2 + .../trunk/src/synfig/valuenode_blinecalcwidth.cpp | 220 +++++++++++++++++++++ .../trunk/src/synfig/valuenode_blinecalcwidth.h | 80 ++++++++ 5 files changed, 319 insertions(+), 15 deletions(-) create mode 100644 synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp create mode 100644 synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.h diff --git a/synfig-core/trunk/po/POTFILES.in b/synfig-core/trunk/po/POTFILES.in index b95cb55..e9721a3 100644 --- a/synfig-core/trunk/po/POTFILES.in +++ b/synfig-core/trunk/po/POTFILES.in @@ -289,6 +289,8 @@ src/synfig/valuenode_blinecalctangent.cpp src/synfig/valuenode_blinecalctangent.h src/synfig/valuenode_blinecalcvertex.cpp src/synfig/valuenode_blinecalcvertex.h +src/synfig/valuenode_blinecalcwidth.cpp +src/synfig/valuenode_blinecalcwidth.h src/synfig/valuenode_composite.cpp src/synfig/valuenode_composite.h src/synfig/valuenode_const.cpp diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index a52bf7e..b5880bc 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -27,23 +27,23 @@ IMPORTERSOURCES = \ listimporter.cpp VALUENODEHEADERS = \ - valuenode_add.h valuenode_animated.h valuenode_atan2.h valuenode_bline.h valuenode_blinecalctangent.h \ - valuenode_blinecalcvertex.h valuenode_blinereversetangent.h valuenode_composite.h valuenode_const.h \ - valuenode_cos.h valuenode_duplicate.h valuenode_dynamiclist.h valuenode_exp.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_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_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 VALUENODESOURCES = \ valuenode_add.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp valuenode_blinecalctangent.cpp \ - valuenode_blinecalcvertex.cpp valuenode_blinereversetangent.cpp valuenode_composite.cpp valuenode_const.cpp \ - valuenode_cos.cpp valuenode_duplicate.cpp valuenode_dynamiclist.cpp valuenode_exp.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_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_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 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 ced3891..ccf0695 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -47,6 +47,7 @@ #include "valuenode_scale.h" #include "valuenode_blinecalctangent.h" #include "valuenode_blinecalcvertex.h" +#include "valuenode_blinecalcwidth.h" #include "valuenode_blinereversetangent.h" #include "valuenode_segcalctangent.h" #include "valuenode_segcalcvertex.h" @@ -150,6 +151,7 @@ ValueNode::subsys_init() ADD_VALUENODE(ValueNode_Duplicate, "duplicate", _("Duplicate") ,RELEASE_VERSION_0_61_08); // SVN r1267 ADD_VALUENODE(ValueNode_Integer, "fromint", _("From Integer") ,RELEASE_VERSION_0_61_08); // SVN r1267 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 r16?? #undef ADD_VALUENODE #undef ADD_VALUENODE2 diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp new file mode 100644 index 0000000..9371e30 --- /dev/null +++ b/synfig-core/trunk/src/synfig/valuenode_blinecalcwidth.cpp @@ -0,0 +1,220 @@ +/* === S Y N F I G ========================================================= */ +/*! \file valuenode_blinecalcwidth.cpp +** \brief Implementation of the "BLine Width" 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_blinecalcwidth.h" +#include "valuenode_bline.h" +#include "valuenode_const.h" +#include "valuenode_composite.h" +#include "general.h" +#include "exception.h" +#include + +#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_BLineCalcWidth::ValueNode_BLineCalcWidth(const ValueBase::Type &x): + LinkableValueNode(x) +{ + if(x!=ValueBase::TYPE_REAL) + throw Exception::BadType(ValueBase::type_local_name(x)); + + ValueNode_BLine* value_node(new ValueNode_BLine()); + set_link("bline",value_node); + set_link("loop",ValueNode_Const::create(bool(false))); + set_link("amount",ValueNode_Const::create(Real(0.5))); +} + +LinkableValueNode* +ValueNode_BLineCalcWidth::create_new()const +{ + return new ValueNode_BLineCalcWidth(ValueBase::TYPE_REAL); +} + +ValueNode_BLineCalcWidth* +ValueNode_BLineCalcWidth::create(const ValueBase &x) +{ + return new ValueNode_BLineCalcWidth(x.get_type()); +} + +ValueNode_BLineCalcWidth::~ValueNode_BLineCalcWidth() +{ + unlink_all(); +} + +ValueBase +ValueNode_BLineCalcWidth::operator()(Time t)const +{ + const std::vector bline((*bline_)(t)); + handle bline_value_node(bline_); + const bool looped(bline_value_node->get_loop()); + int size = bline.size(), from_vertex; + bool loop((*loop_)(t).get(bool())); + Real amount((*amount_)(t).get(Real())); + BLinePoint blinepoint0, blinepoint1; + + if (!looped) size--; + if (size < 1) return Real(); + if (loop) + { + amount = amount - int(amount); + if (amount < 0) amount++; + } + else + { + if (amount < 0) amount = 0; + if (amount > 1) amount = 1; + } + + vector::const_iterator iter, next(bline.begin()); + + iter = looped ? --bline.end() : next++; + amount = amount * size; + from_vertex = int(amount); + if (from_vertex > size-1) from_vertex = size-1; + blinepoint0 = from_vertex ? *(next+from_vertex-1) : *iter; + blinepoint1 = *(next+from_vertex); + + float width0 = blinepoint0.get_width(); + float width1 = blinepoint1.get_width(); + + return Real(width0 + (amount-from_vertex) * (width1-width0)); +} + + + + + + + +String +ValueNode_BLineCalcWidth::get_name()const +{ + return "blinecalcwidth"; +} + +String +ValueNode_BLineCalcWidth::get_local_name()const +{ + return _("BLine Width"); +} + +bool +ValueNode_BLineCalcWidth::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_BLineCalcWidth(); + + 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_BLineCalcWidth* create(const ValueBase &x=ValueBase::TYPE_REAL); +}; // END of class ValueNode_BLineCalcWidth + +}; // END of namespace synfig + +/* === E N D =============================================================== */ + +#endif -- 2.7.4