projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a06f70
)
meego-tablet-shell: Tweak spring constants
author
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 19 May 2011 15:55:50 +0000
(11:55 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 19 May 2011 15:55:50 +0000
(11:55 -0400)
compositor/compositor.c
patch
|
blob
|
history
diff --git
a/compositor/compositor.c
b/compositor/compositor.c
index
00ffc91
..
3e928b0
100644
(file)
--- 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) /
5
00.0;
+ step = (msec - spring->timestamp) /
3
00.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