X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=b2f62b79b0fe4e116a14b9b577eaeb70f6a7b019;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=8cb711b53506cdaf6f9ae152c53c55798242e772;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp index 8cb711b..b2f62b7 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp @@ -2,10 +2,11 @@ /*! \file valuenode_scale.cpp ** \brief Template File ** -** $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 @@ -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(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,29 @@ 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) + { + Real ret = (*value_node)(t).get(int())*(*scalar)(t).get(Real()) + 0.5f; + if (ret < 0) return static_cast(ret-1); + return static_cast(ret); + } + 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(); @@ -270,9 +276,10 @@ bool ValueNode_Scale::check_type(ValueBase::Type type) { return - type==ValueBase::TYPE_VECTOR || - type==ValueBase::TYPE_REAL || - type==ValueBase::TYPE_INTEGER || + type==ValueBase::TYPE_ANGLE || type==ValueBase::TYPE_COLOR || - type==ValueBase::TYPE_ANGLE; + type==ValueBase::TYPE_INTEGER || + type==ValueBase::TYPE_REAL || + type==ValueBase::TYPE_TIME || + type==ValueBase::TYPE_VECTOR; }