jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=bd860627db6dcb93e92c04f774b7661b84f3acbd

commit bd860627db6dcb93e92c04f774b7661b84f3acbd
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed Mar 16 20:26:34 2016 +0900

    Examples: Fix usage of evas image apis
---
 src/examples/evas3d_map_example.c                  | 4 ++--
 src/examples/evas3d_object_on_button_example.c     | 4 ++--
 src/examples/evas3d_scene_on_button_example.c      | 4 ++--
 src/examples/performance/graphical.c               | 2 +-
 src/examples/performance/performance.c             | 3 +--
 src/examples/sphere_hunter/evas_3d_sphere_hunter.c | 4 ++--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/examples/evas3d_map_example.c 
b/src/examples/evas3d_map_example.c
index eefa029..5cfb010 100644
--- a/src/examples/evas3d_map_example.c
+++ b/src/examples/evas3d_map_example.c
@@ -1156,7 +1156,7 @@ elm_main(int argc, char **argv)
    evas_object_show(bg);
 
    /* Add an image which shows a scene. */
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
 
@@ -1181,7 +1181,7 @@ elm_main(int argc, char **argv)
    evas_canvas3d_scene_root_node_set(scene, root_node);
    evas_canvas3d_scene_camera_node_set(scene, camera_node);
    evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    /* Add a layout for controlers. */
    control_layout = elm_layout_add(win);
diff --git a/src/examples/evas3d_object_on_button_example.c 
b/src/examples/evas3d_object_on_button_example.c
index 4aff42e..842cdfd 100644
--- a/src/examples/evas3d_object_on_button_example.c
+++ b/src/examples/evas3d_object_on_button_example.c
@@ -257,7 +257,7 @@ elm_main(int argc, char **argv)
    evas = evas_object_evas_get(win);
 
    /* Add an image object for 3D scene rendering. */
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
 
@@ -270,7 +270,7 @@ elm_main(int argc, char **argv)
    /* Set the image object as render target for 3D scene. */
    _scene_setup(&data);
    evas_object_focus_set(image, EINA_TRUE);
-   evas_obj_image_scene_set(image, data.scene);
+   efl_canvas_scene3d_set(image, data.scene);
 
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, 
_stop_scene, &data);
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_UP, _play_scene, 
&data);
diff --git a/src/examples/evas3d_scene_on_button_example.c 
b/src/examples/evas3d_scene_on_button_example.c
index 2e1aa5c..2aa8a2f 100644
--- a/src/examples/evas3d_scene_on_button_example.c
+++ b/src/examples/evas3d_scene_on_button_example.c
@@ -250,11 +250,11 @@ elm_main(int argc, char **argv)
 
    _scene_setup(&data);
 
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_visible_set(image, EINA_TRUE);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, data.scene);
+   efl_canvas_scene3d_set(image, data.scene);
 
    /* Setup scene to the widget button. */
    btn = elm_button_add(win);
diff --git a/src/examples/performance/graphical.c 
b/src/examples/performance/graphical.c
index f5aafcf..7ca4d4c 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -609,7 +609,7 @@ init_graphical_window(Evas_Object *img)
    _init_graphical();
    globalGraphical.evas = evas_object_evas_get(img);
    _init_scene(img);
-   evas_obj_image_scene_set(img, globalGraphical.scene);
+   efl_canvas_scene3d_set(img, globalGraphical.scene);
 
    return img;
 }
diff --git a/src/examples/performance/performance.c 
b/src/examples/performance/performance.c
index c1d0ef8..cdfe6be 100644
--- a/src/examples/performance/performance.c
+++ b/src/examples/performance/performance.c
@@ -622,7 +622,7 @@ EAPI_MAIN
    evas_object_show(startexitbox);
 
    evas = evas_object_evas_get(win);
-   image = evas_object_image_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
 
    btnstart = elm_button_add(win);
    elm_object_text_set(btnstart, "Apply");
@@ -906,7 +906,6 @@ EAPI_MAIN
    evas_object_show(fs_bt);
    evas_object_smart_callback_add(fs_bt, "file,chosen", _load_mesh, NULL);
 
-   evas_object_image_filled_set(image, EINA_TRUE);
    elm_object_part_content_set(layout, "swallow.content", image);
    evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c 
b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
index da6c73c..44b5dee 100644
--- a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
@@ -814,9 +814,9 @@ elm_main(int argc, char **argv)
 
    _scene_setup(&data, 10.0, 10);
 
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    efl_gfx_visible_set(image, EINA_TRUE);
-   evas_obj_image_scene_set(image, data.scene);
+   efl_canvas_scene3d_set(image, data.scene);
 
    evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);

-- 


Reply via email to