summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-12-26 17:50:26 +0900
committerHermet Park <hermetpark@gmail.com>2019-12-26 17:50:26 +0900
commitb84865bb12a331d460fb9a208326ac8c6b0d6662 (patch)
treef0a260aa54bd1573a338a4ebb8a92d345ffab719
parent67771fd4a69e9931fc02ec84aedf05e540c571fe (diff)
image_blend_occlude_few: increase a factor to update animation properly.
-rw-r--r--src/bin/image_blend_occlude1_few.c6
-rw-r--r--src/bin/image_blend_occlude2_few.c6
-rw-r--r--src/bin/image_blend_occlude3_few.c8
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 522a295..450301d 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -59,6 +59,7 @@ static void _cleanup(void)
59/* loop - do things */ 59/* loop - do things */
60static void _loop(double t, int f) 60static void _loop(double t, int f)
61{ 61{
62 static int k = 0;
62 int i; 63 int i;
63 Evas_Coord x, y, w, h; 64 Evas_Coord x, y, w, h;
64 for (i = 0; i < OBNUM; i++) 65 for (i = 0; i < OBNUM; i++)
@@ -68,12 +69,13 @@ static void _loop(double t, int f)
68 w = 120; 69 w = 120;
69 h = 160; 70 h = 160;
70 x = (win_w / 2) - (w / 2); 71 x = (win_w / 2) - (w / 2);
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 73 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); 75 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 76 }
76 } 77 }
78 ++k;
77 FPS_STD(NAME); 79 FPS_STD(NAME);
78} 80}
79 81
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 7a22e38..6429550 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -59,6 +59,7 @@ static void _cleanup(void)
59/* loop - do things */ 59/* loop - do things */
60static void _loop(double t, int f) 60static void _loop(double t, int f)
61{ 61{
62 static int k = 0;
62 int i; 63 int i;
63 Evas_Coord x, y, w, h; 64 Evas_Coord x, y, w, h;
64 for (i = 0; i < OBNUM; i++) 65 for (i = 0; i < OBNUM; i++)
@@ -68,12 +69,13 @@ static void _loop(double t, int f)
68 w = 120; 69 w = 120;
69 h = 160; 70 h = 160;
70 x = (win_w / 2) - (w / 2); 71 x = (win_w / 2) - (w / 2);
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 73 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); 75 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 76 }
76 } 77 }
78 k++;
77 FPS_STD(NAME); 79 FPS_STD(NAME);
78} 80}
79 81
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index ce7c8b0..12551c4 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -59,21 +59,23 @@ static void _cleanup(void)
59/* loop - do things */ 59/* loop - do things */
60static void _loop(double t, int f) 60static void _loop(double t, int f)
61{ 61{
62 static int k = 0;
62 int i; 63 int i;
63 Evas_Coord x, y, w, h; 64 Evas_Coord x, y, w, h;
64 for (i = 0; i < OBNUM; i++) 65 for (i = 0; i < OBNUM; i++)
65 { 66 {
66 if (i > (OBNUM / 2)) 67 if (i < (OBNUM / 2))
67 { 68 {
68 w = 120; 69 w = 120;
69 h = 160; 70 h = 160;
70 x = (win_w / 2) - (w / 2); 71 x = (win_w / 2) - (w / 2);
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 73 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); 75 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 76 }
76 } 77 }
78 ++k;
77 FPS_STD(NAME); 79 FPS_STD(NAME);
78} 80}
79 81