summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_load.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/edje/edje_load.c')
-rw-r--r--src/lib/edje/edje_load.c36
1 files changed, 14 insertions, 22 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index be94d78..87bbbf0 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -793,35 +793,30 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
793 Evas_Canvas3D_Material *material = NULL; 793 Evas_Canvas3D_Material *material = NULL;
794 Edje_Part_Description_Mesh_Node *pd_mesh_node; 794 Edje_Part_Description_Mesh_Node *pd_mesh_node;
795 795
796 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, 796 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
797 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
798 797
799 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas); 798 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas);
800 eo_do(rp->node, evas_canvas3d_node_mesh_add(mesh)); 799 evas_canvas3d_node_mesh_add(rp->node, mesh);
801 800
802 pd_mesh_node = (Edje_Part_Description_Mesh_Node*) rp->chosen_description; 801 pd_mesh_node = (Edje_Part_Description_Mesh_Node*) rp->chosen_description;
803 802
804 if (pd_mesh_node->mesh_node.mesh.primitive == EVAS_CANVAS3D_MESH_PRIMITIVE_NONE) 803 if (pd_mesh_node->mesh_node.mesh.primitive == EVAS_CANVAS3D_MESH_PRIMITIVE_NONE)
805 { 804 {
806 eo_do(mesh, 805 efl_file_set(mesh, ed->file->model_dir->entries[pd_mesh_node->mesh_node.mesh.id].entry, NULL);
807 efl_file_set(ed->file->model_dir->entries[pd_mesh_node->mesh_node.mesh.id].entry, NULL));
808 } 806 }
809 else 807 else
810 { 808 {
811 eo_do(mesh, 809 evas_canvas3d_mesh_frame_add(mesh, 0);
812 evas_canvas3d_mesh_frame_add(0));
813 } 810 }
814 811
815 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, ed->base->evas); 812 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, ed->base->evas);
816 eo_do(mesh, 813 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
817 evas_canvas3d_mesh_frame_material_set(0, material));
818 if (pd_mesh_node->mesh_node.texture.need_texture && pd_mesh_node->mesh_node.texture.textured) 814 if (pd_mesh_node->mesh_node.texture.need_texture && pd_mesh_node->mesh_node.texture.textured)
819 { 815 {
820 Evas_Canvas3D_Texture *texture = NULL; 816 Evas_Canvas3D_Texture *texture = NULL;
821 817
822 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, ed->base->evas); 818 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, ed->base->evas);
823 eo_do(material, 819 evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture);
824 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture));
825 } 820 }
826 rp->object = NULL; 821 rp->object = NULL;
827 } 822 }
@@ -831,10 +826,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
831 { 826 {
832 Evas_Canvas3D_Light *light = NULL; 827 Evas_Canvas3D_Light *light = NULL;
833 828
834 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, 829 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
835 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
836 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas); 830 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas);
837 eo_do(rp->node, evas_canvas3d_node_light_set(light)); 831 evas_canvas3d_node_light_set(rp->node, light);
838 832
839 rp->object = NULL; 833 rp->object = NULL;
840 break; 834 break;
@@ -844,10 +838,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
844 { 838 {
845 Evas_Canvas3D_Camera *camera = NULL; 839 Evas_Canvas3D_Camera *camera = NULL;
846 840
847 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, 841 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
848 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
849 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas); 842 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas);
850 eo_do(rp->node, evas_canvas3d_node_camera_set(camera)); 843 evas_canvas3d_node_camera_set(rp->node, camera);
851 844
852 rp->object = evas_object_image_filled_add(ed->base->evas); 845 rp->object = evas_object_image_filled_add(ed->base->evas);
853 evas_object_resize(rp->object, ed->collection->scene_size.width, ed->collection->scene_size.height); 846 evas_object_resize(rp->object, ed->collection->scene_size.width, ed->collection->scene_size.height);
@@ -869,7 +862,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
869 } 862 }
870 863
871 if (ep->no_render) 864 if (ep->no_render)
872 eo_do(rp->object, evas_obj_no_render_set(1)); 865 evas_obj_no_render_set(rp->object, 1);
873 866
874 if (st_nested && st_nested->nested_children_count) /* Add this to list of children */ 867 if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
875 { 868 {
@@ -922,9 +915,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
922 evas_object_pass_events_set(rp->object, 1); 915 evas_object_pass_events_set(rp->object, 1);
923 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB); 916 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
924 } 917 }
925 eo_do(rp->object, 918 evas_obj_anti_alias_set(rp->object, ep->anti_alias);
926 evas_obj_anti_alias_set(ep->anti_alias), 919 evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside);
927 evas_obj_precise_is_inside_set(ep->precise_is_inside));
928 } 920 }
929 if (rp->part->clip_to_id < 0) 921 if (rp->part->clip_to_id < 0)
930 evas_object_clip_set(rp->object, ed->base->clipper); 922 evas_object_clip_set(rp->object, ed->base->clipper);
@@ -1718,7 +1710,7 @@ _edje_file_del(Edje *ed)
1718 free(runp); 1710 free(runp);
1719 } 1711 }
1720 _edje_animators = eina_list_remove(_edje_animators, ed); 1712 _edje_animators = eina_list_remove(_edje_animators, ed);
1721 eo_do(ed->obj, eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed)); 1713 eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
1722 ecore_animator_del(ed->animator); 1714 ecore_animator_del(ed->animator);
1723 ed->animator = NULL; 1715 ed->animator = NULL;
1724 1716