Adapt for web

src/Game.cpp

@@ -23,6 +23,10 @@
 #endif
 #endif
 
+#ifdef EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
 #include "network/LocalClient.h"
 #include "network/ClientState.h"
 
@@ -36,6 +40,22 @@ namespace ZL
 	const char* CONST_ZIP_FILE = "";
 #endif
 
+#ifdef EMSCRIPTEN
+	Game* Game::s_instance = nullptr;
+
+	void Game::onResourcesZipLoaded(const char* /*filename*/) {
+		if (s_instance) {
+			s_instance->mainThreadHandler.EnqueueMainThreadTask([&]() {
+				s_instance->setupPart2();
+			});
+		}
+	}
+
+	void Game::onResourcesZipError(const char* /*filename*/) {
+		std::cerr << "Failed to download resources.zip" << std::endl;
+	}
+#endif
+
 	Game::Game()
 		: window(nullptr)
 		, glContext(nullptr)
@@ -53,7 +73,11 @@ namespace ZL
 		if (window) {
 			SDL_DestroyWindow(window);
 		}
+#ifndef EMSCRIPTEN
+		// In Emscripten, SDL must stay alive across context loss/restore cycles
+		// so the window remains valid when the game object is re-created.
 		SDL_Quit();
+#endif
 	}
 
 	void Game::setup() {
@@ -64,21 +88,30 @@ namespace ZL
 		renderer.InitOpenGL();
 
 #ifdef EMSCRIPTEN
-		renderer.shaderManager.AddShaderFromFiles("defaultColor", "resources/shaders/defaultColor.vertex", "resources/shaders/defaultColor_web.fragment", CONST_ZIP_FILE);
-		renderer.shaderManager.AddShaderFromFiles("default", "resources/shaders/default.vertex", "resources/shaders/default_web.fragment", CONST_ZIP_FILE);
-
+		// These shaders and loading.png are preloaded separately (not from zip),
+		// so they are available immediately without waiting for resources.zip.
+		renderer.shaderManager.AddShaderFromFiles("defaultColor", "resources/shaders/defaultColor.vertex", "resources/shaders/defaultColor_web.fragment", "");
+		renderer.shaderManager.AddShaderFromFiles("default", "resources/shaders/default.vertex", "resources/shaders/default_web.fragment", "");
+		loadingTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/loading.png", ""));
 #else
 		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);
+		loadingTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/loading.png", CONST_ZIP_FILE));
 #endif
 
-		loadingTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/loading.png", CONST_ZIP_FILE));
 		loadingMesh.data = CreateRect2D({ Environment::width * 0.5, Environment::height * 0.5 }, { Environment::width * 0.5, Environment::height*0.5 }, 3);
 		loadingMesh.RefreshVBO();
 
+#ifdef EMSCRIPTEN
+		// Asynchronously download resources.zip; setupPart2() is called on completion.
+		// The loading screen stays visible until the download finishes.
+		s_instance = this;
+		emscripten_async_wget("resources.zip", "resources.zip", onResourcesZipLoaded, onResourcesZipError);
+#else
 		mainThreadHandler.EnqueueMainThreadTask([this]() {
 			this->setupPart2();
-			});
+		});
+#endif
 	}
 
 
@@ -322,6 +355,8 @@ namespace ZL
 				// Обновляем размеры и сбрасываем кеш текстов, т.к. меши хранятся в пикселях
 				Environment::width = event.window.data1;
 				Environment::height = event.window.data2;
+				std::cout << "Window resized: " << Environment::width << "x" << Environment::height << std::endl;	
+
 				space.clearTextRendererCache();
 			}
 #endif