brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix interpolation between ClutterRect instances

Browse Source 
A stupid typo broke the linear interpolation function.
This commit is contained in:
Emmanuele Bassi 2012-12-23 15:36:30 +00:00
parent 578e81dc2e
commit 2f5aee9cb5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-base-types.c
View File

@ -1259,7 +1259,7 @@ clutter_rect_progress (const GValue *a,
const ClutterRect *rect_b = g_value_get_boxed (b); const ClutterRect *rect_b = g_value_get_boxed (b);
ClutterRect res = CLUTTER_RECT_INIT_ZERO; ClutterRect res = CLUTTER_RECT_INIT_ZERO;
#define INTERPOLATE(r_a,r_b,member,field,factor) ((r_a)->member.field + (((r_b)->member.field - ((r_b)->member.field)) * (factor))) #define INTERPOLATE(r_a,r_b,member,field,factor) ((r_a)->member.field + (((r_b)->member.field - ((r_a)->member.field)) * (factor)))
res.origin.x = INTERPOLATE (rect_a, rect_b, origin, x, progress); res.origin.x = INTERPOLATE (rect_a, rect_b, origin, x, progress);
res.origin.y = INTERPOLATE (rect_a, rect_b, origin, y, progress); res.origin.y = INTERPOLATE (rect_a, rect_b, origin, y, progress);
@ -1269,8 +1269,6 @@ clutter_rect_progress (const GValue *a,
#undef INTERPOLATE #undef INTERPOLATE
clutter_rect_normalize_internal (&res);
g_value_set_boxed (retval, &res); g_value_set_boxed (retval, &res);
return TRUE; return TRUE;