From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sat, 8 Mar 2008 12:07:59 +0000 (+0000)
Subject: Add ValueNode "Vector Length" for calculating the length of a vector.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9f3c3466f998f1b5cc945c92332b9e7d2b8fd1cc;p=synfig.git

Add ValueNode "Vector Length" for calculating the length of a vector.


git-svn-id: http://svn.voria.com/code@1881 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am
index f6ea2d1..8db63ec 100644
--- a/synfig-core/trunk/src/synfig/Makefile.am
+++ b/synfig-core/trunk/src/synfig/Makefile.am
@@ -34,7 +34,8 @@ 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_vectorangle.h
+	valuenode_timedswap.h   valuenode_timeloop.h   valuenode_twotone.h   valuenode_vectorangle.h			\
+	valuenode_vectorlength.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 +44,8 @@ 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_vectorangle.cpp
+	valuenode_timedswap.cpp valuenode_timeloop.cpp valuenode_twotone.cpp valuenode_vectorangle.cpp			\
+	valuenode_vectorlength.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 a8e0fde..6320fd9 100644
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -73,6 +73,7 @@
 #include "valuenode_integer.h"
 #include "valuenode_step.h"
 #include "valuenode_vectorangle.h"
+#include "valuenode_vectorlength.h"
 
 #include "layer.h"
 
@@ -154,7 +155,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????
+	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
 
 #undef ADD_VALUENODE
 #undef ADD_VALUENODE2
diff --git a/synfig-core/trunk/src/synfig/valuenode_vectorlength.cpp b/synfig-core/trunk/src/synfig/valuenode_vectorlength.cpp
new file mode 100644
index 0000000..7eac3dd
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_vectorlength.cpp
@@ -0,0 +1,165 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_vectorlength.cpp
+**	\brief Implementation of the "Vector Length" 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 <config.h>
+#endif
+
+#include "valuenode_vectorlength.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_VectorLength::ValueNode_VectorLength(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_VectorLength::create_new()const
+{
+	return new ValueNode_VectorLength(get_type());
+}
+
+ValueNode_VectorLength*
+ValueNode_VectorLength::create(const ValueBase &x)
+{
+	return new ValueNode_VectorLength(x);
+}
+
+ValueNode_VectorLength::~ValueNode_VectorLength()
+{
+	unlink_all();
+}
+
+ValueBase
+ValueNode_VectorLength::operator()(Time t)const
+{
+	return (*vector_)(t).get(Vector()).mag();
+}
+
+
+bool
+ValueNode_VectorLength::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(vector_, ValueBase::TYPE_VECTOR);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_VectorLength::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0)
+		return vector_;
+	return 0;
+}
+
+int
+ValueNode_VectorLength::link_count()const
+{
+	return 1;
+}
+
+String
+ValueNode_VectorLength::link_local_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0)
+		return _("Vector");
+	return String();
+}
+
+String
+ValueNode_VectorLength::link_name(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0)
+		return "vector";
+	return String();
+}
+
+int
+ValueNode_VectorLength::get_link_index_from_name(const String &name)const
+{
+	if(name=="vector")
+		return 0;
+
+	throw Exception::BadLinkName(name);
+}
+
+String
+ValueNode_VectorLength::get_name()const
+{
+	return "vectorlength";
+}
+
+String
+ValueNode_VectorLength::get_local_name()const
+{
+	return _("Vector Length");
+}
+
+bool
+ValueNode_VectorLength::check_type(ValueBase::Type type)
+{
+	return type==ValueBase::TYPE_REAL;
+}
diff --git a/synfig-core/trunk/src/synfig/valuenode_vectorlength.h b/synfig-core/trunk/src/synfig/valuenode_vectorlength.h
new file mode 100644
index 0000000..2487fcd
--- /dev/null
+++ b/synfig-core/trunk/src/synfig/valuenode_vectorlength.h
@@ -0,0 +1,82 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_vectorlength.h
+**	\brief Header file for implementation of the "Vector Length" valuenode conversion.
+**
+**	$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_VECTORLENGTH_H
+#define __SYNFIG_VALUENODE_VECTORLENGTH_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_VectorLength : public LinkableValueNode
+{
+	ValueNode::RHandle vector_;
+
+	ValueNode_VectorLength(const ValueBase &value);
+
+public:
+
+	typedef etl::handle<ValueNode_VectorLength> Handle;
+	typedef etl::handle<const ValueNode_VectorLength> ConstHandle;
+
+
+	virtual ValueBase operator()(Time t)const;
+
+	virtual ~ValueNode_VectorLength();
+
+	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_VectorLength* create(const ValueBase &x);
+}; // END of class ValueNode_VectorLength
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif