summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commitfb666f9788c9cb0d86b47a78b58183a6acac013d (patch)
treed931d390b4515025f8c10389b94c54eb5c368fc9
parentf05ba502b356ef077ad3678909ae3dd808046d86 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--unsorted/elementary/button_cxx_example_01.cc4
-rw-r--r--unsorted/elementary/efl_ui_scroller_example.c4
-rw-r--r--unsorted/elementary/evas3d_object_on_button_example.c4
-rw-r--r--unsorted/elementary/evas3d_scene_on_button_example.c2
-rw-r--r--unsorted/elementary/sphere_hunter/evas_3d_sphere_hunter.c2
-rw-r--r--unsorted/evas/evas-3d-aabb.c12
-rw-r--r--unsorted/evas/evas-3d-blending.c4
-rw-r--r--unsorted/evas/evas-3d-colorpick.c8
-rw-r--r--unsorted/evas/evas-3d-cube-rotate.c2
-rw-r--r--unsorted/evas/evas-3d-cube.c12
-rw-r--r--unsorted/evas/evas-3d-cube2.c12
-rw-r--r--unsorted/evas/evas-3d-eet.c12
-rw-r--r--unsorted/evas/evas-3d-fog.c12
-rw-r--r--unsorted/evas/evas-3d-hull.c12
-rw-r--r--unsorted/evas/evas-3d-md2.c12
-rw-r--r--unsorted/evas/evas-3d-mmap-set.c12
-rw-r--r--unsorted/evas/evas-3d-obj.c12
-rw-r--r--unsorted/evas/evas-3d-parallax-occlusion.c12
-rw-r--r--unsorted/evas/evas-3d-pick.c8
-rw-r--r--unsorted/evas/evas-3d-ply.c12
-rw-r--r--unsorted/evas/evas-3d-proxy.c18
-rw-r--r--unsorted/evas/evas-3d-shadows.c12
-rw-r--r--unsorted/evas/evas-3d-static-lod.c12
-rw-r--r--unsorted/evas/evas-map-utils-eo.c10
-rw-r--r--unsorted/evas/evas-object-manipulation-eo.c30
25 files changed, 126 insertions, 126 deletions
diff --git a/unsorted/elementary/button_cxx_example_01.cc b/unsorted/elementary/button_cxx_example_01.cc
index 7de67d3..d7a9c67 100644
--- a/unsorted/elementary/button_cxx_example_01.cc
+++ b/unsorted/elementary/button_cxx_example_01.cc
@@ -5,7 +5,7 @@
5 5
6using efl::eo::instantiate; 6using efl::eo::instantiate;
7 7
8efl::Gfx icon_still(nullptr); 8efl::gfx::Entity icon_still(nullptr);
9 9
10static void 10static void
11efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) 11efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
@@ -117,7 +117,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
117 if (!icon_still) 117 if (!icon_still)
118 { 118 {
119 efl::ui::Image obj(instantiate, cmid); 119 efl::ui::Image obj(instantiate, cmid);
120 efl::eina::optional<efl::Gfx> icon_still_p = cmid.content_unset(); 120 efl::eina::optional<efl::gfx::Entity> icon_still_p = cmid.content_unset();
121 if (icon_still_p) 121 if (icon_still_p)
122 { 122 {
123 icon_still = *icon_still_p; 123 icon_still = *icon_still_p;
diff --git a/unsorted/elementary/efl_ui_scroller_example.c b/unsorted/elementary/efl_ui_scroller_example.c
index e5588ab..99a7a55 100644
--- a/unsorted/elementary/efl_ui_scroller_example.c
+++ b/unsorted/elementary/efl_ui_scroller_example.c
@@ -17,7 +17,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC, 18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC,
19 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 19 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
20 efl_gfx_size_set(win, EINA_SIZE2D(300, 400)); 20 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 400));
21 21
22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win); 22 scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
23 efl_content_set(win, scroller); 23 efl_content_set(win, scroller);
@@ -25,7 +25,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
25 content = efl_add(EFL_UI_IMAGE_CLASS, scroller); 25 content = efl_add(EFL_UI_IMAGE_CLASS, scroller);
26 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 26 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
27 efl_file_set(content, buf, NULL); 27 efl_file_set(content, buf, NULL);
28 efl_gfx_size_set(content, EINA_SIZE2D(5000, 5000)); 28 efl_gfx_entity_size_set(content, EINA_SIZE2D(5000, 5000));
29 efl_content_set(scroller, content); 29 efl_content_set(scroller, content);
30} 30}
31EFL_MAIN() 31EFL_MAIN()
diff --git a/unsorted/elementary/evas3d_object_on_button_example.c b/unsorted/elementary/evas3d_object_on_button_example.c
index 7be8f60..e77d74b 100644
--- a/unsorted/elementary/evas3d_object_on_button_example.c
+++ b/unsorted/elementary/evas3d_object_on_button_example.c
@@ -258,8 +258,8 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
258 258
259 /* Add an image object for 3D scene rendering. */ 259 /* Add an image object for 3D scene rendering. */
260 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 260 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
261 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 261 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
262 efl_gfx_visible_set(image, EINA_TRUE); 262 efl_gfx_entity_visible_set(image, EINA_TRUE);
263 263
264 btn = elm_button_add(win); 264 btn = elm_button_add(win);
265 evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3); 265 evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3);
diff --git a/unsorted/elementary/evas3d_scene_on_button_example.c b/unsorted/elementary/evas3d_scene_on_button_example.c
index ffcc4b2..8f47c7e 100644
--- a/unsorted/elementary/evas3d_scene_on_button_example.c
+++ b/unsorted/elementary/evas3d_scene_on_button_example.c
@@ -249,7 +249,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
249 _scene_setup(&data); 249 _scene_setup(&data);
250 250
251 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 251 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
252 efl_gfx_visible_set(image, EINA_TRUE); 252 efl_gfx_entity_visible_set(image, EINA_TRUE);
253 253
254 /* Set the image object as render target for 3D scene. */ 254 /* Set the image object as render target for 3D scene. */
255 efl_canvas_scene3d_set(image, data.scene); 255 efl_canvas_scene3d_set(image, data.scene);
diff --git a/unsorted/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/unsorted/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index 59e0ebe..bceb165 100644
--- a/unsorted/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/unsorted/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -814,7 +814,7 @@ elm_main(int argc, char **argv)
814 _scene_setup(&data, 10.0, 10); 814 _scene_setup(&data, 10.0, 10);
815 815
816 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 816 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
817 efl_gfx_visible_set(image, EINA_TRUE); 817 efl_gfx_entity_visible_set(image, EINA_TRUE);
818 efl_canvas_scene3d_set(image, data.scene); 818 efl_canvas_scene3d_set(image, data.scene);
819 819
820 evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 820 evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/unsorted/evas/evas-3d-aabb.c b/unsorted/evas/evas-3d-aabb.c
index 5278999..dd4c1f0 100644
--- a/unsorted/evas/evas-3d-aabb.c
+++ b/unsorted/evas/evas-3d-aabb.c
@@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
110 int w, h; 110 int w, h;
111 111
112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
113 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 113 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
114 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 114 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
115} 115}
116 116
117static Eina_Bool 117static Eina_Bool
@@ -216,12 +216,12 @@ main(void)
216 216
217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
218 efl_gfx_color_set(background, 0, 0, 0, 255); 218 efl_gfx_color_set(background, 0, 0, 0, 255);
219 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 219 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
220 efl_gfx_visible_set(background, EINA_TRUE); 220 efl_gfx_entity_visible_set(background, EINA_TRUE);
221 221
222 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 222 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
223 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 223 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
224 efl_gfx_visible_set(image, EINA_TRUE); 224 efl_gfx_entity_visible_set(image, EINA_TRUE);
225 evas_object_focus_set(image, EINA_TRUE); 225 evas_object_focus_set(image, EINA_TRUE);
226 efl_canvas_scene3d_set(image, scene); 226 efl_canvas_scene3d_set(image, scene);
227 227
diff --git a/unsorted/evas/evas-3d-blending.c b/unsorted/evas/evas-3d-blending.c
index 531c8fa..667b671 100644
--- a/unsorted/evas/evas-3d-blending.c
+++ b/unsorted/evas/evas-3d-blending.c
@@ -126,8 +126,8 @@ _on_canvas_resize(Ecore_Evas *ee)
126 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 126 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
127 127
128 evas_object_resize(background, w, h); 128 evas_object_resize(background, w, h);
129 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 129 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
130 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 130 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
131} 131}
132 132
133static Eina_Bool 133static Eina_Bool
diff --git a/unsorted/evas/evas-3d-colorpick.c b/unsorted/evas/evas-3d-colorpick.c
index 381ac83..8c9ea3b 100644
--- a/unsorted/evas/evas-3d-colorpick.c
+++ b/unsorted/evas/evas-3d-colorpick.c
@@ -120,8 +120,8 @@ _on_canvas_resize(Ecore_Evas *ee)
120 int w, h; 120 int w, h;
121 121
122 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 122 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
123 efl_gfx_size_set(bg, EINA_SIZE2D(w, h)); 123 efl_gfx_entity_size_set(bg, EINA_SIZE2D(w, h));
124 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 124 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
125} 125}
126 126
127static Eina_Bool 127static Eina_Bool
@@ -392,8 +392,8 @@ int main(int argc, char **argv)
392 392
393 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 393 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
394 394
395 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 395 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
396 efl_gfx_visible_set(image, EINA_TRUE); 396 efl_gfx_entity_visible_set(image, EINA_TRUE);
397 evas_object_focus_set(image, EINA_TRUE); 397 evas_object_focus_set(image, EINA_TRUE);
398 efl_canvas_scene3d_set(image, globalscene.scene); 398 efl_canvas_scene3d_set(image, globalscene.scene);
399 399
diff --git a/unsorted/evas/evas-3d-cube-rotate.c b/unsorted/evas/evas-3d-cube-rotate.c
index 10b6a13..2588902 100644
--- a/unsorted/evas/evas-3d-cube-rotate.c
+++ b/unsorted/evas/evas-3d-cube-rotate.c
@@ -262,7 +262,7 @@ main(void)
262 262
263 /* Add an image object for 3D scene rendering. */ 263 /* Add an image object for 3D scene rendering. */
264 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 264 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
265 efl_gfx_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT)); 265 efl_gfx_entity_geometry_set(image, EINA_RECT(0, 0, WIDTH, HEIGHT));
266 evas_object_show(image); 266 evas_object_show(image);
267 267
268 /* Set the image object as render target for 3D scene. */ 268 /* Set the image object as render target for 3D scene. */
diff --git a/unsorted/evas/evas-3d-cube.c b/unsorted/evas/evas-3d-cube.c
index 5fff887..e8d04d4 100644
--- a/unsorted/evas/evas-3d-cube.c
+++ b/unsorted/evas/evas-3d-cube.c
@@ -114,8 +114,8 @@ _on_canvas_resize(Ecore_Evas *ee)
114 int w, h; 114 int w, h;
115 115
116 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 116 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
117 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 117 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
118 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 118 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
119} 119}
120 120
121static Eina_Bool 121static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
239 /* Add a background rectangle object. */ 239 /* Add a background rectangle object. */
240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
241 efl_gfx_color_set(background, 0, 0, 0, 255); 241 efl_gfx_color_set(background, 0, 0, 0, 255);
242 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 242 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
243 efl_gfx_visible_set(background, EINA_TRUE); 243 efl_gfx_entity_visible_set(background, EINA_TRUE);
244 244
245 /* Add an image object for 3D scene rendering. */ 245 /* Add an image object for 3D scene rendering. */
246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
247 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 247 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
248 efl_gfx_visible_set(image, EINA_TRUE); 248 efl_gfx_entity_visible_set(image, EINA_TRUE);
249 249
250 /* Set the image object as render target for 3D scene. */ 250 /* Set the image object as render target for 3D scene. */
251 efl_canvas_scene3d_set(image, data.scene); 251 efl_canvas_scene3d_set(image, data.scene);
diff --git a/unsorted/evas/evas-3d-cube2.c b/unsorted/evas/evas-3d-cube2.c
index 0b1d31c..c8558b6 100644
--- a/unsorted/evas/evas-3d-cube2.c
+++ b/unsorted/evas/evas-3d-cube2.c
@@ -78,8 +78,8 @@ _on_canvas_resize(Ecore_Evas *ee)
78 int w, h; 78 int w, h;
79 79
80 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 80 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
81 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 81 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
82 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 82 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
83} 83}
84 84
85static Eina_Bool 85static Eina_Bool
@@ -235,13 +235,13 @@ main(void)
235 /* Add a background rectangle object. */ 235 /* Add a background rectangle object. */
236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 0, 0, 0, 255); 237 efl_gfx_color_set(background, 0, 0, 0, 255);
238 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 238 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
239 efl_gfx_visible_set(background, EINA_TRUE); 239 efl_gfx_entity_visible_set(background, EINA_TRUE);
240 240
241 /* Add an image object for 3D scene rendering. */ 241 /* Add an image object for 3D scene rendering. */
242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
243 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 243 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
244 efl_gfx_visible_set(image, EINA_TRUE); 244 efl_gfx_entity_visible_set(image, EINA_TRUE);
245 245
246 /* Set the image object as render target for 3D scene. */ 246 /* Set the image object as render target for 3D scene. */
247 efl_canvas_scene3d_set(image, data.scene); 247 efl_canvas_scene3d_set(image, data.scene);
diff --git a/unsorted/evas/evas-3d-eet.c b/unsorted/evas/evas-3d-eet.c
index b9b7f6d..da94e06 100644
--- a/unsorted/evas/evas-3d-eet.c
+++ b/unsorted/evas/evas-3d-eet.c
@@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
91 int w, h; 91 int w, h;
92 92
93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
94 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 94 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
95 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 95 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
96} 96}
97 97
98int 98int
@@ -187,13 +187,13 @@ main(void)
187 /* Add a background rectangle object. */ 187 /* Add a background rectangle object. */
188 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 188 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
189 efl_gfx_color_set(background, 0, 0, 0, 255); 189 efl_gfx_color_set(background, 0, 0, 0, 255);
190 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 190 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
191 efl_gfx_visible_set(background, EINA_TRUE); 191 efl_gfx_entity_visible_set(background, EINA_TRUE);
192 192
193 /* Add an image object for 3D scene rendering. */ 193 /* Add an image object for 3D scene rendering. */
194 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 194 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
195 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 195 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
196 efl_gfx_visible_set(image, EINA_TRUE); 196 efl_gfx_entity_visible_set(image, EINA_TRUE);
197 197
198 /* Set the image object as render target for 3D scene. */ 198 /* Set the image object as render target for 3D scene. */
199 efl_canvas_scene3d_set(image, scene); 199 efl_canvas_scene3d_set(image, scene);
diff --git a/unsorted/evas/evas-3d-fog.c b/unsorted/evas/evas-3d-fog.c
index e9e0144..4c69dca 100644
--- a/unsorted/evas/evas-3d-fog.c
+++ b/unsorted/evas/evas-3d-fog.c
@@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee)
61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
62 62
63 evas_object_resize(background, w, h); 63 evas_object_resize(background, w, h);
64 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 64 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
65 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 65 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
66} 66}
67 67
68static Eina_Bool 68static Eina_Bool
@@ -212,14 +212,14 @@ main(void)
212 /* Add a background rectangle object. */ 212 /* Add a background rectangle object. */
213 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 213 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
214 efl_gfx_color_set(background, 0, 0, 0, 255); 214 efl_gfx_color_set(background, 0, 0, 0, 255);
215 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 215 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
216 efl_gfx_visible_set(background, EINA_TRUE); 216 efl_gfx_entity_visible_set(background, EINA_TRUE);
217 217
218 /* Add an image object for 3D scene rendering. */ 218 /* Add an image object for 3D scene rendering. */
219 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 219 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
220 220
221 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 221 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
222 efl_gfx_visible_set(image, EINA_TRUE); 222 efl_gfx_entity_visible_set(image, EINA_TRUE);
223 223
224 /* Set the image object as render target for 3D scene. */ 224 /* Set the image object as render target for 3D scene. */
225 efl_canvas_scene3d_set(image, data.scene); 225 efl_canvas_scene3d_set(image, data.scene);
diff --git a/unsorted/evas/evas-3d-hull.c b/unsorted/evas/evas-3d-hull.c
index 7e57056..0e13705 100644
--- a/unsorted/evas/evas-3d-hull.c
+++ b/unsorted/evas/evas-3d-hull.c
@@ -195,8 +195,8 @@ _on_canvas_resize(Ecore_Evas *ee)
195 int w, h; 195 int w, h;
196 196
197 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 197 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
198 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 198 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
199 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 199 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
200} 200}
201 201
202static Eina_Bool 202static Eina_Bool
@@ -433,13 +433,13 @@ main(void)
433 /* Add a background rectangle object. */ 433 /* Add a background rectangle object. */
434 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 434 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
435 efl_gfx_color_set(background, 0, 0, 0, 255); 435 efl_gfx_color_set(background, 0, 0, 0, 255);
436 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 436 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
437 efl_gfx_visible_set(background, EINA_TRUE); 437 efl_gfx_entity_visible_set(background, EINA_TRUE);
438 438
439 /* Add an image object for 3D scene rendering. */ 439 /* Add an image object for 3D scene rendering. */
440 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 440 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
441 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 441 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
442 efl_gfx_visible_set(image, EINA_TRUE); 442 efl_gfx_entity_visible_set(image, EINA_TRUE);
443 443
444 evas_object_show(image), 444 evas_object_show(image),
445 evas_object_focus_set(image, EINA_TRUE); 445 evas_object_focus_set(image, EINA_TRUE);
diff --git a/unsorted/evas/evas-3d-md2.c b/unsorted/evas/evas-3d-md2.c
index 527d856..adfb696 100644
--- a/unsorted/evas/evas-3d-md2.c
+++ b/unsorted/evas/evas-3d-md2.c
@@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
68 int w, h; 68 int w, h;
69 69
70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
71 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 71 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
72 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 72 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
73} 73}
74 74
75int 75int
@@ -154,13 +154,13 @@ main(void)
154 /* Add a background rectangle object. */ 154 /* Add a background rectangle object. */
155 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 155 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
156 efl_gfx_color_set(background, 0, 0, 0, 255); 156 efl_gfx_color_set(background, 0, 0, 0, 255);
157 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 157 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
158 efl_gfx_visible_set(background, EINA_TRUE); 158 efl_gfx_entity_visible_set(background, EINA_TRUE);
159 159
160 /* Add an image object for 3D scene rendering. */ 160 /* Add an image object for 3D scene rendering. */
161 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 161 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
162 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 162 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
163 efl_gfx_visible_set(image, EINA_TRUE); 163 efl_gfx_entity_visible_set(image, EINA_TRUE);
164 164
165 /* Set the image object as render target for 3D scene. */ 165 /* Set the image object as render target for 3D scene. */
166 efl_canvas_scene3d_set(image, scene); 166 efl_canvas_scene3d_set(image, scene);
diff --git a/unsorted/evas/evas-3d-mmap-set.c b/unsorted/evas/evas-3d-mmap-set.c
index 570e7d3..3605555 100644
--- a/unsorted/evas/evas-3d-mmap-set.c
+++ b/unsorted/evas/evas-3d-mmap-set.c
@@ -155,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee)
155 int w, h; 155 int w, h;
156 156
157 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 157 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
158 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 158 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
159 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 159 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
160} 160}
161 161
162int 162int
@@ -235,13 +235,13 @@ main(void)
235 /* Add a background rectangle object. */ 235 /* Add a background rectangle object. */
236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 236 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 20, 20, 200, 255); 237 efl_gfx_color_set(background, 20, 20, 200, 255);
238 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 238 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
239 efl_gfx_visible_set(background, EINA_TRUE); 239 efl_gfx_entity_visible_set(background, EINA_TRUE);
240 240
241 /* Add an image object for 3D scene rendering. */ 241 /* Add an image object for 3D scene rendering. */
242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 242 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
243 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 243 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
244 efl_gfx_visible_set(image, EINA_TRUE); 244 efl_gfx_entity_visible_set(image, EINA_TRUE);
245 245
246 /* Set the image object as render target for 3D scene. */ 246 /* Set the image object as render target for 3D scene. */
247 efl_canvas_scene3d_set(image, scene); 247 efl_canvas_scene3d_set(image, scene);
diff --git a/unsorted/evas/evas-3d-obj.c b/unsorted/evas/evas-3d-obj.c
index b00d6e5..e04da98 100644
--- a/unsorted/evas/evas-3d-obj.c
+++ b/unsorted/evas/evas-3d-obj.c
@@ -133,8 +133,8 @@ _on_canvas_resize(Ecore_Evas *ee)
133 int w, h; 133 int w, h;
134 134
135 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 135 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
136 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 136 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
137 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 137 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
138} 138}
139 139
140int 140int
@@ -216,13 +216,13 @@ main(void)
216 /* Add a background rectangle MESHES. */ 216 /* Add a background rectangle MESHES. */
217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 217 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
218 efl_gfx_color_set(background, 0, 0, 0, 255); 218 efl_gfx_color_set(background, 0, 0, 0, 255);
219 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 219 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
220 efl_gfx_visible_set(background, EINA_TRUE); 220 efl_gfx_entity_visible_set(background, EINA_TRUE);
221 221
222 /* Add an image object for 3D scene rendering. */ 222 /* Add an image object for 3D scene rendering. */
223 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 223 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
224 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 224 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
225 efl_gfx_visible_set(image, EINA_TRUE); 225 efl_gfx_entity_visible_set(image, EINA_TRUE);
226 226
227 /* Set the image object as render target for 3D scene. */ 227 /* Set the image object as render target for 3D scene. */
228 efl_canvas_scene3d_set(image, scene); 228 efl_canvas_scene3d_set(image, scene);
diff --git a/unsorted/evas/evas-3d-parallax-occlusion.c b/unsorted/evas/evas-3d-parallax-occlusion.c
index c888653..83188c0 100644
--- a/unsorted/evas/evas-3d-parallax-occlusion.c
+++ b/unsorted/evas/evas-3d-parallax-occlusion.c
@@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee)
80 int w, h; 80 int w, h;
81 81
82 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 82 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
83 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 83 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
84 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 84 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
85} 85}
86 86
87static Eina_Bool 87static Eina_Bool
@@ -239,13 +239,13 @@ main(void)
239 /* Add a background rectangle object. */ 239 /* Add a background rectangle object. */
240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 240 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
241 efl_gfx_color_set(background, 0, 0, 0, 255); 241 efl_gfx_color_set(background, 0, 0, 0, 255);
242 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 242 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
243 efl_gfx_visible_set(background, EINA_TRUE); 243 efl_gfx_entity_visible_set(background, EINA_TRUE);
244 244
245 /* Add an image object for 3D scene rendering. */ 245 /* Add an image object for 3D scene rendering. */
246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 246 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
247 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 247 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
248 efl_gfx_visible_set(image, EINA_TRUE); 248 efl_gfx_entity_visible_set(image, EINA_TRUE);
249 evas_object_focus_set(image, EINA_TRUE); 249 evas_object_focus_set(image, EINA_TRUE);
250 250
251 /* Set the image object as render target for 3D scene. */ 251 /* Set the image object as render target for 3D scene. */
diff --git a/unsorted/evas/evas-3d-pick.c b/unsorted/evas/evas-3d-pick.c
index 177cfb4..1e2f3d6 100644
--- a/unsorted/evas/evas-3d-pick.c
+++ b/unsorted/evas/evas-3d-pick.c
@@ -169,13 +169,13 @@ main(void)
169 /* Add evas objects. */ 169 /* Add evas objects. */
170 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 170 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
171 efl_gfx_color_set(background, 0, 0, 0, 255); 171 efl_gfx_color_set(background, 0, 0, 0, 255);
172 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 172 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
173 efl_gfx_visible_set(background, EINA_TRUE); 173 efl_gfx_entity_visible_set(background, EINA_TRUE);
174 174
175 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 175 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
176 efl_canvas_scene3d_set(image, scene); 176 efl_canvas_scene3d_set(image, scene);
177 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 177 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
178 efl_gfx_visible_set(image, EINA_TRUE); 178 efl_gfx_entity_visible_set(image, EINA_TRUE);
179 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, 179 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
180 _on_mouse_down, NULL); 180 _on_mouse_down, NULL);
181 181
diff --git a/unsorted/evas/evas-3d-ply.c b/unsorted/evas/evas-3d-ply.c
index 6de10dc..821195b 100644
--- a/unsorted/evas/evas-3d-ply.c
+++ b/unsorted/evas/evas-3d-ply.c
@@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee)
98 int w, h; 98 int w, h;
99 99
100 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 100 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
101 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 101 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
102 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 102 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
103} 103}
104 104
105int 105int
@@ -210,13 +210,13 @@ main(void)
210 /* Add a background rectangle object. */ 210 /* Add a background rectangle object. */
211 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 211 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
212 efl_gfx_color_set(background, 100, 100, 100, 255); 212 efl_gfx_color_set(background, 100, 100, 100, 255);
213 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 213 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
214 efl_gfx_visible_set(background, EINA_TRUE); 214 efl_gfx_entity_visible_set(background, EINA_TRUE);
215 215
216 /* Add an image object for 3D scene rendering. */ 216 /* Add an image object for 3D scene rendering. */
217 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 217 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
218 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 218 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
219 efl_gfx_visible_set(image, EINA_TRUE); 219 efl_gfx_entity_visible_set(image, EINA_TRUE);
220 220
221 /* Set the image object as render target for 3D scene. */ 221 /* Set the image object as render target for 3D scene. */
222 efl_canvas_scene3d_set(image, scene); 222 efl_canvas_scene3d_set(image, scene);
diff --git a/unsorted/evas/evas-3d-proxy.c b/unsorted/evas/evas-3d-proxy.c
index 1c6cad6..6445ee9 100644
--- a/unsorted/evas/evas-3d-proxy.c
+++ b/unsorted/evas/evas-3d-proxy.c
@@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee)
63 int w, h; 63 int w, h;
64 64
65 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 65 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
66 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 66 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
67 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 67 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
68} 68}
69 69
70static Eina_Bool 70static Eina_Bool
@@ -221,16 +221,16 @@ main(void)
221 /* Add a background rectangle object. */ 221 /* Add a background rectangle object. */
222 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 222 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
223 efl_gfx_color_set(background, 0, 0, 0, 255); 223 efl_gfx_color_set(background, 0, 0, 0, 255);
224 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 224 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
225 efl_gfx_visible_set(background, EINA_TRUE); 225 efl_gfx_entity_visible_set(background, EINA_TRUE);
226 226
227 /* Add a background image. */ 227 /* Add a background image. */
228#ifdef USE_EO_IMAGE 228#ifdef USE_EO_IMAGE
229 source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 229 source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
230 efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); 230 efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
231 efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); 231 efl_gfx_entity_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2)));
232 efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); 232 efl_gfx_entity_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
233 efl_gfx_visible_set(source, EINA_TRUE); 233 efl_gfx_entity_visible_set(source, EINA_TRUE);
234#else 234#else
235 source = evas_object_image_filled_add(evas); 235 source = evas_object_image_filled_add(evas);
236 evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT); 236 evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT);
@@ -241,8 +241,8 @@ main(void)
241 241
242 /* Add an image object for 3D scene rendering. */ 242 /* Add an image object for 3D scene rendering. */
243 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 243 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
244 efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); 244 efl_gfx_entity_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2)));
245 efl_gfx_visible_set(image, EINA_TRUE); 245 efl_gfx_entity_visible_set(image, EINA_TRUE);
246 246
247 /* Setup scene */ 247 /* Setup scene */
248 _scene_setup(&data); 248 _scene_setup(&data);
diff --git a/unsorted/evas/evas-3d-shadows.c b/unsorted/evas/evas-3d-shadows.c
index 9fd1e54..ae06a36 100644
--- a/unsorted/evas/evas-3d-shadows.c
+++ b/unsorted/evas/evas-3d-shadows.c
@@ -181,8 +181,8 @@ _on_canvas_resize(Ecore_Evas *ee)
181 int w, h; 181 int w, h;
182 182
183 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 183 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
184 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 184 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
185 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 185 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
186} 186}
187 187
188static void 188static void
@@ -644,13 +644,13 @@ main(void)
644 /* Add a background rectangle object. */ 644 /* Add a background rectangle object. */
645 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 645 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
646 efl_gfx_color_set(background, 0, 0, 0, 255); 646 efl_gfx_color_set(background, 0, 0, 0, 255);
647 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 647 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
648 efl_gfx_visible_set(background, EINA_TRUE); 648 efl_gfx_entity_visible_set(background, EINA_TRUE);
649 649
650 /* Add an image object for 3D scene rendering. */ 650 /* Add an image object for 3D scene rendering. */
651 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 651 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
652 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 652 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
653 efl_gfx_visible_set(image, EINA_TRUE); 653 efl_gfx_entity_visible_set(image, EINA_TRUE);
654 evas_object_anti_alias_set(image, EINA_TRUE); 654 evas_object_anti_alias_set(image, EINA_TRUE);
655 evas_object_focus_set(image, EINA_TRUE); 655 evas_object_focus_set(image, EINA_TRUE);
656 /* Set the image object as render target for 3D scene. */ 656 /* Set the image object as render target for 3D scene. */
diff --git a/unsorted/evas/evas-3d-static-lod.c b/unsorted/evas/evas-3d-static-lod.c
index 4db601c..d7672a4 100644
--- a/unsorted/evas/evas-3d-static-lod.c
+++ b/unsorted/evas/evas-3d-static-lod.c
@@ -66,8 +66,8 @@ _on_canvas_resize(Ecore_Evas *ee)
66 int w, h; 66 int w, h;
67 67
68 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 68 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
69 efl_gfx_size_set(background, EINA_SIZE2D(w, h)); 69 efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h));
70 efl_gfx_size_set(image, EINA_SIZE2D(w, h)); 70 efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h));
71} 71}
72 72
73static Eina_Bool 73static Eina_Bool
@@ -256,13 +256,13 @@ main(void)
256 /* Add a background rectangle object. */ 256 /* Add a background rectangle object. */
257 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 257 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
258 efl_gfx_color_set(background, 0, 0, 0, 255); 258 efl_gfx_color_set(background, 0, 0, 0, 255);
259 efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); 259 efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT));
260 efl_gfx_visible_set(background, EINA_TRUE); 260 efl_gfx_entity_visible_set(background, EINA_TRUE);
261 261
262 /* Add an image object for 3D scene rendering. */ 262 /* Add an image object for 3D scene rendering. */
263 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); 263 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
264 efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); 264 efl_gfx_entity_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT));
265 efl_gfx_visible_set(image, EINA_TRUE); 265 efl_gfx_entity_visible_set(image, EINA_TRUE);
266 evas_object_focus_set(image, EINA_TRUE); 266 evas_object_focus_set(image, EINA_TRUE);
267 /* Set the image object as render target for 3D scene. */ 267 /* Set the image object as render target for 3D scene. */
268 efl_canvas_scene3d_set(image, data.scene); 268 efl_canvas_scene3d_set(image, data.scene);
diff --git a/unsorted/evas/evas-map-utils-eo.c b/unsorted/evas/evas-map-utils-eo.c
index 34fae5e..78845e7 100644
--- a/unsorted/evas/evas-map-utils-eo.c
+++ b/unsorted/evas/evas-map-utils-eo.c
@@ -90,7 +90,7 @@ _anim_cb(void *data)
90 90
91 91
92 o = evas_object_name_find(ad->canvas, "obj2"); 92 o = evas_object_name_find(ad->canvas, "obj2");
93 h = efl_gfx_size_get(o).h; 93 h = efl_gfx_entity_size_get(o).h;
94 efl_gfx_map_reset(o); 94 efl_gfx_map_reset(o);
95 efl_gfx_map_smooth_set(o, ad->smooth); 95 efl_gfx_map_smooth_set(o, ad->smooth);
96 efl_gfx_map_alpha_set(o, ad->alpha); 96 efl_gfx_map_alpha_set(o, ad->alpha);
@@ -105,7 +105,7 @@ _anim_cb(void *data)
105 105
106 106
107 o = evas_object_name_find(ad->canvas, "obj3"); 107 o = evas_object_name_find(ad->canvas, "obj3");
108 EINA_SIZE2D(w, h) = efl_gfx_size_get(o); 108 EINA_SIZE2D(w, h) = efl_gfx_entity_size_get(o);
109 efl_gfx_map_reset(o); 109 efl_gfx_map_reset(o);
110 efl_gfx_map_smooth_set(o, ad->smooth); 110 efl_gfx_map_smooth_set(o, ad->smooth);
111 efl_gfx_map_alpha_set(o, ad->alpha); 111 efl_gfx_map_alpha_set(o, ad->alpha);
@@ -122,13 +122,13 @@ _anim_cb(void *data)
122 -256, 255, 255, 255, 0, 0, 0); 122 -256, 255, 255, 255, 0, 0, 0);
123 } 123 }
124 if (ad->backface_culling) 124 if (ad->backface_culling)
125 efl_gfx_visible_set(o, efl_gfx_map_clockwise_get(o)); 125 efl_gfx_entity_visible_set(o, efl_gfx_map_clockwise_get(o));
126 else 126 else
127 efl_gfx_visible_set(o, 1); 127 efl_gfx_entity_visible_set(o, 1);
128 128
129 129
130 o = evas_object_name_find(ad->canvas, "obj4"); 130 o = evas_object_name_find(ad->canvas, "obj4");
131 rect = efl_gfx_geometry_get(o); 131 rect = efl_gfx_entity_geometry_get(o);
132 efl_gfx_map_reset(o); 132 efl_gfx_map_reset(o);
133 efl_gfx_map_smooth_set(o, ad->smooth); 133 efl_gfx_map_smooth_set(o, ad->smooth);
134 efl_gfx_map_alpha_set(o, ad->alpha); 134 efl_gfx_map_alpha_set(o, ad->alpha);
diff --git a/unsorted/evas/evas-object-manipulation-eo.c b/unsorted/evas/evas-object-manipulation-eo.c
index ef61a50..ee320c4 100644
--- a/unsorted/evas/evas-object-manipulation-eo.c
+++ b/unsorted/evas/evas-object-manipulation-eo.c
@@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
55 int w, h; 55 int w, h;
56 56
57 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 57 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
58 efl_gfx_size_set(d.bg, EINA_SIZE2D(w, h)); 58 efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(w, h));
59} 59}
60 60
61static void 61static void
@@ -141,8 +141,8 @@ _on_keydown(void *data EINA_UNUSED,
141 Eina_Bool visibility; 141 Eina_Bool visibility;
142 /* Don't use "get"-"set" expressions in one eo_do call, 142 /* Don't use "get"-"set" expressions in one eo_do call,
143 * if you pass parameter to "set" by value. */ 143 * if you pass parameter to "set" by value. */
144 visibility = efl_gfx_visible_get(d.clipper); 144 visibility = efl_gfx_entity_visible_get(d.clipper);
145 efl_gfx_visible_set(d.clipper, !visibility); 145 efl_gfx_entity_visible_set(d.clipper, !visibility);
146 printf("Clipper is now %s\n", visibility ? "hidden" : "visible"); 146 printf("Clipper is now %s\n", visibility ? "hidden" : "visible");
147 return; 147 return;
148 } 148 }
@@ -176,11 +176,11 @@ main(void)
176 evas_object_name_set(d.bg, "background rectangle"); 176 evas_object_name_set(d.bg, "background rectangle");
177 efl_gfx_color_set(d.bg, 255, 255, 255, 255); 177 efl_gfx_color_set(d.bg, 255, 255, 255, 255);
178 /* white bg */ 178 /* white bg */
179 efl_gfx_position_set(d.bg, EINA_POSITION2D(0, 0)); 179 efl_gfx_entity_position_set(d.bg, EINA_POSITION2D(0, 0));
180 /* at canvas' origin */ 180 /* at canvas' origin */
181 efl_gfx_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT)); 181 efl_gfx_entity_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT));
182 /* covers full canvas */ 182 /* covers full canvas */
183 efl_gfx_visible_set(d.bg, EINA_TRUE); 183 efl_gfx_entity_visible_set(d.bg, EINA_TRUE);
184 evas_object_focus_set(d.bg, EINA_TRUE); 184 evas_object_focus_set(d.bg, EINA_TRUE);
185 185
186 evas_object_event_callback_add( 186 evas_object_event_callback_add(
@@ -202,9 +202,9 @@ main(void)
202 } 202 }
203 else 203 else
204 { 204 {
205 efl_gfx_position_set(d.img, EINA_POSITION2D(0, 0)); 205 efl_gfx_entity_position_set(d.img, EINA_POSITION2D(0, 0));
206 efl_gfx_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT)); 206 efl_gfx_entity_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT));
207 efl_gfx_visible_set(d.img, EINA_TRUE); 207 efl_gfx_entity_visible_set(d.img, EINA_TRUE);
208 printf("Image object added, class name is: %s\n", 208 printf("Image object added, class name is: %s\n",
209 efl_class_name_get(d.img)); 209 efl_class_name_get(d.img));
210 } 210 }
@@ -222,9 +222,9 @@ main(void)
222 { 222 {
223 efl_image_border_set(d.clipper_border, 3, 3, 3, 3); 223 efl_image_border_set(d.clipper_border, 3, 3, 3, 3);
224 efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE); 224 efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE);
225 efl_gfx_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3)); 225 efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
226 efl_gfx_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6)); 226 efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
227 efl_gfx_visible_set(d.clipper_border, EINA_TRUE); 227 efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);
228 } 228 }
229 229
230 /* solid white clipper (note that it's the default color for a 230 /* solid white clipper (note that it's the default color for a
@@ -232,9 +232,9 @@ main(void)
232 * by 255) */ 232 * by 255) */
233 d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); 233 d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
234 234
235 efl_gfx_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4)); 235 efl_gfx_entity_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4));
236 efl_gfx_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); 236 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
237 efl_gfx_visible_set(d.clipper, EINA_TRUE); 237 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
238 238
239 efl_canvas_object_clip_set(d.img, d.clipper); 239 efl_canvas_object_clip_set(d.img, d.clipper);
240 240