summaryrefslogtreecommitdiff
path: root/src/lib/evas/common3d/primitives/primitive_common.h
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-06-17 16:31:14 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-17 17:52:17 +0200
commitd409df1caa38ae7eac87f85ff4113484bc5b2099 (patch)
tree2adcbeadf2f4b2e7f4e7ba327a574c6620c23663 /src/lib/evas/common3d/primitives/primitive_common.h
parent9bf6f14a8a59195fe9be004aaff446c51474fc5d (diff)
evas: change interface evas_3d to evas_canvas3d
Summary: Regard to https://phab.enlightenment.org/T2479 it is need for right generation Eolian files Reviewers: cedric Subscribers: cedric, tasn Differential Revision: https://phab.enlightenment.org/D2711 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/evas/common3d/primitives/primitive_common.h')
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index c2b47f3..fa05b6f 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -18,37 +18,37 @@
18 18
19#define SET_VERTEX_DATA(frame) \ 19#define SET_VERTEX_DATA(frame) \
20 eo_do(mesh, \ 20 eo_do(mesh, \
21 evas_3d_mesh_vertex_count_set(vcount), \ 21 evas_canvas3d_mesh_vertex_count_set(vcount), \
22 evas_3d_mesh_frame_add(frame), \ 22 evas_canvas3d_mesh_frame_add(frame), \
23 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 23 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
24 icount, &indices[0])); \ 24 icount, &indices[0])); \
25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_3D_VERTEX_POSITION); \ 25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_POSITION); \
26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_3D_VERTEX_NORMAL); \ 26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_NORMAL); \
27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_3D_VERTEX_TEXCOORD); \ 27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_CANVAS3D_VERTEX_TEXCOORD); \
28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_3D_VERTEX_TANGENT); \ 28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_CANVAS3D_VERTEX_TANGENT); \
29 free(indices); 29 free(indices);
30 30
31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \ 31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
32 eo_do(mesh, \ 32 eo_do(mesh, \
33 evas_3d_mesh_vertex_count_set(vcount), \ 33 evas_canvas3d_mesh_vertex_count_set(vcount), \
34 evas_3d_mesh_frame_add(frame), \ 34 evas_canvas3d_mesh_frame_add(frame), \
35 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 35 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
36 icount, &indices[0])); \ 36 icount, &indices[0])); \
37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_POSITION, \ 37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_POSITION, \
38 0, 3, 15, vcount); \ 38 0, 3, 15, vcount); \
39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_NORMAL, \ 39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_NORMAL, \
40 3, 3, 15, vcount); \ 40 3, 3, 15, vcount); \
41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_COLOR, \ 41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_COLOR, \
42 6, 4, 15, vcount); \ 42 6, 4, 15, vcount); \
43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_TEXCOORD, \ 43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TEXCOORD, \
44 10, 2, 15, vcount); \ 44 10, 2, 15, vcount); \
45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_TANGENT, \ 45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TANGENT, \
46 12, 3, 15, vcount); 46 12, 3, 15, vcount);
47 47
48void _generate_indices(unsigned short *indices, int count, int width); 48void _generate_indices(unsigned short *indices, int count, int width);
49void _set_vec3_vertex_data(Evas_3D_Mesh *mesh, int frame, int vcount, Evas_Vec3 *data, Evas_3D_Vertex_Attrib attr); 49void _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh, int frame, int vcount, Evas_Vec3 *data, Evas_Canvas3D_Vertex_Attrib attr);
50void _set_vec2_vertex_data(Evas_3D_Mesh *mesh, int frame, int vcount, Evas_Vec2 *data, Evas_3D_Vertex_Attrib attr); 50void _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh, int frame, int vcount, Evas_Vec2 *data, Evas_Canvas3D_Vertex_Attrib attr);
51void _set_vertex_data_from_array(Evas_3D_Mesh *mesh, int frame, const float *data, Evas_3D_Vertex_Attrib attr, int start, int attr_count, int line, int vcount); 51void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh, int frame, const float *data, Evas_Canvas3D_Vertex_Attrib attr, int start, int attr_count, int line, int vcount);
52 52
53void _primitives_vec3_copy(Evas_Vec3 *dst, const Evas_Vec3 *src); 53void _primitives_vec3_copy(Evas_Vec3 *dst, const Evas_Vec3 *src);
54void _primitives_vec3_subtract(Evas_Vec3 *out, const Evas_Vec3 *a, const Evas_Vec3 *b); 54void _primitives_vec3_subtract(Evas_Vec3 *out, const Evas_Vec3 *a, const Evas_Vec3 *b);