Merge branch 'main' into spark

This commit is contained in:
Vladislav Khorev committed 2026-01-09 17:17:11 +03:00
commit 197423b572
12 files changed
+230 -45

No files matched your search

+3 -1
View File
@@ -13,7 +13,7 @@
namespace ZL
{
#ifdef EMSCRIPTEN
const char* CONST_ZIP_FILE = "space-game001a.zip";
const char* CONST_ZIP_FILE = "space-game001.zip";
#else
const char* CONST_ZIP_FILE = "../assets.zip";
#endif
@@ -343,6 +343,8 @@ namespace ZL
std::cout << "Init step 6 " << std::endl;
planetObject.init();
planetObject.taskManager = &taskManager;
std::cout << "Init step 7 " << std::endl;
//rockTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/rock.png", CONST_ZIP_FILE));