X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_range.cpp;h=6132c1ad969f61eda2910f185e648f49a2e3d887;hb=d4cb326591ea23f82d341eb368b3d183b46f56c7;hp=c4107f8552067664b96f9c339546795807867ddd;hpb=eb7452cee3567a8124c7a0fc2b9e2b6ee854a001;p=synfig.git diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp index c4107f8..6132c1a 100644 --- a/synfig-core/src/synfig/valuenode_range.cpp +++ b/synfig-core/src/synfig/valuenode_range.cpp @@ -90,8 +90,6 @@ synfig::ValueNode_Range::ValueNode_Range(const ValueBase &value): assert(max_->get_type()==id); assert(link_->get_type()==id); assert(get_type()==id); - - DCAST_HACK_ENABLE(); } LinkableValueNode* @@ -159,6 +157,63 @@ synfig::ValueNode_Range::operator()(Time t)const return ValueBase(); } +synfig::ValueBase +synfig::ValueNode_Range::get_inverse(Time t, const synfig::Vector &target_value) const +{ + switch (get_type()) + { + case ValueBase::TYPE_INTEGER: + { + int max_value((*max_)(t).get(int())); + int min_value((*min_)(t).get(int())); + return std::max(min_value, std::min(max_value, int(target_value.mag()))); + } + case ValueBase::TYPE_REAL: + { + Real max_value((*max_)(t).get(Real())); + Real min_value((*min_)(t).get(Real())); + return std::max(min_value, std::min(max_value, target_value.mag())); + } + case ValueBase::TYPE_ANGLE: + { + Angle max_value((*max_)(t).get(Angle())); + Angle min_value((*min_)(t).get(Angle())); + Angle target_angle(Angle::tan(target_value[1],target_value[0])); + return target_angle>max_value?max_value:target_angle=Angle::rad(target_value).get() && Angle::rad(target_value).get()>=Angle::rad(minimum).get()) + return target_value; + else if (Angle::rad(minimum).get()>Angle::rad(target_value).get()) + return minimum; + else + return maximum; + } + return ValueBase(); +} + + bool ValueNode_Range::set_link_vfunc(int i,ValueNode::Handle value) { @@ -250,3 +305,26 @@ ValueNode_Range::check_type(ValueBase::Type type) || type==ValueBase::TYPE_REAL || type==ValueBase::TYPE_TIME; } + +LinkableValueNode::Vocab +ValueNode_Range::get_children_vocab_vfunc()const +{ + LinkableValueNode::Vocab ret; + + ret.push_back(ParamDesc(ValueBase(),"min") + .set_local_name(_("Min")) + .set_description(_("Returned value when 'Link' is smaller")) + ); + + ret.push_back(ParamDesc(ValueBase(),"max") + .set_local_name(_("Max")) + .set_description(_("Returned value when 'Link' is greater")) + ); + + ret.push_back(ParamDesc(ValueBase(),"link") + .set_local_name(_("Link")) + .set_description(_("The value node to limit its range")) + ); + + return ret; +}