diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 1176bb9..7eec6dd 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -902,7 +902,7 @@ static void init_evas_gl(GLData *gld) | |||
902 | evas_object_show(gld->r1); | 902 | evas_object_show(gld->r1); |
903 | elm_box_pack_end(gld->bx, gld->r1); | 903 | elm_box_pack_end(gld->bx, gld->r1); |
904 | 904 | ||
905 | evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_GL, gld); | 905 | // evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_GL, gld); |
906 | // evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_KEY_DOWN, _on_camera_input_down, gld); | 906 | // evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_KEY_DOWN, _on_camera_input_down, gld); |
907 | // evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_KEY_UP, _on_camera_input_up, gld); | 907 | // evas_object_event_callback_add(gld->r1, EVAS_CALLBACK_KEY_UP, _on_camera_input_up, gld); |
908 | #endif | 908 | #endif |
@@ -1423,6 +1423,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1423 | elm_config_preferred_engine_set("opengl_x11"); | 1423 | elm_config_preferred_engine_set("opengl_x11"); |
1424 | gld->win = elm_win_add(NULL, "extantz", ELM_WIN_BASIC); | 1424 | gld->win = elm_win_add(NULL, "extantz", ELM_WIN_BASIC); |
1425 | gld->win = elm_win_util_standard_add("extantz", "extantz virtual world viewer"); | 1425 | gld->win = elm_win_util_standard_add("extantz", "extantz virtual world viewer"); |
1426 | ourGlobals.win = gld->win; | ||
1426 | 1427 | ||
1427 | // Set preferred engine back to default from config | 1428 | // Set preferred engine back to default from config |
1428 | elm_config_preferred_engine_set(NULL); | 1429 | elm_config_preferred_engine_set(NULL); |
@@ -1456,17 +1457,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1456 | elm_win_resize_object_add(gld->win, obj); | 1457 | elm_win_resize_object_add(gld->win, obj); |
1457 | eo_unref(obj); | 1458 | eo_unref(obj); |
1458 | 1459 | ||
1459 | // Note, we don't need an Elm_bg, the entire thing gets covered with the GL rendering surface anyway. | 1460 | Evas_3D_Demo_add(&ourGlobals); |
1460 | #if 0 | ||
1461 | bg = elm_bg_add(gld->win); | ||
1462 | elm_bg_load_size_set(bg, gld->win_w, gld->win_h); | ||
1463 | elm_bg_option_set(bg, ELM_BG_OPTION_CENTER); | ||
1464 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", elm_app_data_dir_get()); | ||
1465 | elm_bg_file_set(bg, buf, NULL); | ||
1466 | evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | ||
1467 | elm_win_resize_object_add(gld->win, bg); | ||
1468 | evas_object_show(bg); | ||
1469 | #endif | ||
1470 | 1461 | ||
1471 | gld->bx = elm_box_add(gld->win); | 1462 | gld->bx = elm_box_add(gld->win); |
1472 | evas_object_size_hint_weight_set(gld->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1463 | evas_object_size_hint_weight_set(gld->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |