summaryrefslogtreecommitdiff
path: root/src/bin/edje
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2020-03-19 18:47:36 +0900
committerHermet Park <chuneon.park@samsung.com>2020-03-19 18:49:17 +0900
commit0583b143078c5b46fc887d40687e50d2640f82d3 (patch)
tree335256326d7c1cd5f1625d6c0a4e0014dd7be678 /src/bin/edje
parentc4fad77ae3d1e2acbc8d0876edb614d861051dc8 (diff)
canvas 3d: remove canvas3d edje
Summary: Remove functional stuff, leave as deprecated for compatibility. Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11541
Diffstat (limited to 'src/bin/edje')
-rw-r--r--src/bin/edje/edje_player.c56
1 files changed, 5 insertions, 51 deletions
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index d54dea9ed5..7d79ec0d7a 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -831,32 +831,14 @@ _edje_load_or_show_error(Evas_Object *edje, const char *file, const char *group)
831 Eina_File *f = NULL; 831 Eina_File *f = NULL;
832 const char *errmsg; 832 const char *errmsg;
833 int err; 833 int err;
834 Evas_Canvas3D_Scene *scene = NULL;
835 Evas_Canvas3D_Node *root_node = NULL;
836 834
837 f = eina_file_open(file, EINA_FALSE); 835 f = eina_file_open(file, EINA_FALSE);
838 if (!(edje_mmap_3d_has(f, group))) 836 if (edje_object_file_set(edje, file, group))
839 { 837 {
840 if (edje_object_file_set(edje, file, group)) 838 edje_object_signal_callback_add(edje, "edje,change,file", "edje", _edje_reload, NULL);
841 { 839 evas_object_focus_set(edje, EINA_TRUE);
842 edje_object_signal_callback_add(edje, "edje,change,file", "edje", _edje_reload, NULL); 840 eina_file_close(f);
843 evas_object_focus_set(edje, EINA_TRUE); 841 return EINA_TRUE;
844 eina_file_close(f);
845 return EINA_TRUE;
846 }
847 }
848 else
849 {
850 if (edje_object_file_set(edje, file, group))
851 {
852 if (edje_3d_object_add(edje, &root_node, scene))
853 {
854 edje_object_signal_callback_add(edje, "edje,change,file", "edje", _edje_reload, NULL);
855 evas_object_focus_set(edje, EINA_TRUE);
856 eina_file_close(f);
857 return EINA_TRUE;
858 }
859 }
860 } 842 }
861 843
862 err = edje_object_load_error_get(edje); 844 err = edje_object_load_error_get(edje);
@@ -1026,7 +1008,6 @@ main(int argc, char **argv)
1026 Eina_Bool quit_option = EINA_FALSE; 1008 Eina_Bool quit_option = EINA_FALSE;
1027 int args; 1009 int args;
1028 Eina_List *groups; 1010 Eina_List *groups;
1029 Eina_File *f = NULL;
1030 const char *group; 1011 const char *group;
1031 Ecore_Getopt_Value values[] = { 1012 Ecore_Getopt_Value values[] = {
1032 ECORE_GETOPT_VALUE_STR(opts.group), 1013 ECORE_GETOPT_VALUE_STR(opts.group),
@@ -1100,33 +1081,6 @@ main(int argc, char **argv)
1100 goto end; 1081 goto end;
1101 } 1082 }
1102 1083
1103 group = eina_list_data_get(eina_list_last(groups));
1104
1105 f = eina_file_open(opts.file, EINA_FALSE);
1106 if (edje_mmap_3d_has(f, group))
1107 {
1108 Eina_List *engine_list, *n;
1109 Eina_Bool opengl_x11_has = EINA_FALSE, wayland_egl_has = EINA_FALSE;
1110 const char *engine;
1111 engine_list = ecore_evas_engines_get();
1112 EINA_LIST_FOREACH(engine_list, n, engine)
1113 {
1114 if (!strcmp(engine, "wayland_egl"))
1115 {
1116 wayland_egl_has = EINA_TRUE;
1117 break;
1118 }
1119 else if (!strcmp(engine, "opengl_x11"))
1120 opengl_x11_has = EINA_TRUE;
1121 }
1122 if (wayland_egl_has)
1123 opts.engine = "wayland_egl";
1124 else if (opengl_x11_has)
1125 opts.engine = "opengl_x11";
1126 }
1127 eina_file_close(f);
1128 edje_file_collection_list_free(groups);
1129
1130 if (opts.size.w <= 0) opts.size.w = 320; 1084 if (opts.size.w <= 0) opts.size.w = 320;
1131 if (opts.size.h <= 0) opts.size.h = 240; 1085 if (opts.size.h <= 0) opts.size.h = 240;
1132 win = ecore_evas_new(opts.engine, 0, 0, opts.size.w, opts.size.h, NULL); 1086 win = ecore_evas_new(opts.engine, 0, 0, opts.size.w, opts.size.h, NULL);