summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorBogdan Devichev <b.devichev@samsung.com>2014-11-27 17:19:24 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-12-23 21:16:07 +0100
commitaaddf1a963c7e3b8aef18c4f366c8e9f8bf43e66 (patch)
tree696fc6fac8f2d4403a833b77ff135c329675e7d8 /src/lib/evas/canvas
parent02c85b9fe8d9acb2802210eb65bca450f21c5712 (diff)
evas: Evas_3D_Mesh_File_Type sank into oblivion. Changing entry point to model_save_load. Changing API in examples.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.c9
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.eo2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c
index 572da9dd04..3e14e3a164 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -802,18 +802,19 @@ _evas_3d_mesh_blending_func_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd,
802} 802}
803 803
804EOLIAN static void 804EOLIAN static void
805_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) 805_evas_3d_mesh_file_set(Eo *obj, Evas_3D_Mesh_Data *pd,
806 const char *file, const char *key EINA_UNUSED)
806{ 807{
807 _mesh_fini(pd); 808 _mesh_fini(pd);
808 _mesh_init(pd); 809 _mesh_init(pd);
809 810
810 if (file == NULL) return; 811 if (file == NULL) return;
811 812
812 evas_common_load_model_to_file(obj, file, type); 813 evas_common_load_model_to_file(obj, file);
813} 814}
814 815
815EOLIAN static void 816EOLIAN static void
816_evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Mesh_File_Type type, 817_evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd,
817 const char *file, const char *key EINA_UNUSED) 818 const char *file, const char *key EINA_UNUSED)
818{ 819{
819 if ((file == NULL) || (obj == NULL) || (pd == NULL)) return; 820 if ((file == NULL) || (obj == NULL) || (pd == NULL)) return;
@@ -826,7 +827,7 @@ _evas_3d_mesh_save(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Mesh_File_Type type,
826 return; 827 return;
827 } 828 }
828 829
829 evas_common_save_model_to_file(obj, file, f, type); 830 evas_common_save_model_to_file(obj, file, f);
830} 831}
831 832
832static inline void 833static inline void
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo
index 0fdf1a2517..5bf623a994 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 }