summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorBogdan Devichev <b.devichev@samsung.com>2015-02-18 22:21:47 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-02-18 22:42:20 +0100
commit303a6a87d039a7ba49831bb910b6570c3d7d5c93 (patch)
tree41132ab967a7b003b0684815d41749491ef03eae /src/examples
parentd6f2dd4dd07dee11eb4121d950f37a534d43dadb (diff)
evas: Evas_3D - regularize resource for 3D examples.
Summary: This commit makes folder of examples for evas more ordered. Reviewers: raster, Hermet, cedric Subscribers: artem.popov, cedric Differential Revision: https://phab.enlightenment.org/D1985 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/evas/evas-3d-aabb.c5
-rw-r--r--src/examples/evas/evas-3d-colorpick.c10
-rw-r--r--src/examples/evas/evas-3d-common.h3
-rw-r--r--src/examples/evas/evas-3d-cube2.c4
-rw-r--r--src/examples/evas/evas-3d-eet.c7
-rw-r--r--src/examples/evas/evas-3d-frustum.c5
-rw-r--r--src/examples/evas/evas-3d-md2.c5
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c4
-rw-r--r--src/examples/evas/evas-3d-moon-space.c7
-rw-r--r--src/examples/evas/evas-3d-obj.c22
-rw-r--r--src/examples/evas/evas-3d-pick.c3
-rw-r--r--src/examples/evas/evas-3d-ply.c20
-rw-r--r--src/examples/evas/evas-3d-shadows.c5
-rw-r--r--src/examples/evas/resources/images/EarthDiffuse.png (renamed from src/examples/evas/EarthDiffuse.png)bin2123166 -> 2123166 bytes
-rw-r--r--src/examples/evas/resources/images/M15.png (renamed from src/examples/evas/M15.png)bin757222 -> 757222 bytes
-rw-r--r--src/examples/evas/resources/images/M15_1.png (renamed from src/examples/evas/M15_1.png)bin5061523 -> 5061523 bytes
-rw-r--r--src/examples/evas/resources/images/bg_space.jpg (renamed from src/examples/evas/bg_space.jpg)bin776629 -> 776629 bytes
-rw-r--r--src/examples/evas/resources/images/eagle.png (renamed from src/examples/evas/eagle.png)bin587296 -> 587296 bytes
-rw-r--r--src/examples/evas/resources/images/moon.png (renamed from src/examples/evas/moon.png)bin181059 -> 181059 bytes
-rw-r--r--src/examples/evas/resources/images/normal_lego.png (renamed from src/examples/evas/normal_lego.png)bin3166 -> 3166 bytes
-rw-r--r--src/examples/evas/resources/images/sonic.png (renamed from src/examples/evas/sonic.png)bin309072 -> 309072 bytes
-rw-r--r--src/examples/evas/resources/images/sweet_home_reversed.png (renamed from src/examples/evas/sweet_home_reversed.png)bin570854 -> 570854 bytes
-rw-r--r--src/examples/evas/resources/models/M15.mtl (renamed from src/examples/evas/M15.mtl)0
-rw-r--r--src/examples/evas/resources/models/M15.obj (renamed from src/examples/evas/M15.obj)0
-rw-r--r--src/examples/evas/resources/models/NoNormal_NoUVs_Colors.ply (renamed from src/examples/evas/ply_files/NoNormal_NoUVs_Colors.ply)0
-rw-r--r--src/examples/evas/resources/models/NoNormal_NoUVs_NoColors.ply (renamed from src/examples/evas/ply_files/NoNormal_NoUVs_NoColors.ply)0
-rw-r--r--src/examples/evas/resources/models/NoNormal_UVs_Colors.ply (renamed from src/examples/evas/ply_files/NoNormal_UVs_Colors.ply)0
-rw-r--r--src/examples/evas/resources/models/NoNormal_UVs_NoColors.ply (renamed from src/examples/evas/ply_files/NoNormal_UVs_NoColors.ply)0
-rw-r--r--src/examples/evas/resources/models/Normal_NoUVs_Colors.ply (renamed from src/examples/evas/ply_files/Normal_NoUVs_Colors.ply)0
-rw-r--r--src/examples/evas/resources/models/Normal_NoUVs_NoColors.ply (renamed from src/examples/evas/ply_files/Normal_NoUVs_NoColors.ply)0
-rw-r--r--src/examples/evas/resources/models/Normal_UVs_Colors.ply (renamed from src/examples/evas/ply_files/Normal_UVs_Colors.ply)0
-rw-r--r--src/examples/evas/resources/models/Normal_UVs_NoColors.ply (renamed from src/examples/evas/ply_files/Normal_UVs_NoColors.ply)0
-rw-r--r--src/examples/evas/resources/models/eagle.md2 (renamed from src/examples/evas/eagle.md2)bin62528 -> 62528 bytes
-rw-r--r--src/examples/evas/resources/models/mesh_for_mmap.eet (renamed from src/examples/evas/mesh_mmap_set/mesh.eet)bin19706 -> 19706 bytes
-rw-r--r--src/examples/evas/resources/models/mesh_for_mmap.md2 (renamed from src/examples/evas/mesh_mmap_set/mesh.md2)bin617736 -> 617736 bytes
-rw-r--r--src/examples/evas/resources/models/mesh_for_mmap.mtl (renamed from src/examples/evas/mesh_mmap_set/mesh.mtl)0
-rw-r--r--src/examples/evas/resources/models/mesh_for_mmap.obj (renamed from src/examples/evas/mesh_mmap_set/mesh.obj)0
-rw-r--r--src/examples/evas/resources/models/mesh_for_mmap.ply (renamed from src/examples/evas/mesh_mmap_set/mesh.ply)0
-rw-r--r--src/examples/evas/resources/models/sonic.md2 (renamed from src/examples/evas/sonic.md2)bin660576 -> 660576 bytes
-rw-r--r--src/examples/evas/resources/models/sweet_home.mtl (renamed from src/examples/evas/obj_files/sweet_home.mtl)0
-rw-r--r--src/examples/evas/resources/models/sweet_home.obj (renamed from src/examples/evas/obj_files/sweet_home.obj)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_only_vertex_coords.mtl (renamed from src/examples/evas/obj_files/sweet_home_only_vertex_coords.mtl)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_only_vertex_coords.obj (renamed from src/examples/evas/obj_files/sweet_home_only_vertex_coords.obj)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_without_normals.mtl (renamed from src/examples/evas/obj_files/sweet_home_without_normals.mtl)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_without_normals.obj (renamed from src/examples/evas/obj_files/sweet_home_without_normals.obj)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_without_tex_coords.mtl (renamed from src/examples/evas/obj_files/sweet_home_without_tex_coords.mtl)0
-rw-r--r--src/examples/evas/resources/models/sweet_home_without_tex_coords.obj (renamed from src/examples/evas/obj_files/sweet_home_without_tex_coords.obj)0
-rw-r--r--src/examples/evas/sonic.eetbin132670 -> 0 bytes
48 files changed, 56 insertions, 44 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 7fd8d98..722796c 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -13,6 +13,7 @@
13#include <Evas.h> 13#include <Evas.h>
14#include <Ecore.h> 14#include <Ecore.h>
15#include <Ecore_Evas.h> 15#include <Ecore_Evas.h>
16#include "evas-3d-common.h"
16 17
17#define WIDTH 400 18#define WIDTH 400
18#define HEIGHT 400 19#define HEIGHT 400
@@ -227,13 +228,13 @@ main(void)
227 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 228 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
228 229
229 eo_do(mesh, 230 eo_do(mesh,
230 efl_file_set("sonic.md2", NULL), 231 efl_file_set(EVAS_3D_MODEL_FOLDER"sonic.md2", NULL),
231 evas_3d_mesh_frame_material_set(0, material), 232 evas_3d_mesh_frame_material_set(0, material),
232 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 233 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
233 234
234 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 235 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
235 eo_do(texture, 236 eo_do(texture,
236 evas_3d_texture_file_set("sonic.png", NULL), 237 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"sonic.png", NULL),
237 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 238 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST,
238 EVAS_3D_TEXTURE_FILTER_NEAREST), 239 EVAS_3D_TEXTURE_FILTER_NEAREST),
239 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 240 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT,
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 4f00846..2dce999 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -7,8 +7,9 @@
7 * Use key LEFT/RIGHT for scale each node 7 * Use key LEFT/RIGHT for scale each node
8 * Use shortcut parameters of commanline: r - rows of objects, c - columns of objects, m - path for model name, 8 * Use shortcut parameters of commanline: r - rows of objects, c - columns of objects, m - path for model name,
9 * f - path for first texture, s - path for second texture. 9 * f - path for first texture, s - path for second texture.
10 * Compile with "gcc -o evas-3d-colorpick evas-3d-colorpick.c `pkg-config --libs --cflags evas ecore ecore-evas eo eina efl` 10 * Compile with "gcc -o evas-3d-colorpick evas-3d-colorpick.c `pkg-config --libs --cflags evas ecore ecore-evas eo eina efl`"
11 */ 11 */
12//TODO new resources
12 13
13#define EFL_EO_API_SUPPORT 14#define EFL_EO_API_SUPPORT
14#define EFL_BETA_API_SUPPORT 15#define EFL_BETA_API_SUPPORT
@@ -18,6 +19,7 @@
18#include <Ecore.h> 19#include <Ecore.h>
19#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
20#include <Ecore_Getopt.h> 21#include <Ecore_Getopt.h>
22#include "evas-3d-common.h"
21 23
22#define WIDTH 800 24#define WIDTH 800
23#define HEIGHT 600 25#define HEIGHT 600
@@ -442,9 +444,9 @@ int main(int argc, char **argv)
442 444
443 if (!row) row = 2; 445 if (!row) row = 2;
444 if (!col) col = 5; 446 if (!col) col = 5;
445 if (!model) model = "M15.obj"; 447 if (!model) model = EVAS_3D_MODEL_FOLDER"M15.obj";
446 if (!texture1) texture1 = "M15.png"; 448 if (!texture1) texture1 = EVAS_3D_IMAGE_FOLDER"M15.png";
447 if (!texture2) texture2 = "M15_1.png"; 449 if (!texture2) texture2 = EVAS_3D_IMAGE_FOLDER"M15_1.png";
448 450
449 fprintf(stdout, "row - %d, col - %d, model - %s, texture1 - %s, texture2 - %s\n", 451 fprintf(stdout, "row - %d, col - %d, model - %s, texture1 - %s, texture2 - %s\n",
450 row, col, model, texture1, texture2); 452 row, col, model, texture1, texture2);
diff --git a/src/examples/evas/evas-3d-common.h b/src/examples/evas/evas-3d-common.h
new file mode 100644
index 0000000..065b544
--- /dev/null
+++ b/src/examples/evas/evas-3d-common.h
@@ -0,0 +1,3 @@
1#define EVAS_3D_IMAGE_FOLDER "resources/images/"
2#define EVAS_3D_MODEL_FOLDER "resources/models/"
3#define EVAS_3D_SAVED_FILES "saved_files/"
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 5eee582..38a2d4e 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -5,6 +5,7 @@
5#include <Evas.h> 5#include <Evas.h>
6#include <Ecore.h> 6#include <Ecore.h>
7#include <Ecore_Evas.h> 7#include <Ecore_Evas.h>
8#include "evas-3d-common.h"
8 9
9#define WIDTH 400 10#define WIDTH 400
10#define HEIGHT 400 11#define HEIGHT 400
@@ -229,7 +230,8 @@ _mesh_setup(Scene_Data *data)
229 eo_do(data->texture1, 230 eo_do(data->texture1,
230 evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, 231 evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA,
231 EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels1[0])); 232 EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels1[0]));
232 eo_do(data->texture_normal, evas_3d_texture_file_set("normal_lego.png", NULL)); 233 eo_do(data->texture_normal,
234 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"normal_lego.png", NULL));
233 235
234 eo_do(data->material0, 236 eo_do(data->material0,
235 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture0)); 237 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture0));
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index b9c11e4..b6966bb 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -20,6 +20,7 @@
20#include <Evas.h> 20#include <Evas.h>
21#include <Ecore.h> 21#include <Ecore.h>
22#include <Ecore_Evas.h> 22#include <Ecore_Evas.h>
23#include "evas-3d-common.h"
23 24
24#define WIDTH 1024 25#define WIDTH 1024
25#define HEIGHT 1024 26#define HEIGHT 1024
@@ -151,7 +152,7 @@ main(void)
151 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 152 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
152 153
153 eo_do(mesh, 154 eo_do(mesh,
154 efl_file_set("sonic.md2", NULL), 155 efl_file_set(EVAS_3D_MODEL_FOLDER"sonic.md2", NULL),
155 evas_3d_mesh_frame_material_set(0, material), 156 evas_3d_mesh_frame_material_set(0, material),
156 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 157 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
157 158
@@ -168,10 +169,10 @@ main(void)
168 0.50, 0.00, 0.50, 0.30), 169 0.50, 0.00, 0.50, 0.30),
169 evas_3d_material_shininess_set(50.0)); 170 evas_3d_material_shininess_set(50.0));
170 171
171 eo_do(mesh, efl_file_save("saved_Sonic_EET.eet", NULL, NULL)); 172 eo_do(mesh, efl_file_save(EVAS_3D_SAVED_FILES"saved_Sonic_EET.eet", NULL, NULL));
172 173
173 eo_do(mesh2, 174 eo_do(mesh2,
174 efl_file_set("saved_Sonic_EET.eet", NULL), 175 efl_file_set(EVAS_3D_SAVED_FILES"saved_Sonic_EET.eet", NULL),
175 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 176 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
176 177
177 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 178 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas,
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index fc14fb8..75c936a 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -19,6 +19,7 @@
19#include <Evas.h> 19#include <Evas.h>
20#include <Eo.h> 20#include <Eo.h>
21#include <math.h> 21#include <math.h>
22#include "evas-3d-common.h"
22 23
23#define WIDTH 800 24#define WIDTH 800
24#define HEIGHT 600 25#define HEIGHT 600
@@ -452,7 +453,7 @@ _mesh_setup_model(Scene_Data *data)
452 data->texture_model = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 453 data->texture_model = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
453 454
454 eo_do(data->texture_model, 455 eo_do(data->texture_model,
455 evas_3d_texture_file_set("eagle.png", NULL), 456 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"eagle.png", NULL),
456 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, EVAS_3D_TEXTURE_FILTER_NEAREST), 457 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, EVAS_3D_TEXTURE_FILTER_NEAREST),
457 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); 458 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT));
458 459
@@ -469,7 +470,7 @@ _mesh_setup_model(Scene_Data *data)
469 evas_3d_material_shininess_set(100.0)); 470 evas_3d_material_shininess_set(100.0));
470 471
471 eo_do(data->mesh_model, 472 eo_do(data->mesh_model,
472 efl_file_set("eagle.md2", NULL), 473 efl_file_set(EVAS_3D_MODEL_FOLDER"eagle.md2", NULL),
473 evas_3d_mesh_frame_material_set(0, data->material_model), 474 evas_3d_mesh_frame_material_set(0, data->material_model),
474 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); 475 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE));
475} 476}
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index b22c76e..76546cd 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -5,6 +5,7 @@
5#include <Evas.h> 5#include <Evas.h>
6#include <Ecore.h> 6#include <Ecore.h>
7#include <Ecore_Evas.h> 7#include <Ecore_Evas.h>
8#include "evas-3d-common.h"
8 9
9#define WIDTH 400 10#define WIDTH 400
10#define HEIGHT 400 11#define HEIGHT 400
@@ -120,13 +121,13 @@ main(void)
120 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 121 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
121 122
122 eo_do(mesh, 123 eo_do(mesh,
123 efl_file_set("sonic.md2", NULL), 124 efl_file_set(EVAS_3D_MODEL_FOLDER"sonic.md2", NULL),
124 evas_3d_mesh_frame_material_set(0, material), 125 evas_3d_mesh_frame_material_set(0, material),
125 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 126 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
126 127
127 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 128 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
128 eo_do(texture, 129 eo_do(texture,
129 evas_3d_texture_file_set("sonic.png", NULL), 130 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"sonic.png", NULL),
130 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 131 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST,
131 EVAS_3D_TEXTURE_FILTER_NEAREST), 132 EVAS_3D_TEXTURE_FILTER_NEAREST),
132 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 133 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT,
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 33c0d18..501046d 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -17,6 +17,7 @@
17#include <Evas.h> 17#include <Evas.h>
18#include <Ecore.h> 18#include <Ecore.h>
19#include <Ecore_Evas.h> 19#include <Ecore_Evas.h>
20#include "evas-3d-common.h"
20 21
21#include <math.h> 22#include <math.h>
22 23
@@ -24,7 +25,8 @@
24#define HEIGHT 1000 25#define HEIGHT 1000
25 26
26#define LOAD_AND_ADD_MESH(extention, number) \ 27#define LOAD_AND_ADD_MESH(extention, number) \
27 extention##_file = eina_file_open("mesh_mmap_set/mesh."#extention, 0); \ 28 extention##_file = \
29 eina_file_open(EVAS_3D_MODEL_FOLDER"mesh_for_mmap."#extention, 0); \
28 mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \ 30 mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \
29 eo_do(mesh_##extention, \ 31 eo_do(mesh_##extention, \
30 evas_3d_mesh_mmap_set(extention##_file, NULL), \ 32 evas_3d_mesh_mmap_set(extention##_file, NULL), \
diff --git a/src/examples/evas/evas-3d-moon-space.c b/src/examples/evas/evas-3d-moon-space.c
index fbaec2a..87d8bb1 100644
--- a/src/examples/evas/evas-3d-moon-space.c
+++ b/src/examples/evas/evas-3d-moon-space.c
@@ -25,6 +25,7 @@
25#include <stdio.h> 25#include <stdio.h>
26#include <math.h> 26#include <math.h>
27#include <Eo.h> 27#include <Eo.h>
28#include "evas-3d-common.h"
28 29
29#define WIDTH 1024 30#define WIDTH 1024
30#define HEIGHT 1024 31#define HEIGHT 1024
@@ -447,7 +448,7 @@ _mesh_setup(Scene_Data *data)
447 448
448 /* Setup material and texture for planet. */ 449 /* Setup material and texture for planet. */
449 eo_do(data->texture_diffuse_planet, 450 eo_do(data->texture_diffuse_planet,
450 evas_3d_texture_file_set("EarthDiffuse.png", NULL), 451 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"EarthDiffuse.png", NULL),
451 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, EVAS_3D_TEXTURE_FILTER_LINEAR)); 452 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, EVAS_3D_TEXTURE_FILTER_LINEAR));
452 453
453 eo_do(data->material_planet, 454 eo_do(data->material_planet,
@@ -462,7 +463,7 @@ _mesh_setup(Scene_Data *data)
462 463
463 /* Setup material and texture for moon. */ 464 /* Setup material and texture for moon. */
464 eo_do(data->texture_diffuse_moon, 465 eo_do(data->texture_diffuse_moon,
465 evas_3d_texture_file_set("moon.png", NULL), 466 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"moon.png", NULL),
466 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, EVAS_3D_TEXTURE_FILTER_LINEAR)); 467 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, EVAS_3D_TEXTURE_FILTER_LINEAR));
467 468
468 eo_do(data->material_moon, 469 eo_do(data->material_moon,
@@ -732,7 +733,7 @@ main(void)
732 733
733 /* Add evas objects. */ 734 /* Add evas objects. */
734 background = evas_object_image_filled_add(evas); 735 background = evas_object_image_filled_add(evas);
735 evas_object_image_file_set(background, "bg_space.jpg", NULL), 736 evas_object_image_file_set(background, EVAS_3D_IMAGE_FOLDER"bg_space.jpg", NULL),
736 evas_object_resize(background, WIDTH, HEIGHT), 737 evas_object_resize(background, WIDTH, HEIGHT),
737 evas_object_show(background); 738 evas_object_show(background);
738 739
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 639babc..b0203d3 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -4,8 +4,8 @@
4* 4*
5* Read mesh from "sweet_home(parameters).obj". 5* Read mesh from "sweet_home(parameters).obj".
6* After that cheange some properties of material. 6* After that cheange some properties of material.
7* After that save material to "saved_home(parameters).mtl" 7* After that save material to "saved_files/saved_home(parameters).mtl"
8* and geometry to "saved_home(parameters).obj". 8* and geometry to "saved_files/saved_home(parameters).obj".
9* If material was not set it will be not saved. 9* If material was not set it will be not saved.
10* 10*
11* @verbatim 11* @verbatim
@@ -20,6 +20,7 @@
20#include <Evas.h> 20#include <Evas.h>
21#include <Ecore.h> 21#include <Ecore.h>
22#include <Ecore_Evas.h> 22#include <Ecore_Evas.h>
23#include "evas-3d-common.h"
23 24
24#define WIDTH 1900 25#define WIDTH 1900
25#define HEIGHT 1080 26#define HEIGHT 1080
@@ -36,12 +37,10 @@
36#define GRID_SIZE 6 37#define GRID_SIZE 6
37#define NUMBER_OF_MESHES 8 38#define NUMBER_OF_MESHES 8
38 39
39#define RESOURCE_FOLDER "obj_files/"
40
41#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \ 40#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \
42 mesh[num] = eo_add(EVAS_3D_MESH_CLASS, evas); \ 41 mesh[num] = eo_add(EVAS_3D_MESH_CLASS, evas); \
43 eo_do(mesh[num], \ 42 eo_do(mesh[num], \
44 efl_file_set(RESOURCE_FOLDER#path".obj", NULL), \ 43 efl_file_set(path".obj", NULL), \
45 evas_3d_mesh_frame_material_set(0, name_of_material), \ 44 evas_3d_mesh_frame_material_set(0, name_of_material), \
46 evas_3d_mesh_shade_mode_set(shade_mode)); \ 45 evas_3d_mesh_shade_mode_set(shade_mode)); \
47 mesh_node[num] = eo_add(EVAS_3D_NODE_CLASS, evas, \ 46 mesh_node[num] = eo_add(EVAS_3D_NODE_CLASS, evas, \
@@ -52,10 +51,13 @@
52 evas_3d_node_mesh_add(mesh[num]), \ 51 evas_3d_node_mesh_add(mesh[num]), \
53 evas_3d_node_position_set(0, Y, Z)); \ 52 evas_3d_node_position_set(0, Y, Z)); \
54 53
55#define ADD_OBJ_MESH_AND_SAVED_COPY(path, Y, Z, num, shade_mode, name_of_material) \ 54#define ADD_OBJ_MESH_AND_SAVED_COPY(path, Y, Z, num, shade_mode, name_of_material) \
56 ADD_OBJ_MESH(sweet_##path, Y, Z, num, shade_mode, name_of_material) \ 55 ADD_OBJ_MESH(EVAS_3D_MODEL_FOLDER"sweet_"#path, \
57 eo_do(mesh[num], efl_file_save(RESOURCE_FOLDER"saved_"#path".obj", NULL, NULL)); \ 56 Y, Z, num, shade_mode, name_of_material) \
58 ADD_OBJ_MESH(saved_##path, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material) 57 eo_do(mesh[num], efl_file_save(EVAS_3D_SAVED_FILES"saved_"#path".obj", \
58 NULL, NULL)); \
59 ADD_OBJ_MESH(EVAS_3D_SAVED_FILES"saved_"#path, \
60 Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material)
59 61
60#define ADD_TEXTURE(name, path) \ 62#define ADD_TEXTURE(name, path) \
61 name = eo_add(EVAS_3D_TEXTURE_CLASS, evas); \ 63 name = eo_add(EVAS_3D_TEXTURE_CLASS, evas); \
@@ -191,7 +193,7 @@ main(void)
191 eo_do(root_node, 193 eo_do(root_node,
192 evas_3d_node_member_add(light_node)); 194 evas_3d_node_member_add(light_node));
193 195
194 ADD_TEXTURE(texture, "sweet_home_reversed.png") 196 ADD_TEXTURE(texture, EVAS_3D_IMAGE_FOLDER"sweet_home_reversed.png")
195 197
196 ADD_MATERIAL(material) 198 ADD_MATERIAL(material)
197 199
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 9ac4cf9..f983146 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -6,6 +6,7 @@
6#include <Evas.h> 6#include <Evas.h>
7#include <Ecore.h> 7#include <Ecore.h>
8#include <Ecore_Evas.h> 8#include <Ecore_Evas.h>
9#include "evas-3d-common.h"
9 10
10#define WIDTH 400 11#define WIDTH 400
11#define HEIGHT 400 12#define HEIGHT 400
@@ -343,7 +344,7 @@ main(void)
343 344
344 texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 345 texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
345 eo_do(texture_diffuse, 346 eo_do(texture_diffuse,
346 evas_3d_texture_file_set("EarthDiffuse.png", NULL), 347 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"EarthDiffuse.png", NULL),
347 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, 348 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR,
348 EVAS_3D_TEXTURE_FILTER_LINEAR)); 349 EVAS_3D_TEXTURE_FILTER_LINEAR));
349 eo_do(material, 350 eo_do(material,
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index ed8209e..d6102f9 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -10,6 +10,7 @@
10* gcc -o evas-3d-ply evas-3d-ply.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` 10* gcc -o evas-3d-ply evas-3d-ply.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo`
11* @endverbatim 11* @endverbatim
12*/ 12*/
13//TODO new resources
13 14
14#define EFL_EO_API_SUPPORT 15#define EFL_EO_API_SUPPORT
15#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
@@ -18,6 +19,7 @@
18#include <Evas.h> 19#include <Evas.h>
19#include <Ecore.h> 20#include <Ecore.h>
20#include <Ecore_Evas.h> 21#include <Ecore_Evas.h>
22#include "evas-3d-common.h"
21 23
22#define WIDTH 1024 24#define WIDTH 1024
23#define HEIGHT 1024 25#define HEIGHT 1024
@@ -45,15 +47,6 @@ Eo *texture = NULL;
45Eo *light = NULL; 47Eo *light = NULL;
46Ecore_Animator *anim = NULL; 48Ecore_Animator *anim = NULL;
47 49
48char *folder = "ply_files";
49char *path_file[8] = {"ply_files/Normal_UVs_Colors.ply",
50 "ply_files/Normal_UVs_NoColors.ply",
51 "ply_files/Normal_NoUVs_Colors.ply",
52 "ply_files/Normal_NoUVs_NoColors.ply",
53 "ply_files/NoNormal_UVs_Colors.ply",
54 "ply_files/NoNormal_UVs_NoColors.ply",
55 "ply_files/NoNormal_NoUVs_Colors.ply",
56 "ply_files/NoNormal_NoUVs_NoColors.ply"};
57char *file_name[8] = {"Normal_UVs_Colors.ply", 50char *file_name[8] = {"Normal_UVs_Colors.ply",
58 "Normal_UVs_NoColors.ply", 51 "Normal_UVs_NoColors.ply",
59 "Normal_NoUVs_Colors.ply", 52 "Normal_NoUVs_Colors.ply",
@@ -164,7 +157,7 @@ main(void)
164 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 157 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
165 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 158 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
166 eo_do(texture, 159 eo_do(texture,
167 evas_3d_texture_file_set("indian_DIFF3.png", NULL), 160 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"normal_lego.png", NULL),
168 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 161 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST,
169 EVAS_3D_TEXTURE_FILTER_NEAREST), 162 EVAS_3D_TEXTURE_FILTER_NEAREST),
170 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 163 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT,
@@ -188,18 +181,19 @@ main(void)
188 { 181 {
189 mesh[i] = eo_add(EVAS_3D_MESH_CLASS, evas); 182 mesh[i] = eo_add(EVAS_3D_MESH_CLASS, evas);
190 183
184 snprintf(buffer, PATH_MAX, "%s%s", EVAS_3D_MODEL_FOLDER, file_name[i % 8]);
191 eo_do(mesh[i], 185 eo_do(mesh[i],
192 efl_file_set(path_file[i % 8], NULL), 186 efl_file_set(buffer, NULL),
193 evas_3d_mesh_frame_material_set(0, material), 187 evas_3d_mesh_frame_material_set(0, material),
194 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8])); 188 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8]));
195 189
196 snprintf(buffer, PATH_MAX, "%s/Saved_%s", folder, file_name[i % 8]); 190 snprintf(buffer, PATH_MAX, "%s%s", EVAS_3D_SAVED_FILES, file_name[i % 8]);
197 eo_do(mesh[i], efl_file_save(buffer, NULL, NULL)); 191 eo_do(mesh[i], efl_file_save(buffer, NULL, NULL));
198 192
199 if (i > 15) 193 if (i > 15)
200 { 194 {
201 eo_do(mesh[i], 195 eo_do(mesh[i],
202 efl_file_set(path_file[i % 8], NULL), 196 efl_file_set(buffer, NULL),
203 evas_3d_mesh_frame_material_set(0, material), 197 evas_3d_mesh_frame_material_set(0, material),
204 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8])); 198 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8]));
205 } 199 }
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index ec37f2e..df5184b 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -18,6 +18,7 @@
18#include <Eina.h> 18#include <Eina.h>
19#include <math.h> 19#include <math.h>
20#include "evas-3d-primitives.c" 20#include "evas-3d-primitives.c"
21#include "evas-3d-common.h"
21 22
22#define WIDTH 1024 23#define WIDTH 1024
23#define HEIGHT 1024 24#define HEIGHT 1024
@@ -236,7 +237,7 @@ _model_setup(Body_3D *model)
236{ 237{
237 Eo *texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 238 Eo *texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
238 eo_do(texture, 239 eo_do(texture,
239 evas_3d_texture_file_set("sonic.png", NULL), 240 evas_3d_texture_file_set(EVAS_3D_IMAGE_FOLDER"sonic.png", NULL),
240 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 241 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST,
241 EVAS_3D_TEXTURE_FILTER_NEAREST), 242 EVAS_3D_TEXTURE_FILTER_NEAREST),
242 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 243 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT,
@@ -255,7 +256,7 @@ _model_setup(Body_3D *model)
255 model->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 256 model->mesh = eo_add(EVAS_3D_MESH_CLASS, evas);
256 257
257 eo_do(model->mesh, 258 eo_do(model->mesh,
258 efl_file_set("sonic.md2", NULL), 259 efl_file_set(EVAS_3D_MODEL_FOLDER"sonic.md2", NULL),
259 evas_3d_mesh_frame_material_set(0, model->material), 260 evas_3d_mesh_frame_material_set(0, model->material),
260 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 261 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
261 262
diff --git a/src/examples/evas/EarthDiffuse.png b/src/examples/evas/resources/images/EarthDiffuse.png
index 3bcf58b..3bcf58b 100644
--- a/src/examples/evas/EarthDiffuse.png
+++ b/src/examples/evas/resources/images/EarthDiffuse.png
Binary files differ
diff --git a/src/examples/evas/M15.png b/src/examples/evas/resources/images/M15.png
index 3d60573..3d60573 100644
--- a/src/examples/evas/M15.png
+++ b/src/examples/evas/resources/images/M15.png
Binary files differ
diff --git a/src/examples/evas/M15_1.png b/src/examples/evas/resources/images/M15_1.png
index e9b2ac4..e9b2ac4 100644
--- a/src/examples/evas/M15_1.png
+++ b/src/examples/evas/resources/images/M15_1.png
Binary files differ
diff --git a/src/examples/evas/bg_space.jpg b/src/examples/evas/resources/images/bg_space.jpg
index ae71c6f..ae71c6f 100644
--- a/src/examples/evas/bg_space.jpg
+++ b/src/examples/evas/resources/images/bg_space.jpg
Binary files differ
diff --git a/src/examples/evas/eagle.png b/src/examples/evas/resources/images/eagle.png
index 503ca1f..503ca1f 100644
--- a/src/examples/evas/eagle.png
+++ b/src/examples/evas/resources/images/eagle.png
Binary files differ
diff --git a/src/examples/evas/moon.png b/src/examples/evas/resources/images/moon.png
index 1b11945..1b11945 100644
--- a/src/examples/evas/moon.png
+++ b/src/examples/evas/resources/images/moon.png
Binary files differ
diff --git a/src/examples/evas/normal_lego.png b/src/examples/evas/resources/images/normal_lego.png
index 6a74ad9..6a74ad9 100644
--- a/src/examples/evas/normal_lego.png
+++ b/src/examples/evas/resources/images/normal_lego.png
Binary files differ
diff --git a/src/examples/evas/sonic.png b/src/examples/evas/resources/images/sonic.png
index 01cb2ed..01cb2ed 100644
--- a/src/examples/evas/sonic.png
+++ b/src/examples/evas/resources/images/sonic.png
Binary files differ
diff --git a/src/examples/evas/sweet_home_reversed.png b/src/examples/evas/resources/images/sweet_home_reversed.png
index 1e79861..1e79861 100644
--- a/src/examples/evas/sweet_home_reversed.png
+++ b/src/examples/evas/resources/images/sweet_home_reversed.png
Binary files differ
diff --git a/src/examples/evas/M15.mtl b/src/examples/evas/resources/models/M15.mtl
index 363dc5f..363dc5f 100644
--- a/src/examples/evas/M15.mtl
+++ b/src/examples/evas/resources/models/M15.mtl
diff --git a/src/examples/evas/M15.obj b/src/examples/evas/resources/models/M15.obj
index 8e64b02..8e64b02 100644
--- a/src/examples/evas/M15.obj
+++ b/src/examples/evas/resources/models/M15.obj
diff --git a/src/examples/evas/ply_files/NoNormal_NoUVs_Colors.ply b/src/examples/evas/resources/models/NoNormal_NoUVs_Colors.ply
index 0e4e2f8..0e4e2f8 100644
--- a/src/examples/evas/ply_files/NoNormal_NoUVs_Colors.ply
+++ b/src/examples/evas/resources/models/NoNormal_NoUVs_Colors.ply
diff --git a/src/examples/evas/ply_files/NoNormal_NoUVs_NoColors.ply b/src/examples/evas/resources/models/NoNormal_NoUVs_NoColors.ply
index d78a233..d78a233 100644
--- a/src/examples/evas/ply_files/NoNormal_NoUVs_NoColors.ply
+++ b/src/examples/evas/resources/models/NoNormal_NoUVs_NoColors.ply
diff --git a/src/examples/evas/ply_files/NoNormal_UVs_Colors.ply b/src/examples/evas/resources/models/NoNormal_UVs_Colors.ply
index 108c259..108c259 100644
--- a/src/examples/evas/ply_files/NoNormal_UVs_Colors.ply
+++ b/src/examples/evas/resources/models/NoNormal_UVs_Colors.ply
diff --git a/src/examples/evas/ply_files/NoNormal_UVs_NoColors.ply b/src/examples/evas/resources/models/NoNormal_UVs_NoColors.ply
index ffa5310..ffa5310 100644
--- a/src/examples/evas/ply_files/NoNormal_UVs_NoColors.ply
+++ b/src/examples/evas/resources/models/NoNormal_UVs_NoColors.ply
diff --git a/src/examples/evas/ply_files/Normal_NoUVs_Colors.ply b/src/examples/evas/resources/models/Normal_NoUVs_Colors.ply
index 77a646f..77a646f 100644
--- a/src/examples/evas/ply_files/Normal_NoUVs_Colors.ply
+++ b/src/examples/evas/resources/models/Normal_NoUVs_Colors.ply
diff --git a/src/examples/evas/ply_files/Normal_NoUVs_NoColors.ply b/src/examples/evas/resources/models/Normal_NoUVs_NoColors.ply
index b3e1806..b3e1806 100644
--- a/src/examples/evas/ply_files/Normal_NoUVs_NoColors.ply
+++ b/src/examples/evas/resources/models/Normal_NoUVs_NoColors.ply
diff --git a/src/examples/evas/ply_files/Normal_UVs_Colors.ply b/src/examples/evas/resources/models/Normal_UVs_Colors.ply
index 797151a..797151a 100644
--- a/src/examples/evas/ply_files/Normal_UVs_Colors.ply
+++ b/src/examples/evas/resources/models/Normal_UVs_Colors.ply
diff --git a/src/examples/evas/ply_files/Normal_UVs_NoColors.ply b/src/examples/evas/resources/models/Normal_UVs_NoColors.ply
index 5622bee..5622bee 100644
--- a/src/examples/evas/ply_files/Normal_UVs_NoColors.ply
+++ b/src/examples/evas/resources/models/Normal_UVs_NoColors.ply
diff --git a/src/examples/evas/eagle.md2 b/src/examples/evas/resources/models/eagle.md2
index c72647a..c72647a 100644
--- a/src/examples/evas/eagle.md2
+++ b/src/examples/evas/resources/models/eagle.md2
Binary files differ
diff --git a/src/examples/evas/mesh_mmap_set/mesh.eet b/src/examples/evas/resources/models/mesh_for_mmap.eet
index b4518f7..b4518f7 100644
--- a/src/examples/evas/mesh_mmap_set/mesh.eet
+++ b/src/examples/evas/resources/models/mesh_for_mmap.eet
Binary files differ
diff --git a/src/examples/evas/mesh_mmap_set/mesh.md2 b/src/examples/evas/resources/models/mesh_for_mmap.md2
index b3cd300..b3cd300 100644
--- a/src/examples/evas/mesh_mmap_set/mesh.md2
+++ b/src/examples/evas/resources/models/mesh_for_mmap.md2
Binary files differ
diff --git a/src/examples/evas/mesh_mmap_set/mesh.mtl b/src/examples/evas/resources/models/mesh_for_mmap.mtl
index 10bcab6..10bcab6 100644
--- a/src/examples/evas/mesh_mmap_set/mesh.mtl
+++ b/src/examples/evas/resources/models/mesh_for_mmap.mtl
diff --git a/src/examples/evas/mesh_mmap_set/mesh.obj b/src/examples/evas/resources/models/mesh_for_mmap.obj
index 85b71b2..85b71b2 100644
--- a/src/examples/evas/mesh_mmap_set/mesh.obj
+++ b/src/examples/evas/resources/models/mesh_for_mmap.obj
diff --git a/src/examples/evas/mesh_mmap_set/mesh.ply b/src/examples/evas/resources/models/mesh_for_mmap.ply
index 121061e..121061e 100644
--- a/src/examples/evas/mesh_mmap_set/mesh.ply
+++ b/src/examples/evas/resources/models/mesh_for_mmap.ply
diff --git a/src/examples/evas/sonic.md2 b/src/examples/evas/resources/models/sonic.md2
index 228edb9..228edb9 100644
--- a/src/examples/evas/sonic.md2
+++ b/src/examples/evas/resources/models/sonic.md2
Binary files differ
diff --git a/src/examples/evas/obj_files/sweet_home.mtl b/src/examples/evas/resources/models/sweet_home.mtl
index c3342d4..c3342d4 100644
--- a/src/examples/evas/obj_files/sweet_home.mtl
+++ b/src/examples/evas/resources/models/sweet_home.mtl
diff --git a/src/examples/evas/obj_files/sweet_home.obj b/src/examples/evas/resources/models/sweet_home.obj
index 1a52b93..1a52b93 100644
--- a/src/examples/evas/obj_files/sweet_home.obj
+++ b/src/examples/evas/resources/models/sweet_home.obj
diff --git a/src/examples/evas/obj_files/sweet_home_only_vertex_coords.mtl b/src/examples/evas/resources/models/sweet_home_only_vertex_coords.mtl
index 19d1272..19d1272 100644
--- a/src/examples/evas/obj_files/sweet_home_only_vertex_coords.mtl
+++ b/src/examples/evas/resources/models/sweet_home_only_vertex_coords.mtl
diff --git a/src/examples/evas/obj_files/sweet_home_only_vertex_coords.obj b/src/examples/evas/resources/models/sweet_home_only_vertex_coords.obj
index 675b032..675b032 100644
--- a/src/examples/evas/obj_files/sweet_home_only_vertex_coords.obj
+++ b/src/examples/evas/resources/models/sweet_home_only_vertex_coords.obj
diff --git a/src/examples/evas/obj_files/sweet_home_without_normals.mtl b/src/examples/evas/resources/models/sweet_home_without_normals.mtl
index c3342d4..c3342d4 100644
--- a/src/examples/evas/obj_files/sweet_home_without_normals.mtl
+++ b/src/examples/evas/resources/models/sweet_home_without_normals.mtl
diff --git a/src/examples/evas/obj_files/sweet_home_without_normals.obj b/src/examples/evas/resources/models/sweet_home_without_normals.obj
index a535ece..a535ece 100644
--- a/src/examples/evas/obj_files/sweet_home_without_normals.obj
+++ b/src/examples/evas/resources/models/sweet_home_without_normals.obj
diff --git a/src/examples/evas/obj_files/sweet_home_without_tex_coords.mtl b/src/examples/evas/resources/models/sweet_home_without_tex_coords.mtl
index 19d1272..19d1272 100644
--- a/src/examples/evas/obj_files/sweet_home_without_tex_coords.mtl
+++ b/src/examples/evas/resources/models/sweet_home_without_tex_coords.mtl
diff --git a/src/examples/evas/obj_files/sweet_home_without_tex_coords.obj b/src/examples/evas/resources/models/sweet_home_without_tex_coords.obj
index 50339a2..50339a2 100644
--- a/src/examples/evas/obj_files/sweet_home_without_tex_coords.obj
+++ b/src/examples/evas/resources/models/sweet_home_without_tex_coords.obj
diff --git a/src/examples/evas/sonic.eet b/src/examples/evas/sonic.eet
deleted file mode 100644
index e1fa9ef..0000000
--- a/src/examples/evas/sonic.eet
+++ /dev/null
Binary files differ