19 files changed, 45 insertions, 42 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index d02668bed0..a5ef7b1e8d 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -220,11 +220,11 @@ main(void)
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
-   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);
    evas_object_focus_set(image, EINA_TRUE);
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, mesh_node);
 
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index db7c7a1590..862d08de93 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -283,14 +283,14 @@ main(void)
    evas_object_show(background);
 
    /* Add an image object for 3D scene rendering. */
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
    evas_object_focus_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);
 
 
    /* Add animation timer callback. */
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 885a53bd81..d90e3f54b1 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -381,12 +381,12 @@ int main(int argc, char **argv)
    globalscene.precision = precision;
    globalscene.scene_init(texture);
 
-   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);
    evas_object_focus_set(image, EINA_TRUE);
-   evas_obj_image_scene_set(image, globalscene.scene);
+   efl_canvas_scene3d_set(image, globalscene.scene);
 
    r = evas_object_key_grab(image, "Down", 0, 0, EINA_TRUE);
    r = evas_object_key_grab(image, "Up", 0, 0, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index e393c14deb..29448d817e 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -255,14 +255,14 @@ main(void)
    evas_object_show(background);
 
    /* Add an image object for 3D scene rendering. */
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_image_size_set(image, WIDTH, HEIGHT);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    evas_object_focus_set(image, EINA_TRUE);
 
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 6f6f4208c2..9f0707fbcb 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -239,12 +239,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* 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);
 
    /* Add animation timer callback. */
    ecore_timer_add(0.016, _animate_scene, &data);
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index e46c2f7c64..baa77c0d60 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -240,12 +240,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* 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);
 
    /* Add animation timer callback. */
    ecore_timer_add(0.01, _animate_scene, &data);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index dc09191e05..5785a0b57b 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -192,12 +192,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    ecore_timer_add(0.01, _animate_md2, mesh_node);
    ecore_timer_add(0.01, _animate_eet, mesh_node2);
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 33bd05cc8c..4518dc6b89 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -215,13 +215,13 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* 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);
 
    /* Add animation timer callback. */
    ecore_animator_frametime_set(0.008);
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 4e1323f5b4..b0d1733bcc 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -425,13 +425,13 @@ main(void)
    evas_object_resize(background, WIDTH, HEIGHT);
    evas_object_show(background);
 
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
 
    evas_object_focus_set(image, EINA_TRUE);
-   evas_obj_image_scene_set(image, data.scene);
+   efl_canvas_scene3d_set(image, data.scene);
 
    _redraw_bounding_object(&data);
    _show_help();
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index 57602b6988..f65ad13962 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -435,7 +435,7 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
@@ -443,7 +443,7 @@ main(void)
    evas_object_focus_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);
 
    evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _key_down, &data);
 
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index e19dfd6630..b3ea48e3e9 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -158,12 +158,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    ecore_timer_add(0.01, _animate_scene, mesh_node);
 
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 000204d2e8..ec48336492 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -239,12 +239,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    /* Enter main loop. */
    ecore_main_loop_begin();
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index b9a6b69bd1..e3a94fc365 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -218,12 +218,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    for (i = 0; i < NUMBER_OF_MESHES; i++)
      ecore_timer_add(ANIM_SPEED, _animate_scene, mesh_node[i]);
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 67be66536d..0d770b7c31 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -243,13 +243,13 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
    evas_object_focus_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);
 
    /* Add animation timer callback. */
    ecore_timer_add(0.01, _animate_scene, &data);
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 1ae79a8cc9..a328b712ed 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -187,8 +187,8 @@ main(void)
    efl_gfx_size_set(background, WIDTH, HEIGHT);
    efl_gfx_visible_set(background, EINA_TRUE);
 
-   image = evas_object_image_filled_add(evas);
-   evas_obj_image_scene_set(image, scene);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
+   efl_canvas_scene3d_set(image, scene);
    efl_gfx_size_set(image, WIDTH, HEIGHT);
    efl_gfx_visible_set(image, EINA_TRUE);
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index b34b2cc313..acde5654ef 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -214,12 +214,12 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, scene);
+   efl_canvas_scene3d_set(image, scene);
 
    ecore_animator_frametime_set(0.03);
    for (i = 0; i < NUMBER_OF_MESHES; i++)
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 901c52bd54..246d8c3cf8 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -75,8 +75,9 @@ _animate_scene(void *data)
    /* Rotate */
    if (angle > 360.0) angle -= 360.0f;
 
-   pixels = evas_obj_image_data_get(source, EINA_TRUE);
-   stride = evas_obj_image_stride_get(source);
+   //pixels = efl_gfx_buffer_get(source, EINA_TRUE, NULL, NULL, NULL, &stride, NULL, NULL, NULL, NULL, NULL, NULL);
+   pixels = evas_object_image_data_get(source, EINA_TRUE);
+   stride = evas_object_image_stride_get(source);
 
    for (i = 0; i < IMG_HEIGHT; i++)
      {
@@ -88,8 +89,10 @@ _animate_scene(void *data)
           }
      }
 
-   evas_obj_image_data_set(source, pixels);
-   evas_obj_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT);
+   //efl_gfx_buffer_set(source, pixels, 0, 0, stride, 0, 0, 0, 0, 0, 0);
+   //evas_obj_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT);
+   evas_object_image_data_set(source, pixels);
+   evas_object_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT);
 
    return EINA_TRUE;
 }
@@ -212,7 +215,7 @@ main(void)
    efl_gfx_visible_set(source, EINA_TRUE);
 
    /* 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 / 2), (HEIGHT / 2));
    efl_gfx_visible_set(image, EINA_TRUE);
 
@@ -220,7 +223,7 @@ main(void)
    _scene_setup(&data);
 
    /* 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);
 
    /* Add animation timer callback. */
    ecore_timer_add(0.016, _animate_scene, &data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index f70d7e41a8..c9aefbd133 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -616,13 +616,13 @@ main(void)
    efl_gfx_visible_set(background, EINA_TRUE);
 
    /* 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);
 
    evas_object_focus_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);
 
    nodes1 = eina_list_append(nodes1, data.sphere.node);
    nodes2 = eina_list_append(nodes2, data.sphere.node);
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 2e83fd8e6d..9fcb47a2fd 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -1145,13 +1145,13 @@ main(int argc, char *argv[])
    _scene_setup(&data);
 
    /* Add an image object for 3D scene rendering. */
-   image = evas_object_image_filled_add(evas);
+   image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
    evas_object_move(image, 0, 0);
    evas_object_resize(image, WIDTH, HEIGHT);
    evas_object_show(image);
 
    /* Set the image object as render target for 3D scene. */
-   evas_obj_image_scene_set(image, global_scene);
+   efl_canvas_scene3d_set(image, global_scene);
 
    evas_object_focus_set(image, EINA_TRUE);