commit 091b09652aa3a9d0d3d2f82a6529276d49a2012e
author Kristian Høgsberg <krh@bitplanet.net> Mon Jun 17 09:23:14 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Mon Jun 17 09:24:14 2013 -0400
tree c1706951c2e43f4b918c4d3bef4c2f91e3ebb309
parent 7eec9b32f74bd571a5817a293f4edfe58a2c4290

spring: Make min/max part of spring parameters

Don't hard code the 0.0 - 1.0 spring envelope.

src/animation.c

diff --git a/src/animation.c b/src/animation.c
index 57d384d..b8de574 100644
--- a/src/animation.c
+++ b/src/animation.c
@@ -42,6 +42,8 @@
 	spring->previous = current;
 	spring->target = target;
 	spring->clip = WESTON_SPRING_OVERSHOOT;
+	spring->min = 0.0;
+	spring->max = 1.0;
 }
 
 WL_EXPORT void
@@ -77,22 +79,26 @@
 			break;
 
 		case WESTON_SPRING_CLAMP:
-			if (spring->current >= 1.0) {
-				spring->current = 1.0;
-				spring->previous = 1.0;
-			} else if (spring->current <= 0.0) {
-				spring->current = 0.0;
-				spring->previous = 0.0;
+			if (spring->current > spring->max) {
+				spring->current = spring->max;
+				spring->previous = spring->max;
+			} else if (spring->current < 0.0) {
+				spring->current = spring->min;
+				spring->previous = spring->min;
 			}
 			break;
 
 		case WESTON_SPRING_BOUNCE:
-			if (spring->current >= 1.0) {
-				spring->current = 2.0 - spring->current;
-				spring->previous = 2.0 - spring->previous;
-			} else if (spring->current <= 0.0) {
-				spring->current = -spring->current;
-				spring->previous = -spring->previous;
+			if (spring->current > spring->max) {
+				spring->current =
+					2 * spring->max - spring->current;
+				spring->previous =
+					2 * spring->max - spring->previous;
+			} else if (spring->current < spring->min) {
+				spring->current =
+					2 * spring->min - spring->current;
+				spring->previous =
+					2 * spring->min - spring->previous;
 			}
 			break;
 		}