hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=60cfdc4b4f158dfdbbd8d3abb57643232ececcdb
commit 60cfdc4b4f158dfdbbd8d3abb57643232ececcdb Author: ChunEon Park <[email protected]> Date: Fri Apr 25 19:53:18 2014 +0900 evas/evas3d: rename 3d_scene_set()/get() to scene_set()/get() if eolian generates c++ apis, the method name will be started with numberic character that wont' be accepted by c++ language. so renamed. --- src/examples/evas/evas-3d-cube.c | 2 +- src/examples/evas/evas-3d-cube2.c | 2 +- src/examples/evas/evas-3d-md2.c | 2 +- src/examples/evas/evas-3d-pick.c | 2 +- src/examples/evas/evas-3d-proxy.c | 2 +- src/lib/evas/Evas_Common.h | 2 +- src/lib/evas/canvas/evas_image.eo | 10 +++++----- src/lib/evas/canvas/evas_object_image.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index d472af6..cf46a5b 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -245,7 +245,7 @@ main(void) evas_object_show(image); /* Set the image object as render target for 3D scene. */ - evas_object_image_3d_scene_set(image, data.scene); + evas_object_image_scene_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 01528f6..6603e85 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -306,7 +306,7 @@ main(void) evas_object_show(image); /* Set the image object as render target for 3D scene. */ - evas_object_image_3d_scene_set(image, data.scene); + evas_object_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.01, _animate_scene, &data); diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 503bdf0..067c07f 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -148,7 +148,7 @@ main(void) image = evas_object_image_filled_add(evas); evas_object_image_size_set(image, WIDTH, HEIGHT); - evas_object_image_3d_scene_set(image, scene); + evas_object_image_scene_set(image, scene); evas_object_move(image, 0, 0); evas_object_resize(image, WIDTH, HEIGHT); evas_object_show(image); diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 5f4e568..0963675 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -378,7 +378,7 @@ main(void) image = evas_object_image_filled_add(evas); evas_object_image_size_set(image, WIDTH, HEIGHT); - evas_object_image_3d_scene_set(image, scene); + evas_object_image_scene_set(image, scene); evas_object_move(image, 0, 0); evas_object_resize(image, WIDTH, HEIGHT); evas_object_show(image); diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 95d9e10..8de8bea 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -282,7 +282,7 @@ main(void) _scene_setup(&data); /* Set the image object as render target for 3D scene. */ - evas_object_image_3d_scene_set(image, data.scene); + evas_object_image_scene_set(image, data.scene); /* Add animation timer callback. */ ecore_timer_add(0.016, _animate_scene, &data); diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index bab22af..fb3d2c5 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -5377,7 +5377,7 @@ EAPI const Eina_List *evas_font_path_global_list(void) EINA_WARN_UNUSED_R * * A scene represents a captured image of a scene graph through its viewing * camera. A scene can be set to an image object to be displayed on the Evas - * canvas by using evas_object_image_3d_scene_set() function. + * canvas by using evas_object_image_scene_set() function. */ /** diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index d78b486..dba3157 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -998,25 +998,25 @@ class Evas_Image (Evas_Object) } } - 3d_scene { + scene { set { /* - @def evas_obj_image_3d_scene_set + @def evas_obj_image_scene_set @since 1.8 Set the 3D scene on an image object. - @see evas_object_image_3d_scene_set + @see evas_object_image_scene_set */ } get { /* - @def evas_obj_image_3d_scene_get + @def evas_obj_image_scene_get @since 1.8 Get the 3D scene on an image object. - @see evas_object_image_3d_scene_get + @see evas_object_image_scene_get */ } values { diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 7e63933..0e884c2 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -772,7 +772,7 @@ _evas_image_source_visible_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void -_evas_image_3d_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene) +_evas_image_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); @@ -788,7 +788,7 @@ _evas_image_3d_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene) } EOLIAN static Evas_3D_Scene * -_evas_image_3d_scene_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) +_evas_image_scene_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) { return o->cur->scene; } --
