summaryrefslogtreecommitdiff
path: root/src/lib/evas/common3d/primitives/primitive_common.h
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
commitfa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215 (patch)
tree289d1f0e30abe7aeb9100ab9ed3e3a755d1c18b7 /src/lib/evas/common3d/primitives/primitive_common.h
parentb9a6a8e7384fc79fced2132407208abfedf77fe1 (diff)
Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations
Diffstat (limited to 'src/lib/evas/common3d/primitives/primitive_common.h')
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index 50092d7..63d2c69 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -19,13 +19,13 @@
19#define SET_VERTEX_DATA(frame) \ 19#define SET_VERTEX_DATA(frame) \
20 Eina_Bool frame_exist; \ 20 Eina_Bool frame_exist; \
21 eo_do(mesh, \ 21 eo_do(mesh, \
22 frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \ 22 frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
23 if (!frame_exist) \ 23 if (!frame_exist) \
24 eo_do(mesh, \ 24 eo_do(mesh, \
25 evas_canvas3d_mesh_frame_add(frame)); \ 25 evas_canvas3d_mesh_frame_add(mesh, frame)); \
26 eo_do(mesh, \ 26 eo_do(mesh, \
27 evas_canvas3d_mesh_vertex_count_set(vcount), \ 27 evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
28 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 28 evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
29 icount, &indices[0])); \ 29 icount, &indices[0])); \
30 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \ 30 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \
31 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \ 31 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \
@@ -36,13 +36,13 @@
36#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \ 36#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
37 Eina_Bool frame_exist; \ 37 Eina_Bool frame_exist; \
38 eo_do(mesh, \ 38 eo_do(mesh, \
39 frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \ 39 frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
40 if (!frame_exist) \ 40 if (!frame_exist) \
41 eo_do(mesh, \ 41 eo_do(mesh, \
42 evas_canvas3d_mesh_frame_add(frame)); \ 42 evas_canvas3d_mesh_frame_add(mesh, frame)); \
43 eo_do(mesh, \ 43 eo_do(mesh, \
44 evas_canvas3d_mesh_vertex_count_set(vcount), \ 44 evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
45 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 45 evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
46 icount, &indices[0])); \ 46 icount, &indices[0])); \
47 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \ 47 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \
48 0, 3, 15, vcount); \ 48 0, 3, 15, vcount); \