summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_canvas3d_mesh.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_mesh.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index 84403c3..d19a1fc 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -163,7 +163,7 @@ _mesh_node_geometry_change_notify(const Eina_Hash *hash EINA_UNUSED, const void
163 void *data EINA_UNUSED, void *fdata) 163 void *data EINA_UNUSED, void *fdata)
164{ 164{
165 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; 165 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
166 eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata)); 166 evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata);
167 return EINA_TRUE; 167 return EINA_TRUE;
168} 168}
169 169
@@ -172,7 +172,7 @@ _mesh_node_material_change_notify(const Eina_Hash *hash EINA_UNUSED, const void
172 void *data EINA_UNUSED, void *fdata) 172 void *data EINA_UNUSED, void *fdata)
173{ 173{
174 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; 174 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
175 eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata)); 175 evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata);
176 return EINA_TRUE; 176 return EINA_TRUE;
177} 177}
178 178
@@ -201,7 +201,7 @@ _evas_canvas3d_mesh_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, Evas
201 { 201 {
202 if (f->material) 202 if (f->material)
203 { 203 {
204 eo_do(f->material, evas_canvas3d_object_update()); 204 evas_canvas3d_object_update(f->material);
205 } 205 }
206 } 206 }
207} 207}
@@ -261,8 +261,8 @@ evas_canvas3d_mesh_add(Evas *e)
261EOLIAN static Eo * 261EOLIAN static Eo *
262_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 262_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
263{ 263{
264 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 264 obj = eo_constructor(eo_super(obj, MY_CLASS));
265 eo_do (obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MESH)); 265 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
266 _mesh_init(pd); 266 _mesh_init(pd);
267 267
268 return obj; 268 return obj;
@@ -272,7 +272,7 @@ EOLIAN static void
272_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 272_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
273{ 273{
274 _mesh_fini(pd); 274 _mesh_fini(pd);
275 eo_do_super(obj, MY_CLASS, eo_destructor()); 275 eo_destructor(eo_super(obj, MY_CLASS));
276} 276}
277 277
278EOLIAN static void 278EOLIAN static void
@@ -281,7 +281,7 @@ _evas_canvas3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data
281 if (pd->shade_mode != mode) 281 if (pd->shade_mode != mode)
282 { 282 {
283 pd->shade_mode = mode; 283 pd->shade_mode = mode;
284 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL)); 284 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL);
285 } 285 }
286} 286}
287 287
@@ -295,7 +295,7 @@ EOLIAN static void
295_evas_canvas3d_mesh_vertex_count_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, unsigned int count) 295_evas_canvas3d_mesh_vertex_count_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, unsigned int count)
296{ 296{
297 pd->vertex_count = count; 297 pd->vertex_count = count;
298 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL)); 298 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL);
299} 299}
300 300
301EOLIAN static unsigned int 301EOLIAN static unsigned int
@@ -333,7 +333,7 @@ _evas_canvas3d_mesh_frame_add(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame)
333 333
334 f->frame = frame; 334 f->frame = frame;
335 pd->frames = eina_list_append(pd->frames, f); 335 pd->frames = eina_list_append(pd->frames, f);
336 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL)); 336 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL);
337} 337}
338 338
339EOLIAN static void 339EOLIAN static void
@@ -349,7 +349,7 @@ _evas_canvas3d_mesh_frame_del(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame)
349 349
350 pd->frames = eina_list_remove(pd->frames, f); 350 pd->frames = eina_list_remove(pd->frames, f);
351 evas_canvas3d_mesh_frame_free(f); 351 evas_canvas3d_mesh_frame_free(f);
352 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL)); 352 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL);
353} 353}
354 354
355EOLIAN static void 355EOLIAN static void
@@ -374,7 +374,7 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
374 374
375 f->material = material; 375 f->material = material;
376 eo_ref(material); 376 eo_ref(material);
377 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL)); 377 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL);
378 evas_canvas3d_material_mesh_add(material, obj); 378 evas_canvas3d_material_mesh_add(material, obj);
379} 379}
380 380
@@ -477,7 +477,7 @@ _evas_canvas3d_mesh_frame_vertex_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
477 f->vertices[attrib].owns_data = EINA_FALSE; 477 f->vertices[attrib].owns_data = EINA_FALSE;
478 f->vertices[attrib].element_count = element_count; 478 f->vertices[attrib].element_count = element_count;
479 479
480 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL)); 480 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL);
481} 481}
482 482
483EOLIAN static void 483EOLIAN static void
@@ -601,7 +601,7 @@ _evas_canvas3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_Canvas3D_Mesh_Data
601 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame); 601 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame);
602 } 602 }
603 603
604 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL)); 604 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL);
605} 605}
606 606
607EOLIAN static void * 607EOLIAN static void *
@@ -671,7 +671,7 @@ _evas_canvas3d_mesh_index_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca
671 pd->indices = (void *)indices; 671 pd->indices = (void *)indices;
672 pd->owns_indices = EINA_FALSE; 672 pd->owns_indices = EINA_FALSE;
673 673
674 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL)); 674 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL);
675} 675}
676 676
677EOLIAN static void 677EOLIAN static void
@@ -758,7 +758,7 @@ EOLIAN static void
758_evas_canvas3d_mesh_vertex_assembly_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Vertex_Assembly assembly) 758_evas_canvas3d_mesh_vertex_assembly_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Vertex_Assembly assembly)
759{ 759{
760 pd->assembly = assembly; 760 pd->assembly = assembly;
761 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL)); 761 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL);
762} 762}
763 763
764EOLIAN static Evas_Canvas3D_Vertex_Assembly 764EOLIAN static Evas_Canvas3D_Vertex_Assembly
@@ -771,7 +771,7 @@ EOLIAN static void
771_evas_canvas3d_mesh_fog_color_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) 771_evas_canvas3d_mesh_fog_color_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a)
772{ 772{
773 evas_color_set(&pd->fog_color, r, g, b, a); 773 evas_color_set(&pd->fog_color, r, g, b, a);
774 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL)); 774 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL);
775} 775}
776 776
777EOLIAN static void 777EOLIAN static void
@@ -788,7 +788,7 @@ EOLIAN static void
788_evas_canvas3d_mesh_fog_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled) 788_evas_canvas3d_mesh_fog_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled)
789{ 789{
790 pd->fog_enabled = enabled; 790 pd->fog_enabled = enabled;
791 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL)); 791 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL);
792} 792}
793 793
794EOLIAN static Eina_Bool 794EOLIAN static Eina_Bool
@@ -801,7 +801,7 @@ EOLIAN static void
801_evas_canvas3d_mesh_blending_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool blending) 801_evas_canvas3d_mesh_blending_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool blending)
802{ 802{
803 pd->blending = blending; 803 pd->blending = blending;
804 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL)); 804 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL);
805} 805}
806 806
807EOLIAN static Eina_Bool 807EOLIAN static Eina_Bool
@@ -815,7 +815,7 @@ _evas_canvas3d_mesh_blending_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas
815{ 815{
816 pd->blend_sfactor = sfactor; 816 pd->blend_sfactor = sfactor;
817 pd->blend_dfactor = dfactor; 817 pd->blend_dfactor = dfactor;
818 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL)); 818 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL);
819} 819}
820 820
821EOLIAN static void 821EOLIAN static void
@@ -834,7 +834,7 @@ _evas_canvas3d_mesh_alpha_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca
834 return; 834 return;
835 pd->alpha_comparison = comparison; 835 pd->alpha_comparison = comparison;
836 pd->alpha_ref_value = ref_value; 836 pd->alpha_ref_value = ref_value;
837 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL)); 837 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL);
838} 838}
839 839
840EOLIAN static void 840EOLIAN static void
@@ -850,7 +850,7 @@ EOLIAN static void
850_evas_canvas3d_mesh_alpha_test_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled) 850_evas_canvas3d_mesh_alpha_test_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled)
851{ 851{
852 pd->alpha_test_enabled = enabled; 852 pd->alpha_test_enabled = enabled;
853 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL)); 853 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL);
854} 854}
855 855
856EOLIAN static Eina_Bool 856EOLIAN static Eina_Bool
@@ -1087,7 +1087,7 @@ _evas_canvas3d_mesh_color_pick_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
1087{ 1087{
1088 if (pd->color_pick_enabled != enabled) 1088 if (pd->color_pick_enabled != enabled)
1089 pd->color_pick_enabled = enabled; 1089 pd->color_pick_enabled = enabled;
1090 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL)); 1090 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL);
1091} 1091}
1092 1092
1093EOLIAN static void 1093EOLIAN static void
@@ -1098,7 +1098,7 @@ _evas_canvas3d_mesh_shadows_edges_filtering_set(Eo *obj, Evas_Canvas3D_Mesh_Data
1098 pd->shadows_edges_filtering_level = blur_level; 1098 pd->shadows_edges_filtering_level = blur_level;
1099 if (edges_size >= 0) 1099 if (edges_size >= 0)
1100 pd->shadows_edges_size = edges_size; 1100 pd->shadows_edges_size = edges_size;
1101 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL)); 1101 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL);
1102} 1102}
1103 1103
1104EOLIAN static void 1104EOLIAN static void
@@ -1116,7 +1116,7 @@ _evas_canvas3d_mesh_shadows_constant_bias_set(Eo *obj EINA_UNUSED, Evas_Canvas3D
1116 if (pd->shadows_constant_bias != bias) 1116 if (pd->shadows_constant_bias != bias)
1117 { 1117 {
1118 pd->shadows_constant_bias = bias; 1118 pd->shadows_constant_bias = bias;
1119 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL)); 1119 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL);
1120 } 1120 }
1121} 1121}
1122 1122