summaryrefslogtreecommitdiff
path: root/src/examples/evas
diff options
context:
space:
mode:
Diffstat (limited to 'src/examples/evas')
-rw-r--r--src/examples/evas/evas-3d-aabb.c4
-rw-r--r--src/examples/evas/evas-3d-colorpick.c2
-rw-r--r--src/examples/evas/evas-3d-cube2.c2
-rw-r--r--src/examples/evas/evas-3d-eet.c4
-rw-r--r--src/examples/evas/evas-3d-frustum.c4
-rw-r--r--src/examples/evas/evas-3d-hull.c2
-rw-r--r--src/examples/evas/evas-3d-md2.c4
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c2
-rw-r--r--src/examples/evas/evas-3d-obj.c4
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c8
-rw-r--r--src/examples/evas/evas-3d-pick.c2
-rw-r--r--src/examples/evas/evas-3d-ply.c6
-rw-r--r--src/examples/evas/evas-3d-shadows.c10
-rw-r--r--src/examples/evas/evas-3d-static-lod.c4
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c17
-rw-r--r--src/examples/evas/evas-vg-batman.c6
-rw-r--r--src/examples/evas/evas-vg-simple.c38
-rw-r--r--src/examples/evas/evas_cxx_rectangle.cc4
-rw-r--r--src/examples/evas/evas_mono_box.cs73
-rw-r--r--src/examples/evas/evas_mono_image.cs93
-rw-r--r--src/examples/evas/evas_mono_image2.cs83
-rw-r--r--src/examples/evas/evas_mono_rectangle.cs47
-rw-r--r--src/examples/evas/evas_mono_table.cs77
-rw-r--r--src/examples/evas/evas_mono_text.cs127
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h8
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c10
26 files changed, 71 insertions, 570 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index dd4c1f0..fdb8a45 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -170,12 +170,12 @@ main(void)
170 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 170 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
171 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 171 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
172 172
173 efl_file_set(mesh, model_path, NULL); 173 efl_file_simple_load(mesh, model_path, NULL);
174 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 174 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
175 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 175 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
176 176
177 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 177 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
178 efl_file_set(texture, image_path, NULL); 178 efl_file_simple_load(texture, image_path, NULL);
179 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 179 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
180 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 180 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
181 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); 181 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 8c9ea3b..7b894cd 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -256,7 +256,7 @@ _init_sphere(void *this, const char *texture)
256 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE); 256 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE);
257 257
258 sphere->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 258 sphere->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
259 efl_file_set(sphere->texture, texture, NULL); 259 efl_file_simple_load(sphere->texture, texture, NULL);
260 evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 260 evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
261 evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 261 evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
262 evas_canvas3d_material_texture_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, sphere->texture); 262 evas_canvas3d_material_texture_set(sphere->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, sphere->texture);
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index c8558b6..b2d905e 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -168,7 +168,7 @@ _mesh_setup(Scene_Data *data)
168 168
169 evas_canvas3d_texture_data_set(data->texture0, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]); 169 evas_canvas3d_texture_data_set(data->texture0, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]);
170 evas_canvas3d_texture_data_set(data->texture1, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]); 170 evas_canvas3d_texture_data_set(data->texture1, EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]);
171 efl_file_set(data->texture_normal, normal_map_path, NULL); 171 efl_file_simple_load(data->texture_normal, normal_map_path, NULL);
172 172
173 evas_canvas3d_material_texture_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture0); 173 evas_canvas3d_material_texture_set(data->material0, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture0);
174 evas_canvas3d_material_texture_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture1); 174 evas_canvas3d_material_texture_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture1);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index da94e06..becd0bc 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -146,7 +146,7 @@ main(void)
146 mesh2 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 146 mesh2 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
147 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 147 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
148 148
149 efl_file_set(mesh, input_model_path, NULL); 149 efl_file_simple_load(mesh, input_model_path, NULL);
150 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 150 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
151 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 151 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
152 152
@@ -165,7 +165,7 @@ main(void)
165 165
166 efl_file_save(mesh, output_model_path, NULL, NULL); 166 efl_file_save(mesh, output_model_path, NULL, NULL);
167 167
168 efl_file_set(mesh2, output_model_path, NULL); 168 efl_file_simple_load(mesh2, output_model_path, NULL);
169 evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG); 169 evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG);
170 170
171 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); 171 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 02f5bba..6e765bd 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -352,7 +352,7 @@ _mesh_setup_model(Scene_Data *data)
352 data->material_model = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 352 data->material_model = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
353 data->texture_model = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 353 data->texture_model = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
354 354
355 efl_file_set(data->texture_model, texture_path, NULL); 355 efl_file_simple_load(data->texture_model, texture_path, NULL);
356 evas_canvas3d_texture_filter_set(data->texture_model, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 356 evas_canvas3d_texture_filter_set(data->texture_model, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
357 evas_canvas3d_texture_wrap_set(data->texture_model, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 357 evas_canvas3d_texture_wrap_set(data->texture_model, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
358 358
@@ -367,7 +367,7 @@ _mesh_setup_model(Scene_Data *data)
367 evas_canvas3d_material_texture_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_model); 367 evas_canvas3d_material_texture_set(data->material_model, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_model);
368 evas_canvas3d_material_shininess_set(data->material_model, 100.0); 368 evas_canvas3d_material_shininess_set(data->material_model, 100.0);
369 369
370 efl_file_set(data->mesh_model, mesh_path, NULL); 370 efl_file_simple_load(data->mesh_model, mesh_path, NULL);
371 evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model); 371 evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model);
372 evas_canvas3d_mesh_shader_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); 372 evas_canvas3d_mesh_shader_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
373} 373}
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index 0e13705..e82f31b 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -87,7 +87,7 @@ int rr;
87 87
88#define MODEL_MESH_INIT(name, model, shade) \ 88#define MODEL_MESH_INIT(name, model, shade) \
89 data->mesh_##name = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ 89 data->mesh_##name = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
90 efl_file_set(data->mesh_##name, model, NULL); \ 90 efl_file_simple_load(data->mesh_##name, model, NULL); \
91 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ 91 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
92 evas_canvas3d_mesh_shader_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADER_MODE_##shade); \ 92 evas_canvas3d_mesh_shader_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADER_MODE_##shade); \
93 evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material); 93 evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material);
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index adfb696..f97c183 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -124,12 +124,12 @@ main(void)
124 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 124 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
125 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 125 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
126 126
127 efl_file_set(mesh, model_path, NULL); 127 efl_file_simple_load(mesh, model_path, NULL);
128 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 128 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
129 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 129 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
130 130
131 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 131 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
132 efl_file_set(texture, image_path, NULL); 132 efl_file_simple_load(texture, image_path, NULL);
133 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 133 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
134 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 134 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
135 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); 135 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 3605555..149217d 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -33,7 +33,7 @@
33 snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \ 33 snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \
34 extention##_file = eina_file_open(buffer , 0); \ 34 extention##_file = eina_file_open(buffer , 0); \
35 mesh_##extention = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ 35 mesh_##extention = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
36 efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \ 36 efl_file_simple_mmap_load(mesh_##extention, extention##_file, NULL); \
37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \ 37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
38 evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \ 38 evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \
39 node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 39 node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 65f57ec..91126fb 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -47,7 +47,7 @@
47#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \ 47#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \
48 mesh[num] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ 48 mesh[num] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
49 snprintf(full_file_path, sizeof(full_file_path), "%s.obj", path); \ 49 snprintf(full_file_path, sizeof(full_file_path), "%s.obj", path); \
50 efl_file_set(mesh[num], full_file_path, NULL); \ 50 efl_file_simple_load(mesh[num], full_file_path, NULL); \
51 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \ 51 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
52 evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \ 52 evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \
53 mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 53 mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
@@ -65,7 +65,7 @@
65 65
66#define ADD_TEXTURE(name, path) \ 66#define ADD_TEXTURE(name, path) \
67 name = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ 67 name = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
68 efl_file_set(name, path, NULL); \ 68 efl_file_simple_load(name, path, NULL); \
69 evas_canvas3d_texture_filter_set(name, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ 69 evas_canvas3d_texture_filter_set(name, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
70 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ 70 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \
71 evas_canvas3d_texture_wrap_set(name, EVAS_CANVAS3D_WRAP_MODE_REPEAT, \ 71 evas_canvas3d_texture_wrap_set(name, EVAS_CANVAS3D_WRAP_MODE_REPEAT, \
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 83188c0..1d2cc75 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -138,9 +138,9 @@ _mesh_setup(Scene_Data *data)
138 138
139 data->texture_rocks = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 139 data->texture_rocks = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
140 data->texture_rocks_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 140 data->texture_rocks_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
141 efl_file_set(data->texture_rocks, rock_diffuse, NULL); 141 efl_file_simple_load(data->texture_rocks, rock_diffuse, NULL);
142 evas_canvas3d_texture_wrap_set(data->texture_rocks, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 142 evas_canvas3d_texture_wrap_set(data->texture_rocks, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
143 efl_file_set(data->texture_rocks_n, rock_n_and_height_map, NULL); 143 efl_file_simple_load(data->texture_rocks_n, rock_n_and_height_map, NULL);
144 evas_canvas3d_texture_wrap_set(data->texture_rocks_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 144 evas_canvas3d_texture_wrap_set(data->texture_rocks_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
145 145
146 evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_rocks_n); 146 evas_canvas3d_material_texture_set(data->material_rocks, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_rocks_n);
@@ -160,9 +160,9 @@ _mesh_setup(Scene_Data *data)
160 160
161 data->texture_wood = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 161 data->texture_wood = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
162 data->texture_four_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 162 data->texture_four_n = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
163 efl_file_set(data->texture_wood, wood_diffuse, NULL); 163 efl_file_simple_load(data->texture_wood, wood_diffuse, NULL);
164 evas_canvas3d_texture_wrap_set(data->texture_wood, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 164 evas_canvas3d_texture_wrap_set(data->texture_wood, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
165 efl_file_set(data->texture_four_n, wood_n_and_height_map, NULL); 165 efl_file_simple_load(data->texture_four_n, wood_n_and_height_map, NULL);
166 evas_canvas3d_texture_wrap_set(data->texture_four_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 166 evas_canvas3d_texture_wrap_set(data->texture_four_n, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
167 167
168 evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_four_n); 168 evas_canvas3d_material_texture_set(data->material_wood, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_four_n);
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 1e2f3d6..20230d0 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -143,7 +143,7 @@ main(void)
143 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 143 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
144 144
145 texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 145 texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
146 efl_file_set(texture_diffuse, image_path, NULL); 146 efl_file_simple_load(texture_diffuse, image_path, NULL);
147 evas_canvas3d_texture_filter_set(texture_diffuse, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR); 147 evas_canvas3d_texture_filter_set(texture_diffuse, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
148 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse); 148 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse);
149 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 149 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 821195b..7769a45 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -159,7 +159,7 @@ main(void)
159 159
160 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 160 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
161 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 161 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
162 efl_file_set(texture, image_path, NULL); 162 efl_file_simple_load(texture, image_path, NULL);
163 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 163 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
164 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 164 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
165 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture); 165 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
@@ -182,7 +182,7 @@ main(void)
182 mesh[i] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 182 mesh[i] = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
183 183
184 snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]); 184 snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]);
185 efl_file_set(mesh[i], buffer, NULL); 185 efl_file_simple_load(mesh[i], buffer, NULL);
186 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); 186 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
187 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]); 187 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
188 188
@@ -191,7 +191,7 @@ main(void)
191 191
192 if (i > 15) 192 if (i > 15)
193 { 193 {
194 efl_file_set(mesh[i], buffer, NULL); 194 efl_file_simple_load(mesh[i], buffer, NULL);
195 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); 195 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
196 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]); 196 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
197 } 197 }
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index ae06a36..1673318 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -262,12 +262,12 @@ _fence_setup(Body_3D *fence)
262 262
263 Eo *texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 263 Eo *texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
264 evas_canvas3d_texture_atlas_enable_set(texture, EINA_FALSE); 264 evas_canvas3d_texture_atlas_enable_set(texture, EINA_FALSE);
265 efl_file_set(texture, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL); 265 efl_file_simple_load(texture, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL);
266 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 266 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
267 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 267 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
268 Eo *texture1 = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 268 Eo *texture1 = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
269 evas_canvas3d_texture_atlas_enable_set(texture1, EINA_FALSE); 269 evas_canvas3d_texture_atlas_enable_set(texture1, EINA_FALSE);
270 efl_file_set(texture1, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL); 270 efl_file_simple_load(texture1, PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL);
271 evas_canvas3d_texture_filter_set(texture1, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 271 evas_canvas3d_texture_filter_set(texture1, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
272 evas_canvas3d_texture_wrap_set(texture1, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 272 evas_canvas3d_texture_wrap_set(texture1, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
273 fence->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 273 fence->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
@@ -344,7 +344,7 @@ static void
344_model_setup(Body_3D *model) 344_model_setup(Body_3D *model)
345{ 345{
346 model->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 346 model->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
347 efl_file_set(model->texture, image_path, NULL); 347 efl_file_simple_load(model->texture, image_path, NULL);
348 evas_canvas3d_texture_filter_set(model->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 348 evas_canvas3d_texture_filter_set(model->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
349 evas_canvas3d_texture_wrap_set(model->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 349 evas_canvas3d_texture_wrap_set(model->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
350 model->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 350 model->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
@@ -358,7 +358,7 @@ _model_setup(Body_3D *model)
358 358
359 359
360 model->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 360 model->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
361 efl_file_set(model->mesh, model_path, NULL); 361 efl_file_simple_load(model->mesh, model_path, NULL);
362 evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material); 362 evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material);
363 evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 363 evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
364 364
@@ -373,7 +373,7 @@ static void
373_billboard_setup(Scene_Data *data) 373_billboard_setup(Scene_Data *data)
374{ 374{
375 data->billboard.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 375 data->billboard.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
376 efl_file_set(data->billboard.texture, b_image_path, NULL); 376 efl_file_simple_load(data->billboard.texture, b_image_path, NULL);
377 evas_canvas3d_texture_filter_set(data->billboard.texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 377 evas_canvas3d_texture_filter_set(data->billboard.texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
378 evas_canvas3d_texture_wrap_set(data->billboard.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 378 evas_canvas3d_texture_wrap_set(data->billboard.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
379 379
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index d7672a4..92e3b1a 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -179,14 +179,14 @@ _mesh_setup(Scene_Data *data)
179 Eo *mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 179 Eo *mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
180 Eina_Stringshare *str = eina_stringshare_printf("%s%d%s", model_path, 180 Eina_Stringshare *str = eina_stringshare_printf("%s%d%s", model_path,
181 i, ".obj"); 181 i, ".obj");
182 efl_file_set(mesh, str, NULL); 182 efl_file_simple_load(mesh, str, NULL);
183 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material); 183 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
184 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 184 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
185 evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]); 185 evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]);
186 evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh); 186 evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh);
187 187
188 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 188 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
189 efl_file_set(mesh, str, NULL); 189 efl_file_simple_load(mesh, str, NULL);
190 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material); 190 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
191 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 191 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
192 evas_canvas3d_mesh_lod_boundary_set(mesh, m_distances[i], m_distances[i + 1]); 192 evas_canvas3d_mesh_lod_boundary_set(mesh, m_distances[i], m_distances[i + 1]);
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 551d287..4d4c37f 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -122,15 +122,15 @@ _on_keydown(void *data EINA_UNUSED,
122 printf("Toggling clipping "); 122 printf("Toggling clipping ");
123 123
124 Evas_Object *clip = NULL; 124 Evas_Object *clip = NULL;
125 clip = efl_canvas_object_clip_get(d.img); 125 clip = efl_canvas_object_clipper_get(d.img);
126 if (clip == d.clipper) 126 if (clip == d.clipper)
127 { 127 {
128 efl_canvas_object_clip_set(d.img, NULL); 128 efl_canvas_object_clipper_set(d.img, NULL);
129 printf("off\n"); 129 printf("off\n");
130 } 130 }
131 else 131 else
132 { 132 {
133 efl_canvas_object_clip_set(d.img, d.clipper); 133 efl_canvas_object_clipper_set(d.img, d.clipper);
134 printf("on\n"); 134 printf("on\n");
135 } 135 }
136 return; 136 return;
@@ -193,8 +193,9 @@ main(void)
193 * So it's possible to decrement refcount, and 'image' object 193 * So it's possible to decrement refcount, and 'image' object
194 * will be deleted automatically by parent.*/ 194 * will be deleted automatically by parent.*/
195 195
196 efl_file_set(d.img, img_path, NULL); 196 if (efl_file_set(d.img, img_path)) goto panic;
197 err = efl_file_load_error_get(d.img); 197
198 err = efl_file_load(d.img);
198 199
199 if (err != EVAS_LOAD_ERROR_NONE) 200 if (err != EVAS_LOAD_ERROR_NONE)
200 { 201 {
@@ -211,8 +212,8 @@ main(void)
211 212
212 /* border on the image's clipper, here just to emphasize its position */ 213 /* border on the image's clipper, here just to emphasize its position */
213 d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas); 214 d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
214 efl_file_set(d.clipper_border, border_img_path, NULL); 215 if (efl_file_set(d.clipper_border, border_img_path)) goto panic;
215 err = efl_file_load_error_get(d.clipper_border); 216 err = efl_file_load(d.clipper_border);
216 217
217 if (err != EVAS_LOAD_ERROR_NONE) 218 if (err != EVAS_LOAD_ERROR_NONE)
218 { 219 {
@@ -236,7 +237,7 @@ main(void)
236 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); 237 efl_gfx_entity_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2));
237 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE); 238 efl_gfx_entity_visible_set(d.clipper, EINA_TRUE);
238 239
239 efl_canvas_object_clip_set(d.img, d.clipper); 240 efl_canvas_object_clipper_set(d.img, d.clipper);
240 241
241 printf("%s", commands); 242 printf("%s", commands);
242 243
diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index 650709f..da9176c 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -133,7 +133,7 @@ main(void)
133 for (i = 0; i < sizeof (batmans_path) / sizeof (batmans_path[0]); i++) 133 for (i = 0; i < sizeof (batmans_path) / sizeof (batmans_path[0]); i++)
134 { 134 {
135 batmans_vg[i] = evas_vg_shape_add(vg); 135 batmans_vg[i] = evas_vg_shape_add(vg);
136 evas_vg_node_origin_set(batmans_vg[i], 100, 150); 136 efl_canvas_vg_node_origin_set(batmans_vg[i], 100, 150);
137 137
138 if(i % 2) 138 if(i % 2)
139 { 139 {
@@ -162,7 +162,7 @@ main(void)
162 Eina_Matrix3 matrix; 162 Eina_Matrix3 matrix;
163 eina_matrix3_identity(&matrix); 163 eina_matrix3_identity(&matrix);
164 eina_matrix3_scale(&matrix, 1.1, 1.1); 164 eina_matrix3_scale(&matrix, 1.1, 1.1);
165 evas_vg_node_transformation_set(root, &matrix); 165 efl_canvas_vg_node_transformation_set(root, &matrix);
166 166
167 circle = evas_vg_shape_add(root); 167 circle = evas_vg_shape_add(root);
168 evas_vg_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200); 168 evas_vg_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200);
@@ -172,7 +172,7 @@ main(void)
172 172
173 batman = evas_vg_shape_add(root); 173 batman = evas_vg_shape_add(root);
174 evas_vg_node_color_set(batman, 0, 0, 0, 255); 174 evas_vg_node_color_set(batman, 0, 0, 0, 255);
175 evas_vg_node_origin_set(batman, 100, 150); 175 efl_canvas_vg_node_origin_set(batman, 100, 150);
176 evas_vg_shape_append_move_to(batman, 256, 213); 176 evas_vg_shape_append_move_to(batman, 256, 213);
177 evas_vg_shape_dup(batman, batmans_vg[0]); 177 evas_vg_shape_dup(batman, batmans_vg[0]);
178 178
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 36b8baa..47889ae 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -152,15 +152,15 @@ _added_transformation(Efl_VG *shape, Eina_Matrix3 *m)
152 Eina_Matrix3 new_m; 152 Eina_Matrix3 new_m;
153 const Eina_Matrix3 *old_m; 153 const Eina_Matrix3 *old_m;
154 154
155 old_m = evas_vg_node_transformation_get(shape); 155 old_m = efl_canvas_vg_node_transformation_get(shape);
156 if (old_m) 156 if (old_m)
157 { 157 {
158 eina_matrix3_compose(m, old_m, &new_m); 158 eina_matrix3_compose(m, old_m, &new_m);
159 evas_vg_node_transformation_set(shape, &new_m); 159 efl_canvas_vg_node_transformation_set(shape, &new_m);
160 } 160 }
161 else 161 else
162 { 162 {
163 evas_vg_node_transformation_set(shape, m); 163 efl_canvas_vg_node_transformation_set(shape, m);
164 } 164 }
165} 165}
166 166
@@ -317,7 +317,7 @@ _1_basic_shape_test()
317 evas_vg_shape_append_line_to(shape, 100, 0); 317 evas_vg_shape_append_line_to(shape, 100, 0);
318 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255); 318 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
319 evas_vg_shape_stroke_width_set(shape, 5); 319 evas_vg_shape_stroke_width_set(shape, 5);
320 evas_vg_node_origin_set(shape, 50, 50); 320 efl_canvas_vg_node_origin_set(shape, 50, 50);
321 evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND); 321 evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND);
322 d.shape_list = eina_list_append(d.shape_list, shape); 322 d.shape_list = eina_list_append(d.shape_list, shape);
323 323
@@ -325,7 +325,7 @@ _1_basic_shape_test()
325 evas_vg_shape_dup(new_shape, shape); 325 evas_vg_shape_dup(new_shape, shape);
326 evas_vg_shape_stroke_color_set(new_shape, 0, 100, 0, 100); 326 evas_vg_shape_stroke_color_set(new_shape, 0, 100, 0, 100);
327 evas_vg_shape_append_line_to(new_shape, 100, 50); 327 evas_vg_shape_append_line_to(new_shape, 100, 50);
328 evas_vg_node_origin_set(new_shape, 200, 50); 328 efl_canvas_vg_node_origin_set(new_shape, 200, 50);
329 evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_SQUARE); 329 evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_SQUARE);
330 d.shape_list = eina_list_append(d.shape_list, new_shape); 330 d.shape_list = eina_list_append(d.shape_list, new_shape);
331 331
@@ -333,7 +333,7 @@ _1_basic_shape_test()
333 evas_vg_shape_dup(new_shape, shape); 333 evas_vg_shape_dup(new_shape, shape);
334 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 255, 255); 334 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 255, 255);
335 evas_vg_shape_append_line_to(new_shape, 50, 50); 335 evas_vg_shape_append_line_to(new_shape, 50, 50);
336 evas_vg_node_origin_set(new_shape, 350, 50); 336 efl_canvas_vg_node_origin_set(new_shape, 350, 50);
337 evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_ROUND); 337 evas_vg_shape_stroke_cap_set(new_shape, EFL_GFX_CAP_ROUND);
338 evas_vg_shape_stroke_join_set(new_shape, EFL_GFX_JOIN_ROUND); 338 evas_vg_shape_stroke_join_set(new_shape, EFL_GFX_JOIN_ROUND);
339 d.shape_list = eina_list_append(d.shape_list, new_shape); 339 d.shape_list = eina_list_append(d.shape_list, new_shape);
@@ -343,21 +343,21 @@ _1_basic_shape_test()
343 evas_vg_shape_append_rect(shape, 0, 0, 100 , 100, 10, 10); 343 evas_vg_shape_append_rect(shape, 0, 0, 100 , 100, 10, 10);
344 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255); 344 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
345 evas_vg_shape_stroke_width_set(shape, 5); 345 evas_vg_shape_stroke_width_set(shape, 5);
346 evas_vg_node_origin_set(shape, 50, 150); 346 efl_canvas_vg_node_origin_set(shape, 50, 150);
347 d.shape_list = eina_list_append(d.shape_list, shape); 347 d.shape_list = eina_list_append(d.shape_list, shape);
348 348
349 new_shape = evas_vg_shape_add(container); 349 new_shape = evas_vg_shape_add(container);
350 evas_vg_shape_dup(new_shape, shape); 350 evas_vg_shape_dup(new_shape, shape);
351 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0); 351 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
352 evas_vg_node_color_set(new_shape, 0, 0, 100, 100); 352 evas_vg_node_color_set(new_shape, 0, 0, 100, 100);
353 evas_vg_node_origin_set(new_shape, 200, 150); 353 efl_canvas_vg_node_origin_set(new_shape, 200, 150);
354 d.shape_list = eina_list_append(d.shape_list, new_shape); 354 d.shape_list = eina_list_append(d.shape_list, new_shape);
355 355
356 new_shape = evas_vg_shape_add(container); 356 new_shape = evas_vg_shape_add(container);
357 evas_vg_shape_dup(new_shape, shape); 357 evas_vg_shape_dup(new_shape, shape);
358 evas_vg_shape_stroke_color_set(new_shape, 100, 0, 0, 100); 358 evas_vg_shape_stroke_color_set(new_shape, 100, 0, 0, 100);
359 evas_vg_node_color_set(new_shape, 0, 100, 100, 100); 359 evas_vg_node_color_set(new_shape, 0, 100, 100, 100);
360 evas_vg_node_origin_set(new_shape, 350, 150); 360 efl_canvas_vg_node_origin_set(new_shape, 350, 150);
361 d.shape_list = eina_list_append(d.shape_list, new_shape); 361 d.shape_list = eina_list_append(d.shape_list, new_shape);
362 362
363 // Circle 363 // Circle
@@ -365,21 +365,21 @@ _1_basic_shape_test()
365 evas_vg_shape_append_circle(shape, 50, 50, 50); 365 evas_vg_shape_append_circle(shape, 50, 50, 50);
366 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255); 366 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
367 evas_vg_shape_stroke_width_set(shape, 5); 367 evas_vg_shape_stroke_width_set(shape, 5);
368 evas_vg_node_origin_set(shape, 50, 300); 368 efl_canvas_vg_node_origin_set(shape, 50, 300);
369 d.shape_list = eina_list_append(d.shape_list, shape); 369 d.shape_list = eina_list_append(d.shape_list, shape);
370 370
371 new_shape = evas_vg_shape_add(container); 371 new_shape = evas_vg_shape_add(container);
372 evas_vg_shape_dup(new_shape, shape); 372 evas_vg_shape_dup(new_shape, shape);
373 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0); 373 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
374 evas_vg_node_color_set(new_shape, 0, 0, 255, 255); 374 evas_vg_node_color_set(new_shape, 0, 0, 255, 255);
375 evas_vg_node_origin_set(new_shape, 200, 300); 375 efl_canvas_vg_node_origin_set(new_shape, 200, 300);
376 d.shape_list = eina_list_append(d.shape_list, new_shape); 376 d.shape_list = eina_list_append(d.shape_list, new_shape);
377 377
378 new_shape = evas_vg_shape_add(container); 378 new_shape = evas_vg_shape_add(container);
379 evas_vg_shape_dup(new_shape, shape); 379 evas_vg_shape_dup(new_shape, shape);
380 evas_vg_shape_stroke_color_set(new_shape, 150, 0, 0, 150); 380 evas_vg_shape_stroke_color_set(new_shape, 150, 0, 0, 150);
381 evas_vg_node_color_set(new_shape, 0, 0, 200, 200); 381 evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
382 evas_vg_node_origin_set(new_shape, 350, 300); 382 efl_canvas_vg_node_origin_set(new_shape, 350, 300);
383 d.shape_list = eina_list_append(d.shape_list, new_shape); 383 d.shape_list = eina_list_append(d.shape_list, new_shape);
384 384
385 // Arc 385 // Arc
@@ -389,14 +389,14 @@ _1_basic_shape_test()
389 evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND); 389 evas_vg_shape_stroke_cap_set(shape, EFL_GFX_CAP_ROUND);
390 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255); 390 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
391 evas_vg_shape_stroke_width_set(shape, 5); 391 evas_vg_shape_stroke_width_set(shape, 5);
392 evas_vg_node_origin_set(shape, 50, 450); 392 efl_canvas_vg_node_origin_set(shape, 50, 450);
393 d.shape_list = eina_list_append(d.shape_list, shape); 393 d.shape_list = eina_list_append(d.shape_list, shape);
394 394
395 new_shape = evas_vg_shape_add(container); 395 new_shape = evas_vg_shape_add(container);
396 evas_vg_shape_append_arc(new_shape, 0, 0, 100, 100, 90, 200); 396 evas_vg_shape_append_arc(new_shape, 0, 0, 100, 100, 90, 200);
397 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0); 397 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
398 evas_vg_node_color_set(new_shape, 0, 0, 200, 200); 398 evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
399 evas_vg_node_origin_set(new_shape, 200, 450); 399 efl_canvas_vg_node_origin_set(new_shape, 200, 450);
400 d.shape_list = eina_list_append(d.shape_list, new_shape); 400 d.shape_list = eina_list_append(d.shape_list, new_shape);
401 401
402 new_shape = evas_vg_shape_add(container); 402 new_shape = evas_vg_shape_add(container);
@@ -404,7 +404,7 @@ _1_basic_shape_test()
404 evas_vg_shape_append_line_to(new_shape, 50, 50); 404 evas_vg_shape_append_line_to(new_shape, 50, 50);
405 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0); 405 evas_vg_shape_stroke_color_set(new_shape, 0, 0, 0, 0);
406 evas_vg_node_color_set(new_shape, 0, 0, 200, 200); 406 evas_vg_node_color_set(new_shape, 0, 0, 200, 200);
407 evas_vg_node_origin_set(new_shape, 350, 450); 407 efl_canvas_vg_node_origin_set(new_shape, 350, 450);
408 d.shape_list = eina_list_append(d.shape_list, new_shape); 408 d.shape_list = eina_list_append(d.shape_list, new_shape);
409 409
410 evas_object_vg_root_node_set(d.vg, container); 410 evas_object_vg_root_node_set(d.vg, container);
@@ -480,18 +480,18 @@ _2_interpolation_test()
480 evas_vg_shape_append_svg_path(shape, morph1[0]); 480 evas_vg_shape_append_svg_path(shape, morph1[0]);
481 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255); 481 evas_vg_shape_stroke_color_set(shape, 255, 0, 0, 255);
482 evas_vg_shape_stroke_width_set(shape, 5); 482 evas_vg_shape_stroke_width_set(shape, 5);
483 evas_vg_node_origin_set(shape, 100, 100); 483 efl_canvas_vg_node_origin_set(shape, 100, 100);
484 d.shape_list = eina_list_append(d.shape_list, shape); 484 d.shape_list = eina_list_append(d.shape_list, shape);
485 485
486 shape = evas_vg_shape_add(d.vg); 486 shape = evas_vg_shape_add(d.vg);
487 evas_vg_shape_append_svg_path(shape, morph1[1]); 487 evas_vg_shape_append_svg_path(shape, morph1[1]);
488 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 255); 488 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 255);
489 evas_vg_shape_stroke_width_set(shape, 10); 489 evas_vg_shape_stroke_width_set(shape, 10);
490 evas_vg_node_origin_set(shape, 150, 150); 490 efl_canvas_vg_node_origin_set(shape, 150, 150);
491 d.shape_list = eina_list_append(d.shape_list, shape); 491 d.shape_list = eina_list_append(d.shape_list, shape);
492 492
493 shape = evas_vg_shape_add(d.vg); 493 shape = evas_vg_shape_add(d.vg);
494 evas_vg_node_origin_set(shape, 150, 150); 494 efl_canvas_vg_node_origin_set(shape, 150, 150);
495 d.shape_list = eina_list_append(d.shape_list, shape); 495 d.shape_list = eina_list_append(d.shape_list, shape);
496 496
497 evas_object_vg_root_node_set(d.vg, shape); 497 evas_object_vg_root_node_set(d.vg, shape);
@@ -522,7 +522,7 @@ _main_menu()
522 shape = evas_vg_shape_add(d.vg); 522 shape = evas_vg_shape_add(d.vg);
523 evas_vg_shape_append_svg_path(shape, batman); 523 evas_vg_shape_append_svg_path(shape, batman);
524 evas_vg_node_color_set(shape, 10, 0, 0, 10); 524 evas_vg_node_color_set(shape, 10, 0, 0, 10);
525 evas_vg_node_origin_set(shape, 0, 100); 525 efl_canvas_vg_node_origin_set(shape, 0, 100);
526 526
527 evas_object_vg_root_node_set(d.vg, shape); 527 evas_object_vg_root_node_set(d.vg, shape);
528 528
diff --git a/src/examples/evas/evas_cxx_rectangle.cc b/src/examples/evas/evas_cxx_rectangle.cc
index 464bed9..7966d62 100644
--- a/src/examples/evas/evas_cxx_rectangle.cc
+++ b/src/examples/evas/evas_cxx_rectangle.cc
@@ -14,8 +14,8 @@
14#include <Eina.hh> 14#include <Eina.hh>
15#include <Eo.hh> 15#include <Eo.hh>
16 16
17#include "canvas/evas_canvas.eo.hh" 17#include "canvas/evas_canvas_eo.hh"
18#include "canvas/evas_image.eo.hh" 18#include "canvas/evas_image_eo.hh"
19#include "canvas/evas_rectangle.eo.hh" 19#include "canvas/evas_rectangle.eo.hh"
20 20
21#define WIDTH (320) 21#define WIDTH (320)
diff --git a/src/examples/evas/evas_mono_box.cs b/src/examples/evas/evas_mono_box.cs
deleted file mode 100644
index dbfd15e..0000000
--- a/src/examples/evas/evas_mono_box.cs
+++ /dev/null
@@ -1,73 +0,0 @@
1using System;
2using System.Runtime.InteropServices;
3using System.Runtime.CompilerServices;
4
5public class MyBox : Evas.Box
6{
7 public MyBox(Efl.Object parent) : base(parent) {}
8
9 [DllImport("evas")] static extern void evas_obj_box_layout_vertical(IntPtr obj, IntPtr data, IntPtr privdata);
10 [DllImport("evas")] static extern void evas_obj_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata);
11 [DllImport("evas")] static extern void evas_object_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata);
12 [DllImport("evas")] static extern IntPtr evas_object_evas_get(IntPtr obj);
13 [DllImport("evas")] static extern void evas_event_freeze(IntPtr obj);
14 [DllImport("evas")] static extern void evas_event_thaw(IntPtr obj);
15
16 override public void CalculateGroup()
17 {
18 IntPtr evas = evas_object_evas_get(NativeHandle);
19 evas_event_freeze(evas);
20 Console.WriteLine("called group_calculate");
21 /* layouting_set(true); */
22 evas_obj_box_layout_vertical(NativeHandle, IntPtr.Zero, IntPtr.Zero);
23 /* layouting_set(false); */
24 /* children_changed_set(false); */
25 evas_event_thaw(evas);
26 }
27}
28
29class TestMain
30{
31 static void Main(string[] args)
32 {
33 Efl.All.Init();
34
35 Efl.Loop loop = new Efl.Loop();
36
37
38 EcoreEvas ecore_evas = new EcoreEvas();
39
40 Efl.Canvas.Object canvas = ecore_evas.canvas;
41 canvas.SetVisible(true);
42
43 Efl.Object parent = canvas.GetParent();
44 System.Diagnostics.Debug.Assert(parent.NativeHandle != IntPtr.Zero);
45
46 Evas.Box box = new MyBox(canvas);
47 Eina.Size2D size = new Eina.Size2D();
48
49 size.W = 320;
50 size.H = 240;
51
52 box.SetSize(size);
53 box.SetVisible(true);
54
55 Efl.Canvas.Rectangle rect = new Efl.Canvas.Rectangle(canvas);
56 rect.SetColor(0, 0, 255, 255);
57 size.W = 320;
58 size.H = 120;
59 rect.SetSize(size);
60 rect.SetVisible(true);
61 box.Append(rect);
62
63 Efl.Canvas.Rectangle rect2 = new Efl.Canvas.Rectangle(canvas);
64 rect2.SetColor(0, 255, 0, 255);
65 rect2.SetSize(size);
66 rect2.SetVisible(true);
67 box.Append(rect2);
68
69 loop.Begin();
70
71 Efl.All.Shutdown();
72 }
73}
diff --git a/src/examples/evas/evas_mono_image.cs b/src/examples/evas/evas_mono_image.cs
deleted file mode 100644
index 865aa42..0000000
--- a/src/examples/evas/evas_mono_image.cs
+++ /dev/null
@@ -1,93 +0,0 @@
1using System;
2using System.Runtime.CompilerServices;
3
4class TestMain
5{
6 static int WIDTH = 320;
7 static int HEIGHT = 240;
8
9 Evas.Image image;
10
11
12 static string ImagePath([CallerFilePath] string folder="")
13 {
14 return System.IO.Path.GetDirectoryName(folder);
15 }
16
17 public TestMain(Evas.Image image)
18 {
19 this.image = image;
20 }
21
22 static void Main(string[] args)
23 {
24 Efl.All.Init();
25
26 Efl.Loop loop = new Efl.Loop();
27
28 EcoreEvas ecore_evas = new EcoreEvas();
29 Eina.Size2D size = new Eina.Size2D();
30
31 Efl.Canvas.Object canvas = ecore_evas.canvas;
32 canvas.SetVisible(true);
33
34 Efl.Object parent = canvas.GetParent();
35 System.Diagnostics.Debug.Assert(parent.NativeHandle != IntPtr.Zero);
36
37 Efl.Canvas.Rectangle bg = new Efl.Canvas.Rectangle(canvas);
38 bg.SetColor(255, 255, 255, 255);
39 size.W = WIDTH;
40 size.H = HEIGHT;
41 bg.SetSize(size);
42 bg.SetVisible(true);
43
44 string valid_path = args[0];
45 Evas.Image image = new Evas.Image(canvas);
46 image.SetFile(valid_path, null);
47
48 /* FIXME evas-image uses error handling code from
49 * evas_object_image_load_error_get, which seems to be not available
50 * Efl.image.load.State state = image.load_error_get(); */
51
52 // FIXME missing move
53 Eina.Rect rect = new Eina.Rect();
54
55 rect.X = 0;
56 rect.Y = 0;
57 rect.W = WIDTH / 2;
58 rect.H = HEIGHT / 2;
59 image.SetFill(rect);
60
61 size.W = WIDTH / 2;
62 size.H = HEIGHT / 2;
63 image.SetSize(size);
64 image.SetVisible(true);
65
66 rect = image.GetFill();
67 rect.Y -= 50;
68 rect.W += 100;
69 image.SetFill(rect);
70
71 TestMain listener = new TestMain(image);
72
73 // TODO handle key events in order to alter the image like the C
74 // example. Meanwhile, just set some w fill
75 /* EventListener callback = new EventListener(); */
76
77 /* bg.key_focus_set(true); */
78 /* bg.event_callback_priority_add(Evas.Callback_Type.Key_down, */
79 /* Efl.Callback_Priority.Default, */
80 /* callback, null); */
81
82 loop.Begin();
83
84 Efl.All.Shutdown();
85 }
86
87 public void on_key_down(object sender, EventArgs e)
88 {
89 Console.WriteLine("on_key_down called");
90 }
91}
92
93
diff --git a/src/examples/evas/evas_mono_image2.cs b/src/examples/evas/evas_mono_image2.cs
deleted file mode 100644
index 0ad8fb0..0000000
--- a/src/examples/evas/evas_mono_image2.cs
+++ /dev/null
@@ -1,83 +0,0 @@
1using System;
2using System.Runtime.InteropServices;
3using System.Runtime.CompilerServices;
4
5class TestMain
6{
7 static int WIDTH = 320;
8 static int HEIGHT = 240;
9
10
11 static void Main(string[] args)
12 {
13 Efl.All.Init();
14
15 Efl.Loop loop = new Efl.Loop();
16
17 EcoreEvas ecore_evas = new EcoreEvas();
18
19 Eina.Size2D size = new Eina.Size2D();
20 Eina.Position2D pos = new Eina.Position2D();
21
22 Efl.Canvas.Object canvas = ecore_evas.canvas;
23 canvas.SetVisible(true);
24
25 Efl.Canvas.Rectangle bg = new Efl.Canvas.Rectangle(canvas);
26 bg.SetColor(255, 255, 255, 255);
27 pos.X = 0;
28 pos.Y = 0;
29 bg.SetPosition(pos);
30 size.W = WIDTH;
31 size.H = HEIGHT;
32 bg.SetSize(size);
33 bg.SetVisible(true);
34
35 string path = args[0];
36 Evas.Image logo = new Evas.Image(canvas);
37 logo.SetFillAuto(true);
38
39 // TODO add preloaded support (depends on events)
40
41 logo.SetFile(path, null);
42 size.W = WIDTH / 2;
43 size.H = HEIGHT / 2;
44 logo.SetSize(size);
45
46 // TODO add a bunch of key/mouse handlers
47
48 logo.SetVisible(true);
49
50 int[] pixels = new int[(WIDTH/4) * (HEIGHT / 4)];
51 System.Random generator = new System.Random();
52 for (int i = 0; i < pixels.Length; i++) {
53 pixels[i] = generator.Next();
54 }
55
56 Evas.Image noise_img = new Evas.Image(canvas);
57 size.W = WIDTH / 4;
58 size.H = HEIGHT / 4;
59 noise_img.SetSize(size);
60 // FIXME Add a way to set the pixels.
61 // noise_img.data_set(pixels);
62 noise_img.SetFillAuto(true);
63 pos.X = WIDTH * 5 / 8;
64 pos.Y = HEIGHT / 8;
65 noise_img.SetPosition(pos);
66 noise_img.SetVisible(true);
67 Console.WriteLine("Creating noise image with sizez %d, %d", WIDTH/4, HEIGHT/4);
68
69 Efl.Canvas.Proxy proxy_img = new Efl.Canvas.Proxy(canvas);
70 proxy_img.SetSource(noise_img);
71 pos.X = WIDTH / 2;
72 pos.Y = HEIGHT / 2;
73 proxy_img.SetPosition(pos);
74 size.W = WIDTH / 2;
75 size.H = HEIGHT / 2;
76 proxy_img.SetSize(size);
77 proxy_img.SetVisible(true);
78
79 loop.Begin();
80 }
81}
82
83
diff --git a/src/examples/evas/evas_mono_rectangle.cs b/src/examples/evas/evas_mono_rectangle.cs
deleted file mode 100644
index 85afbd2..0000000
--- a/src/examples/evas/evas_mono_rectangle.cs
+++ /dev/null
@@ -1,47 +0,0 @@
1using System;
2
3class TestMain
4{
5 private static int[,] colors = new int[,] {
6 {255, 0, 0},
7 {0, 255, 0},
8 {0, 0, 255}
9 };
10
11 static void Main(string[] args)
12 {
13 int color_index = 0;
14
15 Efl.All.Init();
16
17 Efl.Loop loop = new Efl.Loop();
18 EcoreEvas ecore_evas = new EcoreEvas();
19 Efl.Canvas.Object canvas = ecore_evas.canvas;
20 canvas.SetVisible(true);
21
22 Efl.Object parent = canvas.GetParent();
23 System.Diagnostics.Debug.Assert(parent.NativeHandle != IntPtr.Zero);
24
25 Efl.Canvas.Rectangle rect = new Efl.Canvas.Rectangle(canvas);
26 rect.SetColor(colors[0, 0], colors[0, 1], colors[0, 2], 255);
27 Eina.Size2D size = new Eina.Size2D();
28 size.W = 640;
29 size.H = 480;
30 rect.SetSize(size);
31 rect.SetVisible(true);
32
33 canvas.KeyDownEvt += (object sender, Efl.Input.InterfaceKeyDownEvt_Args e) => {
34 color_index = (color_index + 1) % 3;
35 Console.WriteLine("Key Down");
36 Console.WriteLine("Got key obj at {0}", e.arg.NativeHandle.ToString("X"));
37 Console.WriteLine("Got key_get() == [{0}]", e.arg.GetKey());
38 rect.SetColor(colors[color_index, 0],
39 colors[color_index, 1],
40 colors[color_index, 2], 255);
41 };
42
43 loop.Begin();
44
45 Efl.All.Shutdown();
46 }
47}
diff --git a/src/examples/evas/evas_mono_table.cs b/src/examples/evas/evas_mono_table.cs
deleted file mode 100644
index 25c3d5e..0000000
--- a/src/examples/evas/evas_mono_table.cs
+++ /dev/null
@@ -1,77 +0,0 @@
1using System;
2using System.Runtime.InteropServices;
3using System.Runtime.CompilerServices;
4
5class TestMain
6{
7 static int WIDTH = 100;
8 static int HEIGHT = 150;
9
10 static void Main(string[] args)
11 {
12 Efl.All.Init();
13
14 Efl.Loop loop = new Efl.Loop();
15
16 EcoreEvas ecore_evas = new EcoreEvas();
17
18 Eina.Size2D size = new Eina.Size2D();
19 size.W = WIDTH;
20 size.H = HEIGHT;
21
22 Eina.Size2D hint = new Eina.Size2D();
23
24 Efl.Canvas.Object canvas = ecore_evas.canvas;
25 canvas.SetVisible(true);
26
27 Efl.Object parent = canvas.GetParent();
28 System.Diagnostics.Debug.Assert(parent.NativeHandle != IntPtr.Zero);
29
30 Efl.Canvas.Rectangle bg = new Efl.Canvas.Rectangle(canvas);
31 bg.SetColor(255, 255, 255, 255);
32 bg.SetSize(size);
33 bg.SetVisible(true);
34
35
36 Evas.Table table = new Evas.Table(canvas);
37 table.SetHomogeneous(Evas.ObjectTable.HomogeneousMode.None);
38 table.SetPadding(0, 0);
39 table.SetSize(size);
40 table.SetVisible(true);
41
42 Efl.Canvas.Rectangle rect = new Efl.Canvas.Rectangle(canvas);
43 rect.SetColor(255, 0, 0, 255);
44 hint.W = 100;
45 hint.H = 50;
46 rect.SetHintSizeMin(hint);
47 rect.SetVisible(true);
48 table.Pack(rect, 1, 1, 2, 1);
49
50 rect = new Efl.Canvas.Rectangle(canvas);
51 rect.SetColor(0, 255, 0, 255);
52 hint.W = 50;
53 hint.H = 100;
54 rect.SetHintSizeMin(hint);
55 rect.SetVisible(true);
56 table.Pack(rect, 1, 2, 1, 2);
57
58 rect = new Efl.Canvas.Rectangle(canvas);
59 rect.SetColor(0, 0, 255, 255);
60 hint.W = 50;
61 hint.H = 50;
62 rect.SetHintSizeMin(hint);
63 rect.SetVisible(true);
64 table.Pack(rect, 2, 2, 1, 1);
65
66 rect = new Efl.Canvas.Rectangle(canvas);
67 rect.SetColor(255, 255, 0, 255);
68 rect.SetHintSizeMin(hint);
69 rect.SetVisible(true);
70 table.Pack(rect, 2, 3, 1, 1);
71
72 loop.Begin();
73
74 Efl.All.Shutdown();
75 }
76}
77
diff --git a/src/examples/evas/evas_mono_text.cs b/src/examples/evas/evas_mono_text.cs
deleted file mode 100644
index 52b89f2..0000000
--- a/src/examples/evas/evas_mono_text.cs
+++ /dev/null
@@ -1,127 +0,0 @@
1using System;
2using System.Linq;
3using System.Collections.Generic;
4
5static class Extensions
6{
7 public static IEnumerable<T> Circle<T>(this IEnumerable<T> list, int index=0)
8 {
9 var count = list.Count();
10 index = index % count;
11
12 while (true) {
13 yield return list.ElementAt(index);
14 index = (index + 1) % count;
15 }
16 }
17}
18
19class TestMain
20{
21 static int WIDTH = 320;
22 static int HEIGHT = 240;
23
24 private EcoreEvas ecore_evas;
25 private Efl.Canvas.Object canvas;
26 private Efl.Canvas.Rectangle bg;
27 private Evas.Text text;
28 private Evas.Image border;
29
30 public TestMain(String border_file) {
31 ecore_evas = new EcoreEvas();
32 Eina.Size2D size = new Eina.Size2D();
33 Eina.Position2D position = new Eina.Position2D();
34 canvas = ecore_evas.canvas;
35 canvas.SetVisible(true);
36
37 bg = new Efl.Canvas.Rectangle(canvas);
38 bg.SetColor(255, 255, 255, 255);
39 position.X = 0;
40 position.Y = 0;
41 bg.SetPosition(position);
42 size.W = WIDTH;
43 size.H = HEIGHT;
44 bg.SetSize(size);
45 bg.SetVisible(true);
46 bg.SetKeyFocus(true);
47
48 /* ((Efl.Input.Interface)bg).KeyDownEvt += On_KeyDown; */
49 bg.KeyDownEvt += On_KeyDown;
50
51 text = new Evas.Text(canvas);
52 text.SetStyle(Evas.TextStyleType.OutlineSoftShadow);
53
54 text.SetColor(0, 0, 0, 255);
55 text.SetGlowColor(255, 0, 0, 255);
56 text.SetOutlineColor(0, 0, 255, 255);
57 text.SetShadowColor(0, 255,255, 255);
58 text.SetFont("Courier", 30);
59
60 text.SetText("sample text");
61 size.W = 3*WIDTH / 4;
62 size.H = HEIGHT / 4;
63 text.SetSize(size);
64 position.X = WIDTH / 8;
65 position.Y = 3 * HEIGHT / 8;
66 text.SetPosition(position);
67 text.SetVisible(true);
68
69 Efl.Font.Size font_size = 0;
70 String font = String.Empty;
71 text.GetFont(out font, out font_size);
72 Console.WriteLine("Adding text object with font {0} and size {1}", font, size);
73
74 // setup border
75 border = new Evas.Image(canvas);
76 border.SetFile(border_file, null);
77 border.SetBorder(3, 3, 3, 3);
78 border.SetBorderCenterFill(0);
79
80 size.W = 3 * WIDTH / 4 + 3;
81 size.H = HEIGHT / 4 + 3;
82 border.SetSize(size);
83 position.X = WIDTH / 8 - 3;
84 position.Y = 3 * HEIGHT / 8 - 3;
85 border.SetPosition(position);
86 border.SetVisible(true);
87
88
89 }
90
91 private void On_KeyDown(object sender, Efl.Input.InterfaceKeyDownEvt_Args e)
92 {
93 var key = e.arg.GetKey();
94
95 if (key == "h") {
96 Console.WriteLine(commands);
97 } else if (key == "t") {
98 Evas.TextStyleType type = text.GetStyle();
99 type = (Evas.TextStyleType)(((int)type + 1) % 10); // 10 hardcoded from C example
100 text.SetStyle(type);
101 }
102 }
103
104 static string commands = @"commands are:
105 t - change text's current style
106 h - print help";
107
108
109 static void Main(string[] args)
110 {
111 Efl.All.Init();
112
113 String border_path = "./src/examples/evas/resources/images/red.png";
114
115 if (args.Length >= 1)
116 border_path = args[0];
117
118 Efl.Loop loop = new Efl.Loop();
119 TestMain t = new TestMain(border_path);
120
121 loop.Begin();
122
123 Efl.All.Shutdown();
124 }
125}
126
127
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index 9cb92a6..94980ec 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -150,13 +150,13 @@ typedef struct _vec2
150 150
151 151
152#define MATERIAL_TEXTURE_SET(Object, Name, file, image) \ 152#define MATERIAL_TEXTURE_SET(Object, Name, file, image) \
153 efl_file_set(data->mesh_##Name, file, NULL); \ 153 efl_file_simple_load(data->mesh_##Name, file, NULL); \
154 \ 154 \
155 SETUP_DEFAULT_MESH(Object, Name, PHONG) \ 155 SETUP_DEFAULT_MESH(Object, Name, PHONG) \
156 data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ 156 data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
157 \ 157 \
158 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \ 158 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \
159 efl_file_set(data->texture_diffuse_##Object, image, NULL); \ 159 efl_file_simple_load(data->texture_diffuse_##Object, image, NULL); \
160 evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ 160 evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
161 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ 161 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \
162 evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ 162 evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \
@@ -175,7 +175,7 @@ typedef struct _vec2
175 data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ 175 data->texture_diffuse_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
176 \ 176 \
177 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \ 177 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_##Object, EINA_FALSE); \
178 efl_file_set(data->texture_diffuse_##Object, image, NULL); \ 178 efl_file_simple_load(data->texture_diffuse_##Object, image, NULL); \
179 evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ 179 evas_canvas3d_texture_filter_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
180 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ 180 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \
181 evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ 181 evas_canvas3d_texture_wrap_set(data->texture_diffuse_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \
@@ -190,7 +190,7 @@ typedef struct _vec2
190 data->texture_normal_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ 190 data->texture_normal_##Object = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
191 \ 191 \
192 evas_canvas3d_texture_atlas_enable_set(data->texture_normal_##Object, EINA_FALSE); \ 192 evas_canvas3d_texture_atlas_enable_set(data->texture_normal_##Object, EINA_FALSE); \
193 efl_file_set(data->texture_normal_##Object, normal, NULL); \ 193 efl_file_simple_load(data->texture_normal_##Object, normal, NULL); \
194 evas_canvas3d_texture_filter_set(data->texture_normal_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \ 194 evas_canvas3d_texture_filter_set(data->texture_normal_##Object, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
195 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \ 195 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); \
196 evas_canvas3d_texture_wrap_set(data->texture_normal_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \ 196 evas_canvas3d_texture_wrap_set(data->texture_normal_##Object, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); \
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index ae6bede..1c4deb4 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -133,14 +133,14 @@ _key_down(void *data,
133 if (!scene->blending) 133 if (!scene->blending)
134 { 134 {
135 scene->blending = EINA_TRUE; 135 scene->blending = EINA_TRUE;
136 efl_file_set(scene->texture_diffuse_carpet, gazebo_t_trans_path, NULL); 136 efl_file_simple_load(scene->texture_diffuse_carpet, gazebo_t_trans_path, NULL);
137 evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_TRUE); 137 evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_TRUE);
138 evas_canvas3d_mesh_blending_func_set(scene->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); 138 evas_canvas3d_mesh_blending_func_set(scene->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
139 } 139 }
140 else 140 else
141 { 141 {
142 scene->blending = EINA_FALSE; 142 scene->blending = EINA_FALSE;
143 efl_file_set(scene->texture_diffuse_carpet, gazebo_t_path, NULL); 143 efl_file_simple_load(scene->texture_diffuse_carpet, gazebo_t_path, NULL);
144 evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_FALSE); 144 evas_canvas3d_mesh_blending_enable_set(scene->mesh_carpet, EINA_FALSE);
145 } 145 }
146 } 146 }
@@ -733,7 +733,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
733 733
734 ADD_MESH(tommy, tommy, 0.0, 0.3, 1.0) 734 ADD_MESH(tommy, tommy, 0.0, 0.3, 1.0)
735 SETUP_MESH_NODE(tommy) 735 SETUP_MESH_NODE(tommy)
736 efl_file_set(data->mesh_tommy, gun_path, NULL); 736 efl_file_simple_load(data->mesh_tommy, gun_path, NULL);
737 efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL); 737 efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL);
738 evas_canvas3d_mesh_shader_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADER_MODE_PHONG); 738 evas_canvas3d_mesh_shader_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADER_MODE_PHONG);
739 evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy); 739 evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy);
@@ -763,7 +763,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
763 if (data->blending) 763 if (data->blending)
764 { 764 {
765 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_carpet, EINA_FALSE); 765 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_carpet, EINA_FALSE);
766 efl_file_set(data->texture_diffuse_carpet, gazebo_t_trans_path, NULL); 766 efl_file_simple_load(data->texture_diffuse_carpet, gazebo_t_trans_path, NULL);
767 evas_canvas3d_mesh_blending_enable_set(data->mesh_carpet, EINA_TRUE); 767 evas_canvas3d_mesh_blending_enable_set(data->mesh_carpet, EINA_TRUE);
768 evas_canvas3d_mesh_blending_func_set(data->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); 768 evas_canvas3d_mesh_blending_func_set(data->mesh_carpet, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
769 } 769 }
@@ -888,7 +888,7 @@ _mesh_setup_column(Scene_Data *data, int index)
888 888
889 data->texture_diffuse_column = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 889 data->texture_diffuse_column = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
890 890
891 efl_file_set(data->texture_diffuse_column, red_brick_path, NULL); 891 efl_file_simple_load(data->texture_diffuse_column, red_brick_path, NULL);
892 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_column, EINA_FALSE); 892 evas_canvas3d_texture_atlas_enable_set(data->texture_diffuse_column, EINA_FALSE);
893 evas_canvas3d_texture_filter_set(data->texture_diffuse_column, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 893 evas_canvas3d_texture_filter_set(data->texture_diffuse_column, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
894 evas_canvas3d_texture_wrap_set(data->texture_diffuse_column, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 894 evas_canvas3d_texture_wrap_set(data->texture_diffuse_column, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);