mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spring: Make min/max part of spring parameters

Browse Source 
Don't hard code the 0.0 - 1.0 spring envelope.
This commit is contained in:
Kristian Høgsberg
2013-06-17 09:23:14 -04:00
parent 7eec9b32f7
commit 091b09652a
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/animation.c
+18 -12
View File
@@ -42,6 +42,8 @@ weston_spring_init(struct weston_spring *spring,
spring->previous = current; spring->previous = current;
spring->target = target; spring->target = target;
spring->clip = WESTON_SPRING_OVERSHOOT; spring->clip = WESTON_SPRING_OVERSHOOT;
spring->min = 0.0;
spring->max = 1.0;
} }
WL_EXPORT void WL_EXPORT void
@@ -77,22 +79,26 @@ weston_spring_update(struct weston_spring *spring, uint32_t msec)
break; break;
case WESTON_SPRING_CLAMP: case WESTON_SPRING_CLAMP:
if (spring->current >= 1.0) { if (spring->current > spring->max) {
spring->current = 1.0; spring->current = spring->max;
spring->previous = 1.0; spring->previous = spring->max;
} else if (spring->current <= 0.0) { } else if (spring->current < 0.0) {
spring->current = 0.0; spring->current = spring->min;
spring->previous = 0.0; spring->previous = spring->min;
} }
break; break;
case WESTON_SPRING_BOUNCE: case WESTON_SPRING_BOUNCE:
if (spring->current >= 1.0) { if (spring->current > spring->max) {
spring->current = 2.0 - spring->current; spring->current =
spring->previous = 2.0 - spring->previous; 2 * spring->max - spring->current;
} else if (spring->current <= 0.0) { spring->previous =
spring->current = -spring->current; 2 * spring->max - spring->previous;
spring->previous = -spring->previous; } else if (spring->current < spring->min) {
spring->current =
2 * spring->min - spring->current;
spring->previous =
2 * spring->min - spring->previous;
} }
break; break;
} }
src/compositor.h
+1
View File
@@ -125,6 +125,7 @@ struct weston_spring {
double current; double current;
double target; double target;
double previous; double previous;
double min, max;
uint32_t timestamp; uint32_t timestamp;
uint32_t clip; uint32_t clip;
}; };