Android version bug fix

src/Environment.cpp

@@ -23,6 +23,7 @@ int Environment::height = CONST_DEFAULT_HEIGHT;
 float Environment::zoom = DEFAULT_ZOOM;
 
 bool Environment::enableLogging = false;
+//bool Environment::enableLogging = true;
 
 SDL_Window* Environment::window = nullptr;
 

src/Game.cpp

@@ -101,12 +101,16 @@ namespace FRG
 		FRG::BindOpenGlFunctions();
 		FRG::CheckGlError(__FILE__, __LINE__);
 		renderer.InitOpenGL();
+		//logger() << "Android test step 1 " << std::endl;
 
-#if defined(EMSCRIPTEN)
+#if defined(EMSCRIPTEN) || defined(__ANDROID__)
 		// These shaders and loading.png are preloaded separately (not from zip),
 		// so they are available immediately without waiting for resources.zip.
+		//logger() << "Android test step 1 " << std::endl;
 		renderer.shaderManager.AddShaderFromFiles("defaultColor", "resources/shaders/defaultColor.vertex", "resources/shaders/defaultColor_web.fragment", "");
+		//logger() << "Android test step 2 " << std::endl;
 		renderer.shaderManager.AddShaderFromFiles("default", "resources/shaders/default.vertex", "resources/shaders/default_web.fragment", "");
+		//logger() << "Android test step 3 " << std::endl;
 #elif defined(__linux__)
 		renderer.shaderManager.AddShaderFromFiles("defaultColor", "resources/shaders/defaultColor.vertex", "resources/shaders/defaultColor_desktop.fragment", CONST_ZIP_FILE);
 		renderer.shaderManager.AddShaderFromFiles("default", "resources/shaders/default.vertex", "resources/shaders/default_desktop.fragment", CONST_ZIP_FILE);
@@ -116,12 +120,13 @@ namespace FRG
 		renderer.shaderManager.AddShaderFromFiles("default", "resources/shaders/default.vertex", "resources/shaders/default_desktop.fragment", CONST_ZIP_FILE);
 #endif
 		loadingTexture = renderer.textureManager.LoadFromPng("resources/loading.png", "");
-
+		//logger() << "Android test step 4 " << std::endl;
 		loadingProgressBarFrameTexture = renderer.textureManager.LoadFromPng(
 			"resources/loadingProgressBarFrame.png", "", true);
 		loadingProgressBarTexture = renderer.textureManager.LoadFromPng(
 			"resources/loadingProgressBar.png", "", true);
 
+		//logger() << "Android test step 5 " << std::endl;
 		float minDimension;
 		float width = Environment::projectionWidth;
 		float height = Environment::projectionHeight;
@@ -1941,4 +1946,4 @@ namespace FRG
 		}
 	}
 
-}  // namespace FRG
+}  // namespace