summaryrefslogtreecommitdiff
path: root/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-07-14 11:19:35 +0100
committerTom Hacohen <tom@stosb.com>2015-08-04 10:57:14 +0100
commit60b16be772bfa5d799dd405deb66c4dd85bd76ab (patch)
tree8078c46a13f94befeb29f2a4b94f10033420682c /src/modules/evas/model_loaders/eet/evas_model_load_eet.c
parent086a501be6d5f25c4e91d3de143984d78b4b83a0 (diff)
Evas canvas3d: Move evas 3d types to evas_types.eot
Summary: Move evas_canvas3d types from Evas_Eo.h to evas_types.eot Change enum constatnt for vertex_arrtib, material_attrib, blend_func Correct namespace for Evas.Real type Reviewers: cedric, tasn Reviewed By: tasn Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2734
Diffstat (limited to '')
-rw-r--r--src/modules/evas/model_loaders/eet/evas_model_load_eet.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
index 803846d244..a36dff4f34 100644
--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
@@ -23,17 +23,17 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
23 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), 23 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
24 evas_canvas3d_mesh_frame_add(0), 24 evas_canvas3d_mesh_frame_add(0),
25 25
26 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION, 0, NULL), 26 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
27 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL, 0, NULL), 27 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
28 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD, 0, NULL), 28 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
29 29
30 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_POSITION), 30 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
31 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_NORMAL), 31 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
32 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_TEXCOORD), 32 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
33 33
34 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_POSITION), 34 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
35 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_NORMAL), 35 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
36 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_TEXCOORD)); 36 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
37 37
38 if (stride_pos == 0) stride_pos = sizeof(float) * 3; 38 if (stride_pos == 0) stride_pos = sizeof(float) * 3;
39 if (stride_nor == 0) stride_nor = sizeof(float) * 3; 39 if (stride_nor == 0) stride_nor = sizeof(float) * 3;
@@ -62,9 +62,9 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
62 62
63 /* unmap vertex buffer */ 63 /* unmap vertex buffer */
64 eo_do(mesh, 64 eo_do(mesh,
65 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_POSITION), 65 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
66 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_NORMAL), 66 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
67 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_TEXCOORD)); 67 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
68} 68}
69 69
70void 70void
@@ -76,24 +76,24 @@ _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
76 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); 76 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
77 77
78 eo_do(material, 78 eo_do(material,
79 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 79 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
80 !!(eet_mesh->materials->colors[0].a > 0)), 80 !!(eet_mesh->materials->colors[0].a > 0)),
81 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 81 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
82 !!(eet_mesh->materials->colors[1].a > 0)), 82 !!(eet_mesh->materials->colors[1].a > 0)),
83 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 83 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
84 !!(eet_mesh->materials->colors[2].a > 0)), 84 !!(eet_mesh->materials->colors[2].a > 0)),
85 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 85 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
86 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 86 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
87 eet_mesh->materials->colors[0].r, 87 eet_mesh->materials->colors[0].r,
88 eet_mesh->materials->colors[0].g, 88 eet_mesh->materials->colors[0].g,
89 eet_mesh->materials->colors[0].b, 89 eet_mesh->materials->colors[0].b,
90 eet_mesh->materials->colors[0].a), 90 eet_mesh->materials->colors[0].a),
91 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 91 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
92 eet_mesh->materials->colors[1].r, 92 eet_mesh->materials->colors[1].r,
93 eet_mesh->materials->colors[1].g, 93 eet_mesh->materials->colors[1].g,
94 eet_mesh->materials->colors[1].b, 94 eet_mesh->materials->colors[1].b,
95 eet_mesh->materials->colors[1].a), 95 eet_mesh->materials->colors[1].a),
96 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 96 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
97 eet_mesh->materials->colors[2].r, 97 eet_mesh->materials->colors[2].r,
98 eet_mesh->materials->colors[2].g, 98 eet_mesh->materials->colors[2].g,
99 eet_mesh->materials->colors[2].b, 99 eet_mesh->materials->colors[2].b,