summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogdan Devichev <b.devichev@samsung.com>2014-11-27 17:19:24 +0200
committerBogdan Devichev <b.devichev@samsung.com>2014-12-05 11:10:52 +0200
commit42562b3ddf4552de7ef002e19e816165bfe9301e (patch)
tree5104eaed74beddd2c794b23bf627e41a83266f64
parent291291e027ade52033670f5b09cab4712926bf0b (diff)
Model_save_load. Step 4. Evas_3D_Mesh_File_Type sank into oblivion. Changing entry point to model_save_load. Changing API in examples.
-rw-r--r--src/examples/evas/evas-3d-aabb.c2
-rw-r--r--src/examples/evas/evas-3d-eet.c7
-rw-r--r--src/examples/evas/evas-3d-frustum.c2
-rw-r--r--src/examples/evas/evas-3d-md2.c2
-rw-r--r--src/examples/evas/evas-3d-obj.c4
-rw-r--r--src/examples/evas/evas-3d-ply.c6
-rw-r--r--src/examples/evas/evas-3d-shadows.c2
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c6
-rw-r--r--src/lib/evas/Evas_Eo.h15
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.c9
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.eo2
-rw-r--r--src/lib/evas/common/evas_model_load.c38
-rw-r--r--src/lib/evas/common/evas_model_save.c34
-rw-r--r--src/lib/evas/include/evas_private.h4
14 files changed, 59 insertions, 74 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index c26cda57c2..6210fa2b49 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -227,7 +227,7 @@ main(void)
227 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 227 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
228 228
229 eo_do(mesh, 229 eo_do(mesh,
230 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL), 230 evas_3d_mesh_file_set("sonic.md2", NULL),
231 evas_3d_mesh_frame_material_set(0, material), 231 evas_3d_mesh_frame_material_set(0, material),
232 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 232 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
233 233
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index e4b7c141ef..96ab16bf29 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -151,7 +151,7 @@ main(void)
151 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 151 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
152 152
153 eo_do(mesh, 153 eo_do(mesh,
154 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL), 154 evas_3d_mesh_file_set("sonic.md2", NULL),
155 evas_3d_mesh_frame_material_set(0, material), 155 evas_3d_mesh_frame_material_set(0, material),
156 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 156 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
157 157
@@ -169,11 +169,10 @@ main(void)
169 evas_3d_material_shininess_set(50.0)); 169 evas_3d_material_shininess_set(50.0));
170 170
171 eo_do(mesh, 171 eo_do(mesh,
172 evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_EET, 172 evas_3d_mesh_save("saved_Sonic_EET.eet", NULL));
173 "saved_Sonic_EET.eet", NULL));
174 173
175 eo_do(mesh2, 174 eo_do(mesh2,
176 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_EET, "saved_Sonic_EET.eet", NULL), 175 evas_3d_mesh_file_set("saved_Sonic_EET.eet", NULL),
177 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 176 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
178 177
179 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 be81addc9f..28b4ec4444 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -175,7 +175,7 @@ _mesh_setup_model(Scene_Data *data)
175 evas_3d_material_shininess_set(100.0)); 175 evas_3d_material_shininess_set(100.0));
176 176
177 eo_do(data->mesh_model, 177 eo_do(data->mesh_model,
178 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "eagle.md2", NULL), 178 evas_3d_mesh_file_set("eagle.md2", NULL),
179 evas_3d_mesh_frame_material_set(0, data->material_model), 179 evas_3d_mesh_frame_material_set(0, data->material_model),
180 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); 180 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE));
181} 181}
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 26f8e71c49..4b53c2e1c4 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -120,7 +120,7 @@ main(void)
120 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 120 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
121 121
122 eo_do(mesh, 122 eo_do(mesh,
123 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL), 123 evas_3d_mesh_file_set("sonic.md2", NULL),
124 evas_3d_mesh_frame_material_set(0, material), 124 evas_3d_mesh_frame_material_set(0, material),
125 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 125 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
126 126
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 0fced88268..2634502355 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -134,7 +134,7 @@ main(void)
134 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 134 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
135 135
136 eo_do(mesh, 136 eo_do(mesh,
137 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_OBJ, "man_mesh.obj", NULL), 137 evas_3d_mesh_file_set("man_mesh.obj", NULL),
138 evas_3d_mesh_frame_material_set(0, material), 138 evas_3d_mesh_frame_material_set(0, material),
139 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 139 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
140 140
@@ -159,7 +159,7 @@ main(void)
159 1.0, 1.0, 1.0, 1.0), 159 1.0, 1.0, 1.0, 1.0),
160 evas_3d_material_shininess_set(50.0)); 160 evas_3d_material_shininess_set(50.0));
161 161
162 eo_do(mesh, evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_OBJ, "saved_man", NULL)); 162 eo_do(mesh, evas_3d_mesh_save("saved_man", NULL));
163 163
164 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 164 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas,
165 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 165 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 4685413bcb..75505cd341 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -189,16 +189,16 @@ main(void)
189 mesh[i] = eo_add(EVAS_3D_MESH_CLASS, evas); 189 mesh[i] = eo_add(EVAS_3D_MESH_CLASS, evas);
190 190
191 eo_do(mesh[i], 191 eo_do(mesh[i],
192 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_PLY, path_file[i % 8], NULL), 192 evas_3d_mesh_file_set(path_file[i % 8], NULL),
193 evas_3d_mesh_frame_material_set(0, material), 193 evas_3d_mesh_frame_material_set(0, material),
194 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8])); 194 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8]));
195 195
196 snprintf(buffer, PATH_MAX, "%s/Saved_%s", folder, file_name[i % 8]); 196 snprintf(buffer, PATH_MAX, "%s/Saved_%s", folder, file_name[i % 8]);
197 eo_do(mesh[i], evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_PLY, buffer, NULL)); 197 eo_do(mesh[i], evas_3d_mesh_save(buffer, NULL));
198 198
199 if (i > 15) 199 if (i > 15)
200 eo_do(mesh[i], 200 eo_do(mesh[i],
201 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_PLY, path_file[i % 8], NULL), 201 evas_3d_mesh_file_set(path_file[i % 8], NULL),
202 evas_3d_mesh_frame_material_set(0, material), 202 evas_3d_mesh_frame_material_set(0, material),
203 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8])); 203 evas_3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8]));
204 204
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 332bc83a8b..142a98eb35 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -219,7 +219,7 @@ main(void)
219 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 219 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
220 220
221 eo_do(mesh, 221 eo_do(mesh,
222 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL), 222 evas_3d_mesh_file_set("sonic.md2", NULL),
223 evas_3d_mesh_frame_material_set(0, material), 223 evas_3d_mesh_frame_material_set(0, material),
224 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 224 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG));
225 225
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index a5fcc91f9d..3fa1d2a1ad 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -841,7 +841,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
841 841
842 data->mesh_eagle = eo_add(EVAS_3D_MESH_CLASS, evas); 842 data->mesh_eagle = eo_add(EVAS_3D_MESH_CLASS, evas);
843 eo_do(data->mesh_eagle, 843 eo_do(data->mesh_eagle,
844 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_OBJ, "shooter/eagle.obj", NULL)); 844 evas_3d_mesh_file_set("shooter/eagle.obj", NULL));
845 845
846 data->material_eagle = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 846 data->material_eagle = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
847 847
@@ -1295,7 +1295,7 @@ _mesh_setup_warrior(Scene_Data *data, int index)
1295 data->mesh_level[index] = eo_add(EVAS_3D_MESH_CLASS, evas); 1295 data->mesh_level[index] = eo_add(EVAS_3D_MESH_CLASS, evas);
1296 1296
1297 eo_do(data->mesh_level[index], 1297 eo_do(data->mesh_level[index],
1298 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "shooter/warrior.md2", NULL)); 1298 evas_3d_mesh_file_set("shooter/warrior.md2", NULL));
1299 1299
1300 data->material_level = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 1300 data->material_level = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
1301 eo_do(data->mesh_level[index], 1301 eo_do(data->mesh_level[index],
@@ -1329,7 +1329,7 @@ _mesh_setup_snake(Scene_Data *data)
1329{ 1329{
1330 data->mesh_snake = eo_add(EVAS_3D_MESH_CLASS, evas); 1330 data->mesh_snake = eo_add(EVAS_3D_MESH_CLASS, evas);
1331 eo_do(data->mesh_snake, 1331 eo_do(data->mesh_snake,
1332 evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "shooter/snake.md2", NULL)); 1332 evas_3d_mesh_file_set("shooter/snake.md2", NULL));
1333 1333
1334 data->material_snake = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 1334 data->material_snake = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
1335 eo_do(data->mesh_snake, 1335 eo_do(data->mesh_snake,
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index fd48f7468b..da6b827bce 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -720,21 +720,6 @@ typedef enum _Evas_3D_Material_Attrib
720 EVAS_3D_MATERIAL_NORMAL, /**< Normal map term */ 720 EVAS_3D_MATERIAL_NORMAL, /**< Normal map term */
721} Evas_3D_Material_Attrib; 721} Evas_3D_Material_Attrib;
722 722
723/**
724 * Mesh file type
725 *
726 * @since 1.10
727 * @ingroup Evas_3D_Types
728 */
729typedef enum _Evas_3D_Mesh_File_Type
730{
731 EVAS_3D_MESH_FILE_TYPE_NONE = 0, /**< Noone from read formats */
732 EVAS_3D_MESH_FILE_TYPE_MD2, /**< Quake's MD2 mesh file format */
733 EVAS_3D_MESH_FILE_TYPE_OBJ, /**< Wavefront OBJ file format */
734 EVAS_3D_MESH_FILE_TYPE_EET, /**< EET - own EFL file format */
735 EVAS_3D_MESH_FILE_TYPE_PLY, /**< Stanford PLY mesh file format */
736} Evas_3D_Mesh_File_Type;
737
738#include "canvas/evas_image.eo.h" 723#include "canvas/evas_image.eo.h"
739 724
740#include "canvas/evas_3d_camera.eo.h" 725#include "canvas/evas_3d_camera.eo.h"
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c
index 66f6e0704e..36c38c3a72 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -770,18 +770,19 @@ _evas_3d_mesh_fog_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd)
770} 770}
771 771
772EOLIAN static void 772EOLIAN static void
773_evas_3d_mesh_file_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Mesh_File_Type type, const char *file, const char *key EINA_UNUSED) 773_evas_3d_mesh_file_set(Eo *obj, Evas_3D_Mesh_Data *pd,
774 const char *file, const char *key EINA_UNUSED)
774{ 775{
775 _mesh_fini(pd); 776 _mesh_fini(pd);
776 _mesh_init(pd); 777 _mesh_init(pd);
777 778
778 if (file == NULL) return; 779 if (file == NULL) return;
779 780
780 evas_common_load_model_to_file(obj, file, type); 781 evas_common_load_model_to_file(obj, file);
781} 782}
782 783
783EOLIAN static void 784EOLIAN static void
784_evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Mesh_File_Type type, 785_evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd,
785 const char *file, const char *key EINA_UNUSED) 786 const char *file, const char *key EINA_UNUSED)
786{ 787{
787 if ((file == NULL) || (obj == NULL) || (pd == NULL)) return; 788 if ((file == NULL) || (obj == NULL) || (pd == NULL)) return;
@@ -794,7 +795,7 @@ _evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Mesh_File_Type type,
794 return; 795 return;
795 } 796 }
796 797
797 evas_common_save_model_to_file(obj, file, f, type); 798 evas_common_save_model_to_file(obj, file, f);
798} 799}
799 800
800static inline void 801static inline void
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo
index 66d4f69fa8..f2b420aebb 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_3d_mesh.eo
@@ -14,7 +14,6 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface)
14 * @ingroup Evas_3D_Mesh 14 * @ingroup Evas_3D_Mesh
15 */ 15 */
16 params { 16 params {
17 @in Evas_3D_Mesh_File_Type type; /*@ The type of the mesh file. */
18 @in const(char)* file; /*@ Path to the mesh file. */ 17 @in const(char)* file; /*@ Path to the mesh file. */
19 @in const(char)* key; /*@ Key in the mesh file. */ 18 @in const(char)* key; /*@ Key in the mesh file. */
20 } 19 }
@@ -30,7 +29,6 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface)
30 * @ingroup Evas_3D_Mesh 29 * @ingroup Evas_3D_Mesh
31 */ 30 */
32 params { 31 params {
33 @in Evas_3D_Mesh_File_Type type; /*@ The type of the mesh file. */
34 @in const(char)* file; /*@ Path to the mesh file. */ 32 @in const(char)* file; /*@ Path to the mesh file. */
35 @in const(char)* key; /*@ Key in the mesh file. */ 33 @in const(char)* key; /*@ Key in the mesh file. */
36 } 34 }
diff --git a/src/lib/evas/common/evas_model_load.c b/src/lib/evas/common/evas_model_load.c
index 1f35cb0d97..73503776d4 100644
--- a/src/lib/evas/common/evas_model_load.c
+++ b/src/lib/evas/common/evas_model_load.c
@@ -9,26 +9,26 @@
9 9
10 10
11void 11void
12evas_common_load_model_to_file(Evas_3D_Mesh *model, 12evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file)
13 const char *file,
14 Evas_3D_Mesh_File_Type type)
15{ 13{
16 switch (type) 14 char *p;
15 char *loader = NULL;
16
17 p = strrchr(file, '.');
18 if (p)
17 { 19 {
18 case EVAS_3D_MESH_FILE_TYPE_MD2: 20 p++;
19 evas_model_load_file_md2(model, file); 21#define CHECK_EXTENTION_BY_FILE_NAME(extention) \
20 break; 22 if (!strcasecmp(p, #extention)) \
21 case EVAS_3D_MESH_FILE_TYPE_OBJ: 23 { \
22 evas_model_load_file_obj(model, file); 24 evas_model_load_file_##extention(model, file); \
23 break; 25 loader = #extention; \
24 case EVAS_3D_MESH_FILE_TYPE_EET: 26 }
25 evas_model_load_file_eet(model, file); 27 CHECK_EXTENTION_BY_FILE_NAME(eet)
26 break; 28 CHECK_EXTENTION_BY_FILE_NAME(md2)
27 case EVAS_3D_MESH_FILE_TYPE_PLY: 29 CHECK_EXTENTION_BY_FILE_NAME(obj)
28 evas_model_load_file_ply(model, file); 30 CHECK_EXTENTION_BY_FILE_NAME(ply)
29 break; 31#undef CHECK_EXTENTION_BY_FILE_NAME
30 default:
31 ERR("Invalid mesh file type.");
32 break;
33 } 32 }
33 if (!loader) ERR("Invalid mesh file type.");
34} 34}
diff --git a/src/lib/evas/common/evas_model_save.c b/src/lib/evas/common/evas_model_save.c
index 85b9b4113f..7ab39702bf 100644
--- a/src/lib/evas/common/evas_model_save.c
+++ b/src/lib/evas/common/evas_model_save.c
@@ -7,26 +7,28 @@
7#include "evas_common_private.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10
11void 10void
12evas_common_save_model_to_file(Evas_3D_Mesh *model, 11evas_common_save_model_to_file(Evas_3D_Mesh *model,
13 const char *file, 12 const char *file,
14 Evas_3D_Mesh_Frame *f, 13 Evas_3D_Mesh_Frame *f)
15 Evas_3D_Mesh_File_Type type)
16{ 14{
17 switch (type) 15 char *p;
16 char *saver = NULL;
17
18 p = strrchr(file, '.');
19 if (p)
18 { 20 {
19 case EVAS_3D_MESH_FILE_TYPE_OBJ: 21 p++;
20 evas_model_save_file_obj(model, file, f); 22#define CHECK_EXTENTION_BY_FILE_NAME(extention) \
21 break; 23 if (!strcasecmp(p, #extention)) \
22 case EVAS_3D_MESH_FILE_TYPE_EET: 24 { \
23 evas_model_save_file_eet(model, file, f); 25 evas_model_save_file_##extention(model, file, f); \
24 break; 26 saver = #extention; \
25 case EVAS_3D_MESH_FILE_TYPE_PLY: 27 }
26 evas_model_save_file_ply(model, file, f); 28 CHECK_EXTENTION_BY_FILE_NAME(eet)
27 break; 29 CHECK_EXTENTION_BY_FILE_NAME(obj)
28 default: 30 CHECK_EXTENTION_BY_FILE_NAME(ply)
29 ERR("Invalid mesh file type."); 31#undef CHECK_EXTENTION_BY_FILE_NAME
30 break;
31 } 32 }
33 if (!saver) ERR("Invalid mesh file type.");
32} 34}
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index d5f9dba9e2..3fbf5b5441 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1637,8 +1637,8 @@ void _evas_3d_eet_descriptor_shutdown(void);
1637void _evas_3d_eet_file_free(void); 1637void _evas_3d_eet_file_free(void);
1638 1638
1639/* Temporary save/load functions */ 1639/* Temporary save/load functions */
1640void evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file, Evas_3D_Mesh_File_Type type); 1640void evas_common_load_model_to_file(Evas_3D_Mesh *model, const char *file);
1641void evas_common_save_model_to_file(Evas_3D_Mesh *model, const char *file, Evas_3D_Mesh_Frame *f, Evas_3D_Mesh_File_Type type); 1641void evas_common_save_model_to_file(Evas_3D_Mesh *model, const char *file, Evas_3D_Mesh_Frame *f);
1642void evas_model_load_file_eet(Evas_3D_Mesh *mesh, const char *file); 1642void evas_model_load_file_eet(Evas_3D_Mesh *mesh, const char *file);
1643void evas_model_load_file_md2(Evas_3D_Mesh *mesh, const char *file); 1643void evas_model_load_file_md2(Evas_3D_Mesh *mesh, const char *file);
1644void evas_model_load_file_obj(Evas_3D_Mesh *mesh, const char *file); 1644void evas_model_load_file_obj(Evas_3D_Mesh *mesh, const char *file);