Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_segcalcvertex.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index 8684f11..6391f39 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file valuenode_segcalcvertex.cpp
-**     \brief Template File
+**     \brief Implementation of the "Segment Vertex" valuenode conversion.
 **
-**     $Id: valuenode_segcalcvertex.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     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.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     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
 */
 /* ========================================================================= */
@@ -42,7 +44,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -56,11 +58,10 @@ ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
        LinkableValueNode(x)
 {
        if(x!=ValueBase::TYPE_VECTOR)
-               throw Exception::BadType(ValueBase::type_name(x));
-       
-       segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT);
-       amount_=ValueNode_Const::create(Real(0.5));
-       
+               throw Exception::BadType(ValueBase::type_local_name(x));
+
+       set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
+       set_link("amount",ValueNode_Const::create(Real(0.5)));
 }
 
 ValueNode_SegCalcVertex*
@@ -77,10 +78,13 @@ ValueNode_SegCalcVertex::~ValueNode_SegCalcVertex()
 ValueBase
 ValueNode_SegCalcVertex::operator()(Time t)const
 {
+       if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+               printf("%s:%d operator()\n", __FILE__, __LINE__);
+
        Segment segment((*segment_)(t).get(Segment()));
 
        etl::hermite<Vector> curve(segment.p1,segment.p2,segment.t1,segment.t2);
-       
+
        return curve((*amount_)(t).get(Real()));
 }
 
@@ -94,9 +98,9 @@ ValueNode_SegCalcVertex::get_name()const
 String
 ValueNode_SegCalcVertex::get_local_name()const
 {
-       return _("SegCalcVertex");
+       return _("Segment Vertex");
 }
-               
+
 bool
 ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
 {
@@ -104,20 +108,14 @@ ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle value)
 {
-       assert(i==0 || i==1);
-       if(i==0)
-       {
-               segment_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
-       }
-       if(i==1)
+       assert(i>=0 && i<link_count());
+
+       switch(i)
        {
-               amount_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
+       case 0: CHECK_TYPE_AND_SET_VALUE(segment_, ValueBase::TYPE_SEGMENT);
+       case 1: CHECK_TYPE_AND_SET_VALUE(amount_,  ValueBase::TYPE_REAL);
        }
        return false;
 }
@@ -125,7 +123,8 @@ ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_SegCalcVertex::get_link_vfunc(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return segment_;
        if(i==1)
@@ -143,7 +142,8 @@ ValueNode_SegCalcVertex::link_count()const
 String
 ValueNode_SegCalcVertex::link_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return "segment";
        if(i==1)
@@ -154,7 +154,8 @@ ValueNode_SegCalcVertex::link_name(int i)const
 String
 ValueNode_SegCalcVertex::link_local_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return _("Segment");
        if(i==1)
@@ -169,7 +170,7 @@ ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const
                return 0;
        if(name=="amount")
                return 1;
-       
+
        throw Exception::BadLinkName(name);
 }