From 14c6353a701d82e3644076856eafc296f3579204 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 21 Jun 2019 17:36:16 +0900 Subject: [PATCH] evas vector: add a lottie animation example. Summary: Depends on {D8941} Reviewers: #committers, jsuya Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8944 Change-Id: I5fc565798b1408095ac89b8d55446432794a41a3 --- src/examples/evas/evas-vg-json.c | 14 ++++++++------ src/examples/evas/meson.build | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/examples/evas/evas-vg-json.c b/src/examples/evas/evas-vg-json.c index ce45513..4204729 100644 --- a/src/examples/evas/evas-vg-json.c +++ b/src/examples/evas/evas-vg-json.c @@ -12,7 +12,9 @@ #include "config.h" #endif +#ifndef PACKAGE_EXAMPLES_DIR #define PACKAGE_EXAMPLES_DIR "." +#endif #ifndef EFL_BETA_API_SUPPORT #define EFL_BETA_API_SUPPORT @@ -41,8 +43,8 @@ running_cb(void *data EINA_UNUSED, const Efl_Event *event) int i; for (i = 0; i < 4; i++) { - double frameCnt = (double) efl_gfx_frame_controller_frame_get(gvg[i]); - int frame = (int) (frameCnt * (progress / 1)); + double frameCnt = (double) (efl_gfx_frame_controller_frame_count_get(gvg[i]) - 1); + int frame = (int) (frameCnt * progress); efl_gfx_frame_controller_frame_set(gvg[i], frame); } } @@ -76,7 +78,7 @@ main(void) char buf[PATH_MAX]; //1 - Eo *vg = gvg[0] = efl_add(EFL_CANVAS_VG_CLASS, evas); + Eo *vg = gvg[0] = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); snprintf(buf, sizeof(buf), "%s/browser.json", PACKAGE_EXAMPLES_DIR EVAS_VG_FOLDER); efl_file_simple_load(vg, buf, NULL); @@ -84,7 +86,7 @@ main(void) efl_gfx_entity_visible_set(vg, EINA_TRUE); //2 - Eo *vg2 = gvg[1] = efl_add(EFL_CANVAS_VG_CLASS, evas); + Eo *vg2 = gvg[1] = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); snprintf(buf, sizeof(buf), "%s/jolly_walker.json", PACKAGE_EXAMPLES_DIR EVAS_VG_FOLDER); efl_file_simple_load(vg2, buf, NULL); efl_gfx_entity_position_set(vg2, EINA_POSITION2D(200, 200)); @@ -92,7 +94,7 @@ main(void) efl_gfx_entity_visible_set(vg2, EINA_TRUE); //3 - Eo *vg3 = gvg[2] = efl_add(EFL_CANVAS_VG_CLASS, evas); + Eo *vg3 = gvg[2] = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); snprintf(buf, sizeof(buf), "%s/windmill.json", PACKAGE_EXAMPLES_DIR EVAS_VG_FOLDER); efl_file_simple_load(vg3, buf, NULL); efl_gfx_entity_position_set(vg3, EINA_POSITION2D(0, 200)); @@ -100,7 +102,7 @@ main(void) efl_gfx_entity_visible_set(vg3, EINA_TRUE); //4 - Eo* vg4 = gvg[3] = efl_add(EFL_CANVAS_VG_CLASS, evas); + Eo* vg4 = gvg[3] = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); snprintf(buf, sizeof(buf), "%s/emoji_wink.json", PACKAGE_EXAMPLES_DIR EVAS_VG_FOLDER); efl_file_simple_load(vg4, buf, NULL); efl_gfx_entity_position_set(vg4, EINA_POSITION2D(200, 0)); diff --git a/src/examples/evas/meson.build b/src/examples/evas/meson.build index 9a9bd1f..659f9a5 100644 --- a/src/examples/evas/meson.build +++ b/src/examples/evas/meson.build @@ -49,6 +49,7 @@ examples = [ 'evas-transparent', 'evas-vg-batman', 'evas-vg-simple', + 'evas-vg-json', ] foreach example : examples -- 2.7.4