orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: fix example to follow new Efl.Gfx interface.

This commit is contained in:
Cedric BAIL 2015-04-03 16:30:47 +02:00
parent 09be34b825
commit 3b97e3d9cd
14 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/examples/evas/evas-3d-aabb.c
View File

@ -112,8 +112,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static Eina_Bool
@ -243,14 +243,14 @@ main(void)
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
evas_object_focus_set(image, EINA_TRUE);
eo_do(image, evas_obj_image_scene_set(scene));

4
src/examples/evas/evas-3d-blending.c
View File

@ -136,8 +136,8 @@ _on_canvas_resize(Ecore_Evas *ee)
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
evas_object_resize(background, w, h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static Eina_Bool

14
src/examples/evas/evas-3d-cube.c
View File

@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static Eina_Bool
@ -260,15 +260,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(data.scene));

14
src/examples/evas/evas-3d-cube2.c
View File

@ -79,8 +79,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static Eina_Bool
@ -259,15 +259,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(data.scene));

14
src/examples/evas/evas-3d-eet.c
View File

@ -93,8 +93,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
int
@ -214,15 +214,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(scene));

14
src/examples/evas/evas-3d-md2.c
View File

@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
int
@ -178,15 +178,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(scene));

16
src/examples/evas/evas-3d-mmap-set.c
View File

@ -34,7 +34,7 @@
extention##_file = eina_file_open(buffer , 0); \
mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \
eo_do(mesh_##extention, \
evas_3d_mesh_mmap_set(extention##_file, NULL), \
efl_file_mmap_set(extention##_file, NULL), \
evas_3d_mesh_frame_material_set(0, material), \
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); \
node_##extention = eo_add(EVAS_3D_NODE_CLASS, evas, \
@ -161,8 +161,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
int
@ -258,15 +258,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(20, 20, 200, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(20, 20, 200, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(scene));

14
src/examples/evas/evas-3d-obj.c
View File

@ -139,8 +139,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
int
@ -235,15 +235,15 @@ main(void)
/* Add a background rectangle MESHES. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(scene));

10
src/examples/evas/evas-3d-pick.c
View File

@ -199,15 +199,15 @@ main(void)
/* Add evas objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_image_scene_set(scene),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
_on_mouse_down, NULL);

14
src/examples/evas/evas-3d-ply.c
View File

@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
int
@ -227,15 +227,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(100, 100, 100, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(100, 100, 100, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Set the image object as render target for 3D scene. */
eo_do(image, evas_obj_image_scene_set(scene));

22
src/examples/evas/evas-3d-proxy.c
View File

@ -56,8 +56,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static Eina_Bool
@ -218,23 +218,23 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add a background image. */
source = evas_object_image_filled_add(evas);
eo_do(source,
evas_obj_image_size_set(IMG_WIDTH, IMG_HEIGHT),
evas_obj_position_set((WIDTH / 2), (HEIGHT / 2)),
evas_obj_size_set((WIDTH / 2), (HEIGHT / 2)),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_view_size_set(IMG_WIDTH, IMG_HEIGHT),
efl_gfx_position_set((WIDTH / 2), (HEIGHT / 2)),
efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set((WIDTH / 2), (HEIGHT / 2)),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)),
efl_gfx_visible_set(EINA_TRUE));
/* Setup scene */
_scene_setup(&data);

14
src/examples/evas/evas-3d-shadows.c
View File

@ -147,8 +147,8 @@ _on_canvas_resize(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(background, evas_obj_size_set(w, h));
eo_do(image, evas_obj_size_set(w, h));
eo_do(background, efl_gfx_size_set(w, h));
eo_do(image, efl_gfx_size_set(w, h));
}
static void
@ -525,15 +525,15 @@ main(void)
/* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
/* Add an image object for 3D scene rendering. */
image = evas_object_image_filled_add(evas);
eo_do(image,
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
evas_object_focus_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */

40
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -59,7 +59,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
int w, h;
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
eo_do(d.bg, evas_obj_size_set(w, h));
eo_do(d.bg, efl_gfx_size_set(w, h));
}
static void
@ -80,7 +80,7 @@ _on_keydown(void *data EINA_UNUSED,
{
int alpha, r, g, b;
eo_do(d.clipper, evas_obj_color_get(&r, &g, &b, &alpha));
eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha));
evas_color_argb_unpremul(alpha, &r, &g, &b);
alpha -= 20;
@ -88,7 +88,7 @@ _on_keydown(void *data EINA_UNUSED,
alpha = 255;
evas_color_argb_premul(alpha, &r, &g, &b);
eo_do(d.clipper, evas_obj_color_set(r, g, b, alpha));
eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha));
fprintf(stdout, "Changing clipper's opacity: %d%%\n",
(int)((alpha / 255.0) * 100));
@ -102,7 +102,7 @@ _on_keydown(void *data EINA_UNUSED,
fprintf(stdout, "Changing clipper's color to");
eo_do(d.clipper, evas_obj_color_get(&r, &g, &b, &alpha));
eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha));
evas_color_argb_unpremul(alpha, &r, &g, &b);
if (g > 0)
@ -117,7 +117,7 @@ _on_keydown(void *data EINA_UNUSED,
}
evas_color_argb_premul(alpha, &r, &g, &b);
eo_do(d.clipper, evas_obj_color_set(r, g, b, alpha));
eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha));
return;
}
@ -145,8 +145,8 @@ _on_keydown(void *data EINA_UNUSED,
Eina_Bool visibility;
/* Don't use "get"-"set" expressions in one eo_do call,
* if you pass parameter to "set" by value. */
eo_do(d.clipper, visibility = evas_obj_visibility_get());
eo_do(d.clipper, evas_obj_visibility_set(!visibility));
eo_do(d.clipper, visibility = efl_gfx_visible_get());
eo_do(d.clipper, efl_gfx_visible_set(!visibility));
fprintf(stdout, "Clipper is now %s\n", visibility ? "hidden" : "visible");
return;
}
@ -178,10 +178,10 @@ main(void)
/* Eo-styled way to perform actions on an object*/
eo_do(d.bg, evas_obj_name_set("background rectangle"),
evas_obj_color_set(255, 255, 255, 255), /* white bg */
evas_obj_position_set(0, 0), /* at canvas' origin */
evas_obj_size_set(WIDTH, HEIGHT), /* covers full canvas */
evas_obj_visibility_set(EINA_TRUE),
efl_gfx_color_set(255, 255, 255, 255), /* white bg */
efl_gfx_position_set(0, 0), /* at canvas' origin */
efl_gfx_size_set(WIDTH, HEIGHT), /* covers full canvas */
efl_gfx_visible_set(EINA_TRUE),
evas_obj_focus_set(EINA_TRUE));
evas_object_event_callback_add(
@ -204,9 +204,9 @@ main(void)
}
else
{
eo_do(d.img, evas_obj_position_set(0, 0),
evas_obj_size_set(WIDTH, HEIGHT),
evas_obj_visibility_set(EINA_TRUE));
eo_do(d.img, efl_gfx_position_set(0, 0),
efl_gfx_size_set(WIDTH, HEIGHT),
efl_gfx_visible_set(EINA_TRUE));
const char *type = NULL;
eo_do(d.img, type = evas_obj_type_get());
@ -228,9 +228,9 @@ main(void)
eo_do(d.clipper_border,
evas_obj_image_border_set(3, 3, 3, 3),
evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_NONE),
evas_obj_position_set((WIDTH / 4) -3, (HEIGHT / 4) - 3),
evas_obj_size_set((WIDTH / 2) + 6, (HEIGHT / 2) + 6),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_position_set((WIDTH / 4) -3, (HEIGHT / 4) - 3),
efl_gfx_size_set((WIDTH / 2) + 6, (HEIGHT / 2) + 6),
efl_gfx_visible_set(EINA_TRUE));
}
/* solid white clipper (note that it's the default color for a
* rectangle) - it won't change clippees' colors, then (multiplying
@ -238,9 +238,9 @@ main(void)
d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas);
eo_do(d.clipper,
evas_obj_position_set( WIDTH / 4, HEIGHT / 4),
evas_obj_size_set(WIDTH / 2, HEIGHT / 2),
evas_obj_visibility_set(EINA_TRUE));
efl_gfx_position_set( WIDTH / 4, HEIGHT / 4),
efl_gfx_size_set(WIDTH / 2, HEIGHT / 2),
efl_gfx_visible_set(EINA_TRUE));
eo_do(d.img, evas_obj_clip_set(d.clipper));

2
src/examples/evas/evas_cxx_rectangle.cc
View File

@ -44,7 +44,7 @@ int main()
rect.color_set(255, 0, 0, 255);
rect.position_set(10, 10);
rect.size_set(100, 100);
rect.visibility_set(true);
rect.visible_set(true);
canvas.render();
}