X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_linear.cpp;h=01e67a2da0db11717b6ab606df1ccc98225d7b8f;hb=c3e45b84cbe115d9a8d216f1ce99d06fdd49ccca;hp=14cc5ccf97a042db2b7f56ddba7f58210063ea79;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.cpp b/synfig-core/trunk/src/synfig/valuenode_linear.cpp index 14cc5cc..01e67a2 100644 --- a/synfig-core/trunk/src/synfig/valuenode_linear.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_linear.cpp @@ -1,20 +1,22 @@ /* === S Y N F I G ========================================================= */ /*! \file valuenode_linear.cpp -** \brief Template File +** \brief Implementation of the "Linear" valuenode conversion. ** -** $Id: valuenode_linear.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 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 */ /* ========================================================================= */ @@ -31,6 +33,8 @@ #include "valuenode_linear.h" #include "valuenode_const.h" #include "general.h" +#include "color.h" +#include #endif @@ -48,38 +52,52 @@ using namespace synfig; /* === M E T H O D S ======================================================= */ -ValueNode_Linear::ValueNode_Linear(const ValueBase::Type &x): - LinkableValueNode(x) +ValueNode_Linear::ValueNode_Linear(const ValueBase &value): + LinkableValueNode(value.get_type()) { - switch(x) + switch(get_type()) { + case ValueBase::TYPE_ANGLE: + set_link("slope",ValueNode_Const::create(Angle::deg(0))); + set_link("offset",ValueNode_Const::create(value.get(Angle()))); + break; + case ValueBase::TYPE_COLOR: + set_link("slope",ValueNode_Const::create(Color(0,0,0,0))); + set_link("offset",ValueNode_Const::create(value.get(Color()))); + break; + case ValueBase::TYPE_INTEGER: + set_link("slope",ValueNode_Const::create(int(0))); + set_link("offset",ValueNode_Const::create(value.get(int()))); + break; case ValueBase::TYPE_REAL: - set_link("slope",ValueNode_Const::create(Real(1))); - set_link("offset",ValueNode_Const::create(Real(0))); + set_link("slope",ValueNode_Const::create(Real(0))); + set_link("offset",ValueNode_Const::create(value.get(Real()))); break; case ValueBase::TYPE_TIME: - set_link("slope",ValueNode_Const::create(Time(1))); - set_link("offset",ValueNode_Const::create(Time(0))); + set_link("slope",ValueNode_Const::create(Time(0))); + set_link("offset",ValueNode_Const::create(value.get(Time()))); break; case ValueBase::TYPE_VECTOR: - set_link("slope",ValueNode_Const::create(Vector(1.0,1.0))); - set_link("offset",ValueNode_Const::create(Vector(0.0,0.0))); - break; - case ValueBase::TYPE_ANGLE: - set_link("slope",ValueNode_Const::create(Angle::deg(90))); - set_link("offset",ValueNode_Const::create(Angle::deg(0))); + set_link("slope",ValueNode_Const::create(Vector(0,0))); + set_link("offset",ValueNode_Const::create(value.get(Vector()))); break; default: - throw Exception::BadType(ValueBase::type_name(x)); + throw Exception::BadType(ValueBase::type_name(get_type())); } DCAST_HACK_ENABLE(); } +LinkableValueNode* +ValueNode_Linear::create_new()const +{ + return new ValueNode_Linear(get_type()); +} + ValueNode_Linear* ValueNode_Linear::create(const ValueBase &x) { - return new ValueNode_Linear(x.get_type()); + return new ValueNode_Linear(x); } ValueNode_Linear::~ValueNode_Linear() @@ -92,14 +110,18 @@ ValueNode_Linear::operator()(Time t)const { switch(get_type()) { - case ValueBase::TYPE_TIME: - return (*m_)(t).get(Time())*t+(*b_)(t).get(Time()); + case ValueBase::TYPE_ANGLE: + return (*m_)(t).get( Angle())*t+(*b_)(t).get( Angle()); + case ValueBase::TYPE_COLOR: + return (*m_)(t).get( Color())*t+(*b_)(t).get( Color()); + case ValueBase::TYPE_INTEGER: + return round_to_int((*m_)(t).get(int())*t+(*b_)(t).get(int())); case ValueBase::TYPE_REAL: - return (*m_)(t).get(Real())*t+(*b_)(t).get(Real()); + return (*m_)(t).get( Real())*t+(*b_)(t).get( Real()); + case ValueBase::TYPE_TIME: + return (*m_)(t).get( Time())*t+(*b_)(t).get( Time()); case ValueBase::TYPE_VECTOR: return (*m_)(t).get(Vector())*t+(*b_)(t).get(Vector()); - case ValueBase::TYPE_ANGLE: - return (*m_)(t).get(Angle())*t+(*b_)(t).get(Angle()); default: assert(0); break; @@ -119,14 +141,17 @@ ValueNode_Linear::get_local_name()const { return _("Linear"); } - + bool ValueNode_Linear::check_type(ValueBase::Type type) { - return type==ValueBase::TYPE_REAL - || type==ValueBase::TYPE_VECTOR - || type==ValueBase::TYPE_TIME - || type==ValueBase::TYPE_ANGLE; + return + type==ValueBase::TYPE_ANGLE || + type==ValueBase::TYPE_COLOR || + type==ValueBase::TYPE_INTEGER || + type==ValueBase::TYPE_REAL || + type==ValueBase::TYPE_TIME || + type==ValueBase::TYPE_VECTOR ; } bool @@ -152,11 +177,8 @@ ValueNode::LooseHandle ValueNode_Linear::get_link_vfunc(int i)const { assert(i==0 || i==1); - if(i==0) - return m_; - if(i==1) - return b_; - + if(i==0) return m_; + if(i==1) return b_; return 0; } @@ -170,10 +192,8 @@ String ValueNode_Linear::link_name(int i)const { assert(i==0 || i==1); - if(i==0) - return "slope"; - if(i==1) - return "offset"; + if(i==0) return "slope"; + if(i==1) return "offset"; return String(); } @@ -184,10 +204,13 @@ ValueNode_Linear::link_local_name(int i)const if(i==0) switch(get_type()) { + case ValueBase::TYPE_ANGLE: + case ValueBase::TYPE_COLOR: + case ValueBase::TYPE_INTEGER: case ValueBase::TYPE_REAL: case ValueBase::TYPE_TIME: - case ValueBase::TYPE_ANGLE: return _("Rate"); + case ValueBase::TYPE_VECTOR: default: return _("Slope"); } @@ -199,16 +222,8 @@ ValueNode_Linear::link_local_name(int i)const int ValueNode_Linear::get_link_index_from_name(const String &name)const { - if(name=="slope") - return 0; - if(name=="offset") - return 1; - - throw Exception::BadLinkName(name); -} + if(name=="slope") return 0; + if(name=="offset") return 1; -LinkableValueNode* -ValueNode_Linear::create_new()const -{ - return new ValueNode_Linear(get_type()); + throw Exception::BadLinkName(name); }