X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_range.cpp;h=10d7f5515f2c59c9edf23c7001332622437c3205;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=712c974e01daf9e6032ad6c862c3116202a131a6;hpb=241290ec883794d1579593182b337277f6ef5182;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_range.cpp b/synfig-core/trunk/src/synfig/valuenode_range.cpp
index 712c974..10d7f55 100644
--- a/synfig-core/trunk/src/synfig/valuenode_range.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_range.cpp
@@ -6,6 +6,7 @@
 **
 **	\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
@@ -110,10 +111,6 @@ synfig::ValueNode_Range::~ValueNode_Range()
 	unlink_all();
 }
 
-#define min(x,y) (x>y ? y : x)
-#define max(x,y) (x>y ? x : y)
-#define range(low,high,input) (min(high,max(low,input)))
-
 synfig::ValueBase
 synfig::ValueNode_Range::operator()(Time t)const
 {
@@ -123,13 +120,26 @@ synfig::ValueNode_Range::operator()(Time t)const
 	switch(get_type())
 	{
 	case ValueBase::TYPE_ANGLE:
-		return range((*min_)(t).get(Angle()), (*max_)(t).get(Angle()), (*link_)(t).get(Angle()));
+	{
+		Angle minimum = (* min_)(t).get(Angle());
+		Angle maximum = (* max_)(t).get(Angle());
+		Angle link    = (*link_)(t).get(Angle());
+
+		// if link is between min and max, use it
+		if (Angle::deg((link-minimum).mod()).get() < Angle::deg((maximum-minimum).mod()).get())
+			return link;
+		// otherwise use whichever of min and max is closest to link
+		else if (link.dist(minimum).abs() < link.dist(maximum).abs())
+			return minimum;
+		else
+			return maximum;
+	}
 	case ValueBase::TYPE_INTEGER:
-		return range((*min_)(t).get(int()),   (*max_)(t).get(int()),   (*link_)(t).get(int()));
+		return std::max((*min_)(t).get(int()),  std::min((*max_)(t).get(int()),  (*link_)(t).get(int())));
 	case ValueBase::TYPE_REAL:
-		return range((*min_)(t).get(Real()),  (*max_)(t).get(Real()),  (*link_)(t).get(Real()));
+		return std::max((*min_)(t).get(Real()), std::min((*max_)(t).get(Real()), (*link_)(t).get(Real())));
 	case ValueBase::TYPE_TIME:
-		return range((*min_)(t).get(Time()),  (*max_)(t).get(Time()),  (*link_)(t).get(Time()));
+		return std::max((*min_)(t).get(Time()), std::min((*max_)(t).get(Time()), (*link_)(t).get(Time())));
 	default:
 		assert(0);
 		break;