From 433b9e3833ecd46ca06891abf01e252922d3cbcb Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 26 Dec 2019 17:50:26 +0900 Subject: [PATCH] image_blend_occlude_few: increase a factor to update animation properly. --- src/bin/image_blend_occlude1_few.c | 6 ++++-- src/bin/image_blend_occlude2_few.c | 6 ++++-- src/bin/image_blend_occlude3_few.c | 8 +++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c index cf57346..a5a05ea 100644 --- a/src/bin/image_blend_occlude1_few.c +++ b/src/bin/image_blend_occlude1_few.c @@ -61,6 +61,7 @@ static void _cleanup(void) /* loop - do things */ static void _loop(double t, int f) { + static int k = 0; int i; Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) @@ -70,12 +71,13 @@ static void _loop(double t, int f) w = 120; h = 160; x = (win_w / 2) - (w / 2); - x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); + x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); - y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); + y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2); eo_do(o_images[i], evas_obj_position_set(x, y)); } } + ++k; FPS_STD(NAME); } diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c index 0966ff4..7a0c0ba 100644 --- a/src/bin/image_blend_occlude2_few.c +++ b/src/bin/image_blend_occlude2_few.c @@ -61,6 +61,7 @@ static void _cleanup(void) /* loop - do things */ static void _loop(double t, int f) { + static int k = 0; int i; Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) @@ -70,12 +71,13 @@ static void _loop(double t, int f) w = 120; h = 160; x = (win_w / 2) - (w / 2); - x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); + x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); - y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); + y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2); eo_do(o_images[i], evas_obj_position_set(x, y)); } } + k++; FPS_STD(NAME); } diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c index e056fe9..ba319b4 100644 --- a/src/bin/image_blend_occlude3_few.c +++ b/src/bin/image_blend_occlude3_few.c @@ -61,21 +61,23 @@ static void _cleanup(void) /* loop - do things */ static void _loop(double t, int f) { + static int k = 0; int i; Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - if (i > (OBNUM / 2)) + if (i < (OBNUM / 2)) { w = 120; h = 160; x = (win_w / 2) - (w / 2); - x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); + x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); - y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); + y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2); eo_do(o_images[i], evas_obj_position_set(x, y)); } } + ++k; FPS_STD(NAME); }