summaryrefslogtreecommitdiff
path: root/src/examples/evas
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:09 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:10 -0500
commit6326e18b3fb2a4757f8ffa22be5d55a75da23049 (patch)
tree31d586b52638aa0d0b1c759869a8e3368c9daf5d /src/examples/evas
parent7924660d54500285d3844bfa384394c683825cd9 (diff)
efl.file: improve api a bit
Summary: the previous implementation/api had a number of issues: * "file" property contained both "file" and "key" values - also performed file loading operation * "load_error" property which was specific to image objects * no methods for controlling file loading/unloading this patch attempts the following changes: * split "file" property into "file" and "key" properties - also remove "key" from existing "mmap" property * remove "load_error" * directly return error codes from operations * add "load" and "unload" methods for directly controlling load state * add implicit file loading if file/mmap is set during construction * rewrite all efl.file implementations to move file loading into load() method * rewrite all usage of efl.file api based on these changes * add C extension functions to mimic previous behavior ref T7577 Reviewers: segfaultxavi, bu5hm4n, cedric Reviewed By: segfaultxavi Subscribers: vitor.sousa, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7577 Differential Revision: https://phab.enlightenment.org/D8018
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.c9
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h8
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c10
17 files changed, 43 insertions, 42 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index dd4c1f0f27..fdb8a45278 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 8c9ea3b54f..7b894cd23e 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 c8558b622b..b2d905e873 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 da94e06d7e..becd0bcadc 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 02f5bba05e..6e765bd399 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 0e13705c36..e82f31bca7 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 adfb6962a0..f97c183bd0 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 360555501e..149217d95a 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 65f57ecffd..91126fbfa0 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 83188c0538..1d2cc75263 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 1e2f3d6ead..20230d0112 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 821195b30e..7769a45442 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 ae06a3631a..16733183f4 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 d7672a48b5..92e3b1a1a9 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 551d2873f7..081d063641 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -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 {
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index 9cb92a6cf8..94980ec2e3 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 ae6bedee7f..1c4deb4d7e 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);