summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-05-19 11:55:50 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-05-19 11:55:50 -0400
commit52612f113c4f577046b6439417cead03366019de (patch)
tree20ae22c08ff296376a0a8618f0d5f61b5ffb533d
parent9a06f700b5bef6480e8f6bddad40144766e2797a (diff)
meego-tablet-shell: Tweak spring constants
-rw-r--r--compositor/compositor.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 00ffc91b..3e928b01 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -125,7 +125,7 @@ wlsc_spring_update(struct wlsc_spring *spring, uint32_t msec)
{
double force, v, current, step;
- step = (msec - spring->timestamp) / 500.0;
+ step = (msec - spring->timestamp) / 300.0;
spring->timestamp = msec;
current = spring->current;
@@ -137,6 +137,7 @@ wlsc_spring_update(struct wlsc_spring *spring, uint32_t msec)
current + (current - spring->previous) + force * step * step;
spring->previous = current;
+#if 0
if (spring->current >= 1.0) {
#ifdef TWEENER_BOUNCE
spring->current = 2.0 - spring->current;
@@ -151,6 +152,7 @@ wlsc_spring_update(struct wlsc_spring *spring, uint32_t msec)
spring->current = 0.0;
spring->previous = 0.0;
}
+#endif
}
WL_EXPORT int