summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_canvas3d_mesh.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/evas/canvas/evas_canvas3d_mesh.c
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_mesh.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index e59497f..d9e5b68 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -213,7 +213,7 @@ void
213evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node) 213evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
214{ 214{
215 int count = 0; 215 int count = 0;
216 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS); 216 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
217 if (pd->nodes == NULL) 217 if (pd->nodes == NULL)
218 { 218 {
219 pd->nodes = eina_hash_pointer_new(NULL); 219 pd->nodes = eina_hash_pointer_new(NULL);
@@ -234,7 +234,7 @@ void
234evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node) 234evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
235{ 235{
236 int count = 0; 236 int count = 0;
237 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS); 237 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
238 if (pd->nodes == NULL) 238 if (pd->nodes == NULL)
239 { 239 {
240 ERR("No node to delete."); 240 ERR("No node to delete.");
@@ -256,14 +256,14 @@ evas_canvas3d_mesh_add(Evas *e)
256 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 256 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
257 return NULL; 257 return NULL;
258 MAGIC_CHECK_END(); 258 MAGIC_CHECK_END();
259 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 259 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
260 return eo_obj; 260 return eo_obj;
261} 261}
262 262
263EOLIAN static Eo * 263EOLIAN static Eo *
264_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 264_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
265{ 265{
266 obj = efl_constructor(eo_super(obj, MY_CLASS)); 266 obj = efl_constructor(efl_super(obj, MY_CLASS));
267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH); 267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
268 _mesh_init(pd); 268 _mesh_init(pd);
269 269
@@ -274,7 +274,7 @@ EOLIAN static void
274_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 274_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
275{ 275{
276 _mesh_fini(pd); 276 _mesh_fini(pd);
277 efl_destructor(eo_super(obj, MY_CLASS)); 277 efl_destructor(efl_super(obj, MY_CLASS));
278} 278}
279 279
280EOLIAN static void 280EOLIAN static void
@@ -371,11 +371,11 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
371 if (f->material) 371 if (f->material)
372 { 372 {
373 evas_canvas3d_material_mesh_del(f->material, obj); 373 evas_canvas3d_material_mesh_del(f->material, obj);
374 eo_unref(f->material); 374 efl_unref(f->material);
375 } 375 }
376 376
377 f->material = material; 377 f->material = material;
378 eo_ref(material); 378 efl_ref(material);
379 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL); 379 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL);
380 evas_canvas3d_material_mesh_add(material, obj); 380 evas_canvas3d_material_mesh_add(material, obj);
381} 381}
@@ -920,7 +920,7 @@ _evas_canvas3d_mesh_from_primitive_set(Eo *obj,
920{ 920{
921 if ((primitive == NULL) || (obj == NULL)) return; 921 if ((primitive == NULL) || (obj == NULL)) return;
922 922
923 Evas_Canvas3D_Primitive_Data *ppd = eo_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS); 923 Evas_Canvas3D_Primitive_Data *ppd = efl_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
924 924
925 evas_common_set_model_from_primitive(obj, frame, ppd); 925 evas_common_set_model_from_primitive(obj, frame, ppd);
926} 926}
@@ -968,7 +968,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame,
968{ 968{
969 Eina_List *left, *right; 969 Eina_List *left, *right;
970 Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1; 970 Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1;
971 Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 971 Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
972 972
973 left = pdmesh->frames; 973 left = pdmesh->frames;
974 right = eina_list_next(left); 974 right = eina_list_next(left);