Working on new scene

cmake/FetchDependencies.cmake

@@ -25,7 +25,7 @@ macro(check_and_download URL ARCHIVE_NAME EXTRACTED_DIR_NAME CHECK_FILE)
 endmacro()
 
 # 1) ZLIB (Нужна только для инклудов, если не используете emscripten порты)
-check_and_download("https://www.zlib.net/zlib131.zip" "zlib131.zip" "zlib-1.3.1" "CMakeLists.txt")
+check_and_download("https://www.zlib.net/zlib132.zip" "zlib132.zip" "zlib-1.3.2" "CMakeLists.txt")
 
 # 2) SDL2
 check_and_download("https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.10.zip" "release-2.32.10.zip" "SDL-release-2.32.10" "CMakeLists.txt")

cmake/ThirdParty.cmake

@@ -10,9 +10,9 @@ set(BUILD_CONFIGS Debug Release)
 
 
 # ===========================================
-# 1) ZLIB (zlib131.zip → zlib-1.3.1) - без изменений
+# 1) ZLIB (zlib131.zip → zlib-1.3.2) - без изменений
 # ===========================================
-set(ZLIB_SRC_DIR      "${THIRDPARTY_DIR}/zlib-1.3.1")
+set(ZLIB_SRC_DIR      "${THIRDPARTY_DIR}/zlib-1.3.2")
 set(ZLIB_BUILD_DIR    "${ZLIB_SRC_DIR}/build")
 set(ZLIB_INSTALL_DIR  "${ZLIB_SRC_DIR}/install")
 
@@ -76,8 +76,8 @@ set_target_properties(zlib_external_lib PROPERTIES
     #IMPORTED_LOCATION_RELEASE "${ZLIB_INSTALL_DIR}/lib/zlib.lib"
     
     # Можно также указать статические библиотеки, если вы хотите их использовать
-    IMPORTED_LOCATION_DEBUG   "${ZLIB_INSTALL_DIR}/lib/zlibstaticd.lib"
+    IMPORTED_LOCATION_DEBUG   "${ZLIB_INSTALL_DIR}/lib/zsd.lib"
-    IMPORTED_LOCATION_RELEASE "${ZLIB_INSTALL_DIR}/lib/zlibstatic.lib"
+    IMPORTED_LOCATION_RELEASE "${ZLIB_INSTALL_DIR}/lib/zs.lib"
 
     INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INSTALL_DIR}/include"
 )

resources/w/firebox.txt

@@ -0,0 +1,29 @@
+===Vertices (Split by UV/Normal): 14
+V 0: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 0.0)
+V 1: Pos(-2.494679, 32.87888, 0.161349) Norm(-0.577372, 0.577339, -0.577339) UV(0.375, 0.25)
+V 2: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.375, 0.0)
+V 3: Pos(-2.494679, 32.87888, 1.524048) Norm(-0.57737, 0.57734, 0.57734) UV(0.625, 0.25)
+V 4: Pos(-2.057763, 32.87888, 0.161349) Norm(0.57737, 0.57734, -0.57734) UV(0.375, 0.5)
+V 5: Pos(-2.057763, 32.87888, 1.524048) Norm(0.577372, 0.577339, 0.577339) UV(0.625, 0.5)
+V 6: Pos(-2.057763, 31.51618, 0.161349) Norm(0.577372, -0.577339, -0.577339) UV(0.375, 0.75)
+V 7: Pos(-2.057763, 31.51618, 1.524048) Norm(0.57737, -0.57734, 0.57734) UV(0.625, 0.75)
+V 8: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.375, 1.0)
+V 9: Pos(-2.494679, 31.51618, 0.161349) Norm(-0.57737, -0.57734, -0.57734) UV(0.125, 0.75)
+V 10: Pos(-2.494679, 32.87888, 0.161349) Norm(-0.577372, 0.577339, -0.577339) UV(0.125, 0.5)
+V 11: Pos(-2.494679, 32.87888, 1.524048) Norm(-0.57737, 0.57734, 0.57734) UV(0.875, 0.5)
+V 12: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.625, 1.0)
+V 13: Pos(-2.494679, 31.51618, 1.524048) Norm(-0.577372, -0.577339, 0.577339) UV(0.875, 0.75)
+
+===Triangles (Indices): 12
+Tri: 0 1 2
+Tri: 3 4 1
+Tri: 5 6 4
+Tri: 7 8 6
+Tri: 4 9 10
+Tri: 11 7 5
+Tri: 0 3 1
+Tri: 3 5 4
+Tri: 5 7 6
+Tri: 7 12 8
+Tri: 4 6 9
+Tri: 11 13 7

resources/w/inai001.txt

@@ -0,0 +1,39 @@
+===Vertices (Split by UV/Normal): 24
+V 0: Pos(-0.037932, -0.443994, 0.688038) Norm(-0.577353, -0.577349, 0.577349) UV(0.001657, 0.001657)
+V 1: Pos(-0.037932, 0.443994, -0.688038) Norm(-0.577353, 0.577349, -0.577349) UV(0.437515, 0.677088)
+V 2: Pos(-0.037932, -0.443994, -0.688038) Norm(-0.577344, -0.577354, -0.577353) UV(0.001657, 0.677088)
+V 3: Pos(-0.037932, 0.443994, 0.688038) Norm(-0.577344, 0.577354, 0.577353) UV(0.880002, 0.001657)
+V 4: Pos(0.037932, 0.443994, -0.688038) Norm(0.577344, 0.577354, -0.577353) UV(0.91724, 0.677088)
+V 5: Pos(-0.037932, 0.443994, -0.688038) Norm(-0.577353, 0.577349, -0.577349) UV(0.880002, 0.677088)
+V 6: Pos(0.037932, 0.443994, 0.688038) Norm(0.577353, 0.577349, 0.577349) UV(0.44083, 0.001657)
+V 7: Pos(0.037932, -0.443994, -0.688038) Norm(0.577353, -0.577349, -0.577349) UV(0.876688, 0.677088)
+V 8: Pos(0.037932, 0.443994, -0.688038) Norm(0.577344, 0.577354, -0.577353) UV(0.44083, 0.677088)
+V 9: Pos(0.037932, -0.443994, 0.688038) Norm(0.577344, -0.577354, 0.577353) UV(0.920554, 0.001657)
+V 10: Pos(-0.037932, -0.443994, -0.688038) Norm(-0.577344, -0.577354, -0.577353) UV(0.957791, 0.677088)
+V 11: Pos(0.037932, -0.443994, -0.688038) Norm(0.577353, -0.577349, -0.577349) UV(0.920554, 0.677088)
+V 12: Pos(0.037932, 0.443994, -0.688038) Norm(0.577344, 0.577354, -0.577353) UV(0.961105, 0.437515)
+V 13: Pos(-0.037932, -0.443994, -0.688038) Norm(-0.577344, -0.577354, -0.577353) UV(0.998343, 0.001657)
+V 14: Pos(-0.037932, 0.443994, -0.688038) Norm(-0.577353, 0.577349, -0.577349) UV(0.998343, 0.437515)
+V 15: Pos(-0.037932, 0.443994, 0.688038) Norm(-0.577344, 0.577354, 0.577353) UV(0.961105, 0.876688)
+V 16: Pos(0.037932, -0.443994, 0.688038) Norm(0.577344, -0.577354, 0.577353) UV(0.998343, 0.44083)
+V 17: Pos(0.037932, 0.443994, 0.688038) Norm(0.577353, 0.577349, 0.577349) UV(0.998343, 0.876688)
+V 18: Pos(-0.037932, 0.443994, 0.688038) Norm(-0.577344, 0.577354, 0.577353) UV(0.437515, 0.001657)
+V 19: Pos(0.037932, 0.443994, 0.688038) Norm(0.577353, 0.577349, 0.577349) UV(0.91724, 0.001657)
+V 20: Pos(0.037932, -0.443994, 0.688038) Norm(0.577344, -0.577354, 0.577353) UV(0.876688, 0.001657)
+V 21: Pos(-0.037932, -0.443994, 0.688038) Norm(-0.577353, -0.577349, 0.577349) UV(0.957791, 0.001657)
+V 22: Pos(0.037932, -0.443994, -0.688038) Norm(0.577353, -0.577349, -0.577349) UV(0.961105, 0.001657)
+V 23: Pos(-0.037932, -0.443994, 0.688038) Norm(-0.577353, -0.577349, 0.577349) UV(0.961105, 0.44083)
+
+===Triangles (Indices): 12
+Tri: 0 1 2
+Tri: 3 4 5
+Tri: 6 7 8
+Tri: 9 10 11
+Tri: 12 13 14
+Tri: 15 16 17
+Tri: 0 18 1
+Tri: 3 19 4
+Tri: 6 20 7
+Tri: 9 21 10
+Tri: 12 22 13
+Tri: 15 23 16

src/Game.cpp

@@ -61,12 +61,9 @@ namespace ZL
 #endif
 
 	Game::Game()
-		: /*window(nullptr)
+		: newTickCount(0)
-		, glContext(nullptr)
-		, */newTickCount(0)
 		, lastTickCount(0)
 		, menuManager(renderer)
-		, space(renderer, taskManager, mainThreadHandler, networkClient, menuManager)
 	{
 	}
 
@@ -79,9 +76,6 @@ namespace ZL
 	}
 
 	void Game::setup() {
-		//glContext = SDL_GL_CreateContext(ZL::Environment::window);
-		//glContext = in_glContext;
-
 		Environment::width = Environment::CONST_DEFAULT_WIDTH;
 		Environment::height = Environment::CONST_DEFAULT_HEIGHT;
 		Environment::computeProjectionDimensions();
@@ -95,12 +89,11 @@ namespace ZL
 		// 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));
 
 		float minDimension;
 		float width = Environment::projectionWidth;
@@ -155,77 +148,34 @@ namespace ZL
 		renderer.shaderManager.AddShaderFromFiles("spark", "resources/shaders/spark.vertex", "resources/shaders/spark_desktop.fragment", CONST_ZIP_FILE);
 #endif
 
-		menuManager.setupMenu();
+		roomTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/w/room005.png", CONST_ZIP_FILE));
+		roomMesh.data = LoadFromTextFile02("resources/w/room001.txt", CONST_ZIP_FILE);
+		roomMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(-M_PI*0.5, Eigen::Vector3f::UnitY())).toRotationMatrix());
+		roomMesh.RefreshVBO();
 
-		menuManager.onMainMenuEntered = [this]() {
+		fireboxTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/w/Cube001.png", CONST_ZIP_FILE));
-			if (networkClient) {
+		fireboxMesh.data = LoadFromTextFile02("resources/w/firebox.txt", CONST_ZIP_FILE);
-				networkClient->Disconnect();
+		fireboxMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(-M_PI * 0.5, Eigen::Vector3f::UnitY())).toRotationMatrix());
-				networkClient.reset();
+		fireboxMesh.RefreshVBO();
-			}
-		};
 
-		menuManager.onSingleplayerPressed = [this](const std::string& nickname, int shipType) {
+		inaiTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/w/inai001.png", CONST_ZIP_FILE));
-			Environment::shipState.nickname = nickname;
+		inaiMesh.data = LoadFromTextFile02("resources/w/inai001.txt", CONST_ZIP_FILE);
-			Environment::shipState.shipType = shipType;
+		inaiMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(-M_PI * 0.5, Eigen::Vector3f::UnitY())).toRotationMatrix());
+		inaiMesh.data.Move({ 2.5, 1.4, -9.9 });
+		inaiMesh.RefreshVBO();
 
-			if (Environment::shipState.shipType == 1)
+		benchTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/w/bench001opt.png", CONST_ZIP_FILE));
-			{
+		benchMesh.data = LoadFromTextFile02("resources/w/bench002opt.txt", CONST_ZIP_FILE);
-				menuManager.uiManager.findButton("shootButton")->state = ButtonState::Disabled;
+		benchMesh.data.Scale(3.f);
-				menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Disabled;
+		benchMesh.data.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI, Eigen::Vector3f::UnitY())).toRotationMatrix());
-			}
+		benchMesh.data.Move({ -2.1, 0.5, -7.9 });
-			else
+		benchMesh.RefreshVBO();
-			{
-				menuManager.uiManager.findButton("shootButton")->state = ButtonState::Normal;
-				menuManager.uiManager.findButton("shootButton2")->state = ButtonState::Normal;
-			}
-
-			auto localClient = new LocalClient;
-			ClientState st = Environment::shipState;
-			st.id = localClient->GetClientId();
-			localClient->setLocalPlayerState(st);
-
-			networkClient = std::unique_ptr<INetworkClient>(localClient);
-			networkClient->Connect("", 0);
-
-			space.resetPlayerState();
-			lastTickCount = 0;
-			};
-
-		menuManager.onMultiplayerPressed = [this](const std::string& nickname, int shipType) {
-			Environment::shipState.nickname = nickname;
-			Environment::shipState.shipType = shipType;
-
-#ifdef EMSCRIPTEN
-			networkClient = std::make_unique<WebSocketClientEmscripten>();
-			networkClient->Connect("localhost", 8081);
-#else
-			networkClient = std::make_unique<WebSocketClient>(taskManager.getIOContext());
-			networkClient->Connect("localhost", 8081);
-#endif
-
-			if (networkClient) {
-				std::string joinMsg = std::string("JOIN:") + nickname + ":" + std::to_string(shipType);
-				networkClient->Send(joinMsg);
-				std::cerr << "Sent JOIN: " << joinMsg << std::endl;
-			}
-
-			space.boxCoordsArr.clear();
-			space.boxRenderArr.clear();
-			space.boxAlive.clear();
-			space.serverBoxesApplied = false;
-
-			space.resetPlayerState();
-			connectingStartTicks = SDL_GetTicks();
-			lastTickCount = 0;
-			};
-
-
-		space.setup();
 
+	
 		loadingCompleted = true;
 	}
 
-
+	
 	void Game::drawUI()
 	{
 		glClear(GL_DEPTH_BUFFER_BIT);
@@ -239,13 +189,44 @@ namespace ZL
 		CheckGlError();
 	}
 
-	void Game::drawUnderMainMenu()
+	void Game::drawGame()
 	{
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
 
-	}
 
+		renderer.shaderManager.PushShader(defaultShaderName);
+		renderer.RenderUniform1i(textureUniformName, 0);
+
+		renderer.PushPerspectiveProjectionMatrix(1.0 / 1.5,
+			static_cast<float>(Environment::width) / static_cast<float>(Environment::height),
+			Environment::CONST_Z_NEAR, Environment::CONST_Z_FAR);
+		renderer.PushMatrix();
+
+		renderer.LoadIdentity();
+		renderer.TranslateMatrix({ 0,0, -1.0f * Environment::zoom });
+		renderer.TranslateMatrix({ 0, -6.f, 0 }); //Ship camera offset
+
+		renderer.RotateMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI * 30 / 180.f, Eigen::Vector3f::UnitX())).toRotationMatrix());
+
+		glBindTexture(GL_TEXTURE_2D, roomTexture->getTexID());
+		renderer.DrawVertexRenderStruct(roomMesh);
+	
+		glBindTexture(GL_TEXTURE_2D, fireboxTexture->getTexID());
+		renderer.DrawVertexRenderStruct(fireboxMesh);
+		glBindTexture(GL_TEXTURE_2D, inaiTexture->getTexID());
+		renderer.DrawVertexRenderStruct(inaiMesh);
+		glBindTexture(GL_TEXTURE_2D, benchTexture->getTexID());
+		renderer.DrawVertexRenderStruct(benchMesh);
+
+		renderer.PopMatrix();
+
+		renderer.PopProjectionMatrix();
+
+		renderer.shaderManager.PopShader();
+
+	}
+	
 	void Game::drawScene() {
 		glViewport(0, 0, Environment::width, Environment::height);
 		if (!loadingCompleted) {
@@ -253,14 +234,7 @@ namespace ZL
 		}
 		else
 		{
-
+			drawGame();
-			if (menuManager.shouldRenderSpace()) {
-				space.drawScene();
-			}
-			else
-			{
-				drawUnderMainMenu();
-			}
 			drawUI();
 		}
 		CheckGlError();
@@ -293,18 +267,13 @@ namespace ZL
 		CheckGlError();
 	}
 
+	
 	int64_t Game::getSyncTimeMs() {
 		int64_t localNow = std::chrono::duration_cast<std::chrono::milliseconds>(
 			std::chrono::system_clock::now().time_since_epoch()).count();
-		if(networkClient)
+		return localNow;
-		{
-			return localNow + networkClient->getTimeOffset();
-		}
-		else
-		{
-			return localNow;
-		}
 	}
+	
 
 	void Game::processTickCount() {
 
@@ -323,30 +292,19 @@ namespace ZL
 		if (newTickCount - lastTickCount > CONST_TIMER_INTERVAL) {
 
 			int64_t delta = newTickCount - lastTickCount;
-			if (delta > CONST_MAX_TIME_INTERVAL)
-			{
-				//throw std::runtime_error("Synchronization is lost");
-			}
 
-			if (menuManager.shouldRenderSpace()) {
-				space.processTickCount(newTickCount, delta);
-			}
-			menuManager.uiManager.update(static_cast<float>(delta));
 			lastTickCount = newTickCount;
 		}
 	}
 
 	void Game::render() {
-		//SDL_GL_MakeCurrent(ZL::Environment::window, glContext);
 		ZL::CheckGlError();
 
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-		//processTickCount();
 		drawScene();
 		processTickCount();
-		//std::this_thread::sleep_for(std::chrono::milliseconds(50));
 
 		SDL_GL_SwapWindow(ZL::Environment::window);
 	}
@@ -364,10 +322,10 @@ namespace ZL
 				Environment::width = event.window.data1;
 				Environment::height = event.window.data2;
 				Environment::computeProjectionDimensions();
-				menuManager.uiManager.updateAllLayouts();
+				//menuManager.uiManager.updateAllLayouts();
 				std::cout << "Window resized: " << Environment::width << "x" << Environment::height << std::endl;
 
-				space.clearTextRendererCache();
+				//space.clearTextRendererCache();
 			}
 
 #ifdef __ANDROID__
@@ -445,14 +403,14 @@ namespace ZL
 			// Обработка ввода текста
 			if (event.type == SDL_KEYDOWN) {
 				if (event.key.keysym.sym == SDLK_BACKSPACE) {
-					menuManager.uiManager.onKeyBackspace();
+					//menuManager.uiManager.onKeyBackspace();
 				}
 			}
 
 			if (event.type == SDL_TEXTINPUT) {
 				// Пропускаем ctrl+c и другие команды
 				if ((event.text.text[0] & 0x80) == 0) { // ASCII символы
-					menuManager.uiManager.onKeyPress((unsigned char)event.text.text[0]);
+					//menuManager.uiManager.onKeyPress((unsigned char)event.text.text[0]);
 				}
 			}
 
@@ -461,65 +419,30 @@ namespace ZL
 					std::cout << "Camera position: x=" << x << " y=" << y << " z=" << z << std::endl;
 				}
 			}
+
+			if (event.type == SDL_KEYUP) {
+				/*benchMesh.data.Move({-x, -y, 0});
+				if (event.key.keysym.sym == SDLK_a) {
+					x = x - 0.1;
+				}
+				if (event.key.keysym.sym == SDLK_d) {
+					x = x + 0.1;
+				}
+				if (event.key.keysym.sym == SDLK_w) {
+					y = y - 0.1;
+				}
+				if (event.key.keysym.sym == SDLK_s) {
+					y = y + 0.1;
+				}
+				benchMesh.data.Move({ x, y, 0 });
+				benchMesh.RefreshVBO();*/
+			}
 #endif
 		}
 		render();
 		
-		if (networkClient) {
-//#ifndef NETWORK
-			auto localClient = dynamic_cast<ZL::LocalClient*>(networkClient.get());
-			if (localClient) {
-				localClient->setLocalPlayerState(Environment::shipState);
-			}
-//#endif
-			networkClient->Poll();
-
-			if (menuManager.getState() == GameState::Connecting) {
-				if (networkClient->IsConnected()) {
-					menuManager.notifyConnected();
-					// Enable/disable shoot buttons based on ship type
-					if (Environment::shipState.shipType == 1) {
-						if (auto b = menuManager.uiManager.findButton("shootButton"))  b->state = ButtonState::Disabled;
-						if (auto b = menuManager.uiManager.findButton("shootButton2")) b->state = ButtonState::Disabled;
-					} else {
-						if (auto b = menuManager.uiManager.findButton("shootButton"))  b->state = ButtonState::Normal;
-						if (auto b = menuManager.uiManager.findButton("shootButton2")) b->state = ButtonState::Normal;
-					}
-				} else if (SDL_GetTicks() - connectingStartTicks > CONNECTING_TIMEOUT_MS) {
-					menuManager.notifyConnectionFailed();
-				}
-			}
-#ifdef NETWORK
-			auto* wsBase = dynamic_cast<ZL::WebSocketClientBase*>(networkClient.get());
-			if (wsBase) {
-				auto spawns = wsBase->getPendingSpawns();
-				for (auto& st : spawns) {
-					if (st.id == wsBase->getClientId()) {
-						// применяем к локальному кораблю
-						ZL::Environment::shipState.position = st.position;
-						ZL::Environment::shipState.rotation = st.rotation;
-
-						// обнуляем движение чтобы не было рывков
-						ZL::Environment::shipState.currentAngularVelocity = Eigen::Vector3f::Zero();
-						ZL::Environment::shipState.velocity = 0.0f;
-						ZL::Environment::shipState.selectedVelocity = 0;
-						ZL::Environment::shipState.discreteMag = 0.0f;
-						ZL::Environment::shipState.discreteAngle = -1;
-
-						std::cout << "Game: Applied SPAWN at "
-							<< st.position.x() << ", "
-							<< st.position.y() << ", "
-							<< st.position.z() << std::endl;
-					}
-				}
-			}
-#endif
-		}
 		mainThreadHandler.processMainThreadTasks();
 
-		if (menuManager.shouldRenderSpace()) {
-			space.update();
-		}
 	}
 
 	void Game::handleDown(int64_t fingerId, int mx, int my)
@@ -527,13 +450,9 @@ namespace ZL
 		int uiX = mx;
 		int uiY = Environment::projectionHeight - my;
 
+		
 		menuManager.uiManager.onTouchDown(fingerId, uiX, uiY);
 
-		if (!menuManager.uiManager.isUiInteractionForFinger(fingerId)) {
-			if (menuManager.shouldRenderSpace()) {
-				space.handleDown(mx, my);
-			}
-		}
 	}
 
 	void Game::handleUp(int64_t fingerId, int mx, int my)
@@ -547,11 +466,6 @@ namespace ZL
 		bool wasUiInteraction = menuManager.uiManager.isUiInteractionForFinger(fingerId);
 		menuManager.uiManager.onTouchUp(fingerId, uiX, uiY);
 
-		if (!wasUiInteraction) {
-			if (menuManager.shouldRenderSpace()) {
-				space.handleUp(mx, my);
-			}
-		}
 	}
 
 	void Game::handleMotion(int64_t fingerId, int mx, int my)
@@ -564,11 +478,6 @@ namespace ZL
 		bool wasUiInteraction = menuManager.uiManager.isUiInteractionForFinger(fingerId);
 		menuManager.uiManager.onTouchMove(fingerId, uiX, uiY);
 
-		if (!wasUiInteraction) {
-			if (menuManager.shouldRenderSpace()) {
-				space.handleMotion(mx, my);
-			}
-		}
 	}
 
 

src/Game.h

@@ -37,19 +37,31 @@ namespace ZL {
 		Renderer renderer;
 		TaskManager taskManager;
 		MainThreadHandler mainThreadHandler;
-		std::unique_ptr<INetworkClient> networkClient;
+		//std::unique_ptr<INetworkClient> networkClient;
 		
 
 		std::shared_ptr<Texture> loadingTexture;
 		VertexRenderStruct loadingMesh;
 		bool loadingCompleted = false;
 
+
+		std::shared_ptr<Texture> roomTexture;
+		VertexRenderStruct roomMesh;
+
+		std::shared_ptr<Texture> fireboxTexture;
+		VertexRenderStruct fireboxMesh; 
+		
+		std::shared_ptr<Texture> inaiTexture;
+		VertexRenderStruct inaiMesh;
+
+		std::shared_ptr<Texture> benchTexture;
+		VertexRenderStruct benchMesh;
 	private:
 		int64_t getSyncTimeMs();
 		void processTickCount();
 		void drawScene();
 		void drawUI();
-		void drawUnderMainMenu();
+		void drawGame();
 		void drawLoading();
 		void handleDown(int64_t fingerId, int mx, int my);
 		void handleUp(int64_t fingerId, int mx, int my);
@@ -73,7 +85,7 @@ namespace ZL {
 		static const size_t CONST_MAX_TIME_INTERVAL = 1000;
 
 		MenuManager menuManager;
-		Space space;
+		//Space space;
 	};
 
 

src/MenuManager.cpp

@@ -15,6 +15,7 @@ namespace ZL {
 	{
 	}
 
+	/*
 	void MenuManager::setupMenu()
 	{
 		mainMenuRoot        = loadUiFromFile("resources/config/main_menu.json",           renderer, CONST_ZIP_FILE);
@@ -256,12 +257,7 @@ namespace ZL {
 		}
 
 
-		/*
+	
-		auto velocityTv = uiManager.findTextView("velocityText");
-		if (velocityTv) {
-			velocityTv->rect.x = 10.0f;
-			velocityTv->rect.y = static_cast<float>(Environment::height) - velocityTv->rect.h - 10.0f;
-		}*/
 
 		uiManager.setButtonPressCallback("shootButton", [this](const std::string&) {
 			if (onFirePressed) onFirePressed();
@@ -317,14 +313,6 @@ namespace ZL {
 			});
 
 
-		/*
-		uiManager.setSliderCallback("velocitySlider", [this](const std::string&, float value) {
-			int newVel = static_cast<int>(roundf(value * 10));
-			if (newVel > 2) newVel = 2;
-			if (newVel != Environment::shipState.selectedVelocity) {
-				if (onVelocityChanged) onVelocityChanged(newVel);
-			}
-			});*/
 	}
 
 	// ── State: GameOver ──────────────────────────────────────────────────────
@@ -399,6 +387,6 @@ namespace ZL {
 		if (state == GameState::Gameplay) {
 			enterConnectionLost();
 		}
-	}
+	}*/
 
 } // namespace ZL

src/MenuManager.h

@@ -24,7 +24,7 @@ namespace ZL {
 	class MenuManager {
 	protected:
 		Renderer& renderer;
-
+		/*
 		// Pre-loaded UI roots (loaded once in setupMenu)
 		std::shared_ptr<UiNode> mainMenuRoot;
 		std::shared_ptr<UiNode> aboutMenuRoot;
@@ -53,14 +53,15 @@ namespace ZL {
 		void enterGameOver(int score);
 		void enterHelp();
 		void enterConnectionLost();
-
+		*/
 	public:
 		UiManager uiManager;
 
 		MenuManager(Renderer& iRenderer);
 
-		void setupMenu();
+		//void setupMenu();
 
+		/*
 		// Returns true for states where Space should render and run (Gameplay, GameOver, ConnectionLost)
 		bool shouldRenderSpace() const;
 		GameState getState() const { return state; }
@@ -81,7 +82,7 @@ namespace ZL {
 		std::function<void(const std::string&, int)> onMultiplayerPressed;
 		std::function<void()> onShowPlayersPressed;
 
-		std::function<void()> forceSetupSpaceUICallback;
+		std::function<void()> forceSetupSpaceUICallback;*/
 	};
 
 } // namespace ZL

src/TextModel.cpp

@@ -265,7 +265,7 @@ namespace ZL
 		// Обновленные регулярки
 		// pattern_float стал чуть надежнее для чисел вида "0" или "-1" без точки, если вдруг Python округлит до int
 		static const std::regex pattern_count(R"(\d+)");
-		static const std::regex pattern_float(R"([-]?\d+(\.\d+)?)");
+		static const std::regex pattern_float(R"([-+]?\d*\.?\d+([eE][-+]?\d+)?)"); 
 		static const std::regex pattern_int(R"([-]?\d+)");
 
 		// --- 2. Парсинг Вершин (Pos + Norm + UV) ---
@@ -317,6 +317,11 @@ namespace ZL
 				throw std::runtime_error("Malformed vertex line at index " + std::to_string(i));
 			}
 
+			/*if (floatValues[2] > 1.f)
+			{
+				std::cout << "got" << std::endl;
+			}*/
+
 			tempPositions[i] = Vector3f{ floatValues[1], floatValues[2], floatValues[3] };
 			tempNormals[i] = Vector3f{ floatValues[4], floatValues[5], floatValues[6] };
 			tempUVs[i] = Vector2f{ floatValues[7], floatValues[8] };