merge

src/Game.cpp

@@ -1,4 +1,4 @@
-#include "Game.h"
+#include "Game.h"
 #include "AnimatedModel.h"
 #include "Localization.h"
 #include "utils/Utils.h"
@@ -18,7 +18,7 @@
 #endif
 
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #include <emscripten.h>
 #endif
 
@@ -35,7 +35,7 @@ namespace FRG
 	static const float zoomMax = 20.0f;
 
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 	const char* CONST_ZIP_FILE = "resources.zip";
 	const char* CONST_MUSIC_ZIP_FILE = "music.zip";
 #else
@@ -47,7 +47,7 @@ namespace FRG
 	float y = 0;
 	float z = 0;
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 	Game* Game::s_instance = nullptr;
 
 	// Коллбэк успешной загрузки resources.zip
@@ -104,7 +104,7 @@ namespace FRG
 		renderer.InitOpenGL();
 		//logger() << "Android test step 1 " << std::endl;
 
-#if defined(EMSCRIPTEN) || defined(__ANDROID__)
+#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;
@@ -144,7 +144,7 @@ namespace FRG
 		loadingMesh.data = CreateRect2D({ 0.0f, 0.0f }, { minDimension * 0.5f, minDimension * 0.5f }, 3);
 		loadingMesh.RefreshVBO();
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 		s_instance = this;
 
 		std::string resPath = FRG::getPersistentResourcePath("resources.zip");
@@ -163,7 +163,7 @@ namespace FRG
 
 			// Скачиваем сразу в постоянный путь /offline/resources.zip
 			emscripten_async_wget2(
-				"resources.zip",            // URL на сервере
+				"resources.zip?v=2",        // Cache-bust stale browser responses after resource updates
 				resPath.c_str(),            // Назначение в VFS Emscripten
 				"GET",
 				nullptr,
@@ -218,7 +218,7 @@ namespace FRG
 		loadSteps.push([this]() {
 
 
-#if defined(EMSCRIPTEN) || defined(__ANDROID__)
+#if defined(__EMSCRIPTEN__) || defined(__ANDROID__)
 			renderer.shaderManager.AddShaderFromFiles("env_sky", "resources/shaders/env_sky.vertex", "resources/shaders/env_sky_web.fragment", CONST_ZIP_FILE);
 			renderer.shaderManager.AddShaderFromFiles("defaultAtmosphere", "resources/shaders/defaultAtmosphere.vertex", "resources/shaders/defaultAtmosphere_web.fragment", CONST_ZIP_FILE);
 			renderer.shaderManager.AddShaderFromFiles("planetBake", "resources/shaders/planet_bake.vertex", "resources/shaders/planet_bake_web.fragment", CONST_ZIP_FILE);