X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timedswap.cpp;h=378535a83e4269eed9ca5fbfc5bdddf9dec05023;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b456bf939f13f997314a9bc821017b0cf31d3d36;hpb=67e4cb808328ea14df418d983e368f0eb4b742ae;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp index b456bf9..378535a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ /*! \file valuenode_timedswap.cpp -** \brief Template File +** \brief Implementation of the "Timed Swap" 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 @@ -34,6 +35,7 @@ #include "valuenode_const.h" #include #include "color.h" +#include #endif @@ -56,14 +58,6 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value): { switch(get_type()) { - case ValueBase::TYPE_REAL: - set_link("before",ValueNode_Const::create(value.get(Real()))); - set_link("after",ValueNode_Const::create(value.get(Real()))); - break; - case ValueBase::TYPE_VECTOR: - set_link("before",ValueNode_Const::create(value.get(Vector()))); - set_link("after",ValueNode_Const::create(value.get(Vector()))); - break; case ValueBase::TYPE_ANGLE: set_link("before",ValueNode_Const::create(value.get(Angle()))); set_link("after",ValueNode_Const::create(value.get(Angle()))); @@ -76,12 +70,20 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value): set_link("before",ValueNode_Const::create(value.get(int()))); set_link("after",ValueNode_Const::create(value.get(int()))); break; + case ValueBase::TYPE_REAL: + set_link("before",ValueNode_Const::create(value.get(Real()))); + set_link("after",ValueNode_Const::create(value.get(Real()))); + break; case ValueBase::TYPE_TIME: set_link("before",ValueNode_Const::create(value.get(Time()))); set_link("after",ValueNode_Const::create(value.get(Time()))); break; + case ValueBase::TYPE_VECTOR: + set_link("before",ValueNode_Const::create(value.get(Vector()))); + set_link("after",ValueNode_Const::create(value.get(Vector()))); + break; default: - throw Exception::BadType(ValueBase::type_name(get_type())); + throw Exception::BadType(ValueBase::type_local_name(get_type())); } set_link("time",ValueNode_Const::create(Time(2))); @@ -96,98 +98,23 @@ ValueNode_TimedSwap::create(const ValueBase& x) return new ValueNode_TimedSwap(x); } - LinkableValueNode* ValueNode_TimedSwap::create_new()const { return new ValueNode_TimedSwap(get_type()); } - synfig::ValueNode_TimedSwap::~ValueNode_TimedSwap() { unlink_all(); } - - -bool -ValueNode_TimedSwap::set_before(const ValueNode::Handle &x) -{ - if(!x || x->get_type()!=get_type() - && !PlaceholderValueNode::Handle::cast_dynamic(x)) - return false; - - before=x; - - return true; -} - -ValueNode::Handle -ValueNode_TimedSwap::get_before()const -{ - return before; -} - - -bool -ValueNode_TimedSwap::set_after(const ValueNode::Handle &x) -{ - if(!x || x->get_type()!=get_type() - && !PlaceholderValueNode::Handle::cast_dynamic(x)) - return false; - - after=x; - - return true; -} - -ValueNode::Handle -ValueNode_TimedSwap::get_after()const -{ - return after; -} - - -bool -ValueNode_TimedSwap::set_swap_time(const ValueNode::Handle &x) -{ - if(!x || (!ValueBase(x->get_type()).same_type_as(ValueBase::TYPE_TIME) && - !PlaceholderValueNode::Handle::cast_dynamic(x))) - return false; - - swap_time=x; - return true; -} - -ValueNode::Handle -ValueNode_TimedSwap::get_swap_time()const -{ - return swap_time; -} - -bool -ValueNode_TimedSwap::set_swap_length(const ValueNode::Handle &x) -{ - if(!x || (!ValueBase(x->get_type()).same_type_as(ValueBase::TYPE_TIME) && - !PlaceholderValueNode::Handle::cast_dynamic(x))) - return false; - - swap_length=x; - return true; -} - -ValueNode::Handle -ValueNode_TimedSwap::get_swap_length()const -{ - return swap_length; -} - - - synfig::ValueBase synfig::ValueNode_TimedSwap::operator()(Time t)const { + if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS")) + printf("%s:%d operator()\n", __FILE__, __LINE__); + Time swptime=(*swap_time)(t).get(Time()); Time swplength=(*swap_length)(t).get(Time()); @@ -202,18 +129,6 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const switch(get_type()) { - case ValueBase::TYPE_REAL: - { - Real a=(*after)(t).get(Real()); - Real b=(*before)(t).get(Real()); - return (b-a)*amount+a; - } - case ValueBase::TYPE_VECTOR: - { - Vector a=(*after)(t).get(Vector()); - Vector b=(*before)(t).get(Vector()); - return (b-a)*amount+a; - } case ValueBase::TYPE_ANGLE: { Angle a=(*after)(t).get(Angle()); @@ -231,7 +146,13 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const { float a=(float)(*after)(t).get(int()); float b=(float)(*before)(t).get(int()); - return static_cast((b-a)*amount+a+0.5f); + return round_to_int((b-a)*amount+a); + } + case ValueBase::TYPE_REAL: + { + Real a=(*after)(t).get(Real()); + Real b=(*before)(t).get(Real()); + return (b-a)*amount+a; } case ValueBase::TYPE_TIME: { @@ -239,12 +160,17 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const Time b=(*before)(t).get(Time()); return (b-a)*amount+a; } + case ValueBase::TYPE_VECTOR: + { + Vector a=(*after)(t).get(Vector()); + Vector b=(*before)(t).get(Vector()); + return (b-a)*amount+a; + } default: break; } } - /*! \todo this should interpolate from ** before to after over the period defined ** by swap_length */ @@ -252,17 +178,17 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const return (*before)(t); } - bool -ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x) +ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle value) { - assert(i>=0 && i<4); + assert(i>=0 && i=0 && i<4); + assert(i>=0 && i=0 && i<4); + assert(i>=0 && i=0 && i<4); + assert(i>=0 && i