X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=9c2924a1590dbec678a9fae922e632ca23e685f2;hb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;hp=b75894599be162536b4816636c4db47f743cce31;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp index b758945..9c2924a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ /*! \file valuenode_scale.cpp -** \brief Template File +** \brief Implementation of the "Scale" valuenode conversion. ** -** $Id: valuenode_scale.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ +** $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 @@ -33,11 +34,11 @@ #include "valuenode_scale.h" #include "valuenode_const.h" #include -#include #include "color.h" #include "vector.h" #include "time.h" #include "angle.h" +#include #endif @@ -55,42 +56,52 @@ using namespace synfig; /* === M E T H O D S ======================================================= */ -ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL) +ValueNode_Scale::ValueNode_Scale(const ValueBase &value): + LinkableValueNode(value.get_type()) { set_scalar(1.0); -} + ValueBase::Type id(value.get_type()); -ValueNode_Scale* -ValueNode_Scale::create(const ValueBase& x) -{ - ValueNode_Scale* value_node; - switch(x.get_type()) + switch(id) { - case ValueBase::TYPE_VECTOR: - case ValueBase::TYPE_REAL: - case ValueBase::TYPE_TIME: - case ValueBase::TYPE_INTEGER: case ValueBase::TYPE_ANGLE: + set_link("link",ValueNode_Const::create(value.get(Angle()))); + break; case ValueBase::TYPE_COLOR: - value_node=new ValueNode_Scale(); - if(!value_node->set_value_node(ValueNode_Const::create(x))) - return 0; - assert(value_node->get_value_node()->get_type()==x.get_type()); + set_link("link",ValueNode_Const::create(value.get(Color()))); + break; + case ValueBase::TYPE_INTEGER: + set_link("link",ValueNode_Const::create(value.get(int()))); + break; + case ValueBase::TYPE_REAL: + set_link("link",ValueNode_Const::create(value.get(Real()))); + break; + case ValueBase::TYPE_TIME: + set_link("link",ValueNode_Const::create(value.get(Time()))); + break; + case ValueBase::TYPE_VECTOR: + set_link("link",ValueNode_Const::create(value.get(Vector()))); break; default: assert(0); - throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type())); + throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(value.get_type())); } + assert(value_node); - assert(value_node->get_type()==x.get_type()); - - return value_node; + assert(get_value_node()->get_type()==id); + assert(get_type()==id); } LinkableValueNode* ValueNode_Scale::create_new()const { - return new ValueNode_Scale(); + return new ValueNode_Scale(get_type()); +} + +ValueNode_Scale* +ValueNode_Scale::create(const ValueBase& value) +{ + return new ValueNode_Scale(value); } synfig::ValueNode_Scale::~ValueNode_Scale() @@ -125,22 +136,19 @@ ValueNode_Scale::get_scalar()const bool ValueNode_Scale::set_value_node(const ValueNode::Handle &x) { - if(!x - || ( get_type()==ValueBase::TYPE_NIL - && !check_type(x->get_type()) ) - || ( get_type()!=ValueBase::TYPE_NIL - && x->get_type()!=get_type() ) && - !PlaceholderValueNode::Handle::cast_dynamic(x) - ) + assert(get_type()); + + // if this isn't a proper value + if(!x || + // or we don't have a type, and this value isn't one of the types we accept + (get_type()==ValueBase::TYPE_NIL && !check_type(x->get_type())) || + // or we have a type and this value is a different type and (placeholder?) + (get_type()!=ValueBase::TYPE_NIL && x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x))) + // then fail to set the value return false; - assert(!(PlaceholderValueNode::Handle::cast_dynamic(x) && !get_type())); - value_node=x; - if(!get_type()) - set_type(x->get_type()); - return true; } @@ -156,31 +164,25 @@ synfig::ValueNode_Scale::operator()(Time t)const { if(!value_node || !scalar) throw runtime_error(strprintf("ValueNode_Scale: %s",_("One or both of my parameters aren't set!"))); - else - if(get_type()==ValueBase::TYPE_VECTOR) - return (*value_node)(t).get(Vector())*(*scalar)(t).get(Real()); - else - if(get_type()==ValueBase::TYPE_REAL) - return (*value_node)(t).get(Real())*(*scalar)(t).get(Real()); - else - if(get_type()==ValueBase::TYPE_TIME) - return (*value_node)(t).get(Time())*(*scalar)(t).get(Time()); - else - if(get_type()==ValueBase::TYPE_INTEGER) - return (*value_node)(t).get(int())*(*scalar)(t).get(Real()); - else - if(get_type()==ValueBase::TYPE_ANGLE) + else if(get_type()==ValueBase::TYPE_ANGLE) return (*value_node)(t).get(Angle())*(*scalar)(t).get(Real()); - else - if(get_type()==ValueBase::TYPE_COLOR) + else if(get_type()==ValueBase::TYPE_COLOR) { Color ret((*value_node)(t).get(Color())); Real s((*scalar)(t).get(Real())); ret.set_r(ret.get_r()*s); - ret.set_g(ret.get_r()*s); - ret.set_b(ret.get_r()*s); + ret.set_g(ret.get_g()*s); + ret.set_b(ret.get_b()*s); return ret; } + else if(get_type()==ValueBase::TYPE_INTEGER) + return round_to_int((*value_node)(t).get(int())*(*scalar)(t).get(Real())); + else if(get_type()==ValueBase::TYPE_REAL) + return (*value_node)(t).get(Real())*(*scalar)(t).get(Real()); + else if(get_type()==ValueBase::TYPE_TIME) + return (*value_node)(t).get(Time())*(*scalar)(t).get(Time()); + else if(get_type()==ValueBase::TYPE_VECTOR) + return (*value_node)(t).get(Vector())*(*scalar)(t).get(Real()); assert(0); return ValueBase(); @@ -190,15 +192,14 @@ synfig::ValueNode_Scale::operator()(Time t)const bool ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x) { - if(!(i==0 || i==1)) - return false; - + assert(i>=0 && i=0 && i=0 && i=0 && i