aboutsummaryrefslogtreecommitdiff
path: root/platform/android/godot_android.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2017-08-27 21:07:15 +0200
committerRémi Verschelde2017-08-27 22:13:45 +0200
commit7ad14e7a3e6f87ddc450f7e34621eb5200808451 (patch)
tree8804d0dd24cc126087462edfbbbf73ed61b56b0e /platform/android/godot_android.cpp
parent37da8155a4500a9386027b4d791a86186bc7ab4a (diff)
downloadgodot-7ad14e7a3e6f87ddc450f7e34621eb5200808451.tar.gz
godot-7ad14e7a3e6f87ddc450f7e34621eb5200808451.tar.zst
godot-7ad14e7a3e6f87ddc450f7e34621eb5200808451.zip
Diffstat (limited to 'platform/android/godot_android.cpp')
-rw-r--r--platform/android/godot_android.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp
index 0b64e6070..823568349 100644
--- a/platform/android/godot_android.cpp
+++ b/platform/android/godot_android.cpp
@@ -565,20 +565,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
case APP_CMD_CONFIG_CHANGED:
case APP_CMD_WINDOW_RESIZED: {
-#if 0
-// android blows
- if (engine->display_active) {
-
- EGLint w,h;
- eglQuerySurface(engine->display, engine->surface, EGL_WIDTH, &w);
- eglQuerySurface(engine->display, engine->surface, EGL_HEIGHT, &h);
- engine->os->init_video_mode(w,h);
- //print_line("RESIZED VIDEO MODE: "+itos(w)+","+itos(h));
- engine_draw_frame(engine);
-
- }
-#else
-
if (engine->display_active) {
EGLint w, h;
@@ -594,17 +580,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
engine_draw_frame(engine);
engine->animating = 1;
-/*
- EGLint w,h;
- eglQuerySurface(engine->display, engine->surface, EGL_WIDTH, &w);
- eglQuerySurface(engine->display, engine->surface, EGL_HEIGHT, &h);
- engine->os->init_video_mode(w,h);
- //print_line("RESIZED VIDEO MODE: "+itos(w)+","+itos(h));
-
- }*/
-
-#endif
-
} break;
case APP_CMD_INIT_WINDOW:
//The window is being shown, get it ready.
@@ -617,9 +592,7 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
engine->os = new OS_Android(_gfx_init, engine);
__android_log_print(ANDROID_LOG_INFO, "godot", "pre asdasd setup...");
-#if 0
- Error err = Main::setup("apk",2,args);
-#else
+
Error err = Main::setup("apk", 0, NULL);
String modules = ProjectSettings::get_singleton()->get("android/modules");
@@ -669,8 +642,6 @@ static void engine_handle_cmd(struct android_app *app, int32_t cmd) {
}
}
-#endif
-
if (!Main::start())
return; //should exit instead and print the error