From beac06fd456d3436b0e55cd232343e1c60513fe2 Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <mephi1984@gmail.com>
Date: Thu, 12 Mar 2026 11:36:47 +0300
Subject: [PATCH] Production-ready, fixing server bugs

---
 proj-web/space-game001plain.html          |  34 +----
 resources/config/about.json               | 144 ++++++++++++++--------
 resources/rockdark3.png                   |   4 +-
 resources/sand2.png                       |   4 +-
 resources/sky/space1.png                  |   4 +-
 server/server.cpp                         |   2 +-
 src/Game.cpp                              |   8 --
 src/Space.cpp                             |   1 +
 src/SparkEmitter.cpp                      |   3 +
 src/network/WebSocketClientEmscripten.cpp |  14 +--
 10 files changed, 110 insertions(+), 108 deletions(-)
diff --git a/proj-web/space-game001plain.html b/proj-web/space-game001plain.html
index 78ab463..e4acfc9 100644
--- a/proj-web/space-game001plain.html
+++ b/proj-web/space-game001plain.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Space Game</title>
+    <title>Sky Trek Tales</title>
     <style>
         body, html {
             margin: 0; padding: 0; width: 100%; height: 100%;
@@ -75,38 +75,6 @@
     <button id="fs-button">Fullscreen</button>
     <div id="status">Downloading...</div>
     <canvas id="canvas" oncontextmenu="event.preventDefault()" tabindex="-1"></canvas>
-<!-- 
-    <script>
-        var statusElement = document.getElementById("status");
-        var canvas = document.getElementById("canvas");
-
-        var Module = {
-            canvas: canvas,
-            setStatus: function(text) {
-                statusElement.innerHTML = text;
-                statusElement.style.display = text ? 'block' : 'none';
-            }
-        };
-
-        document.getElementById('fs-button').addEventListener('click', function() {
-            if (!document.fullscreenElement) {
-                document.documentElement.requestFullscreen().catch(e => {
-                    console.error(`Error attempting to enable full-screen mode: ${e.message}`);
-                });
-            } else {
-                document.exitFullscreen();
-            }
-        });
-
-        window.addEventListener("orientationchange", function() {
-            setTimeout(() => {
-                window.dispatchEvent(new Event('resize'));
-            }, 200);
-        });
-
-    </script>
-    <script async src="space-game001.js"></script>-->
-
     <div id="nickOverlay" style="display:none;">
         <div id="nickBox">
             <h2>Enter your nickname</h2>
diff --git a/resources/config/about.json b/resources/config/about.json
index 1162fd2..94e7e7d 100644
--- a/resources/config/about.json
+++ b/resources/config/about.json
@@ -33,13 +33,13 @@
 						"type": "TextView",
 						"name": "aboutText1",
 						"width": 434,
-						"height": 40,
+						"height": 30,
 						"x": -300,
 						"y": 0,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
 						"text": "Producer: Vladislav Khorev",
-						"fontSize": 32,
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -52,13 +52,13 @@
 						"type": "TextView",
 						"name": "aboutText2",
 						"width": 434,
-						"height": 40,
+						"height": 30,
 						"x": -300,
-						"y": 60,
+						"y": 40,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
 						"text": "Lead Developer: Vladislav Khorev",
-						"fontSize": 32,
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -71,13 +71,51 @@
 						"type": "TextView",
 						"name": "aboutText2",
 						"width": 434,
-						"height": 40,
+						"height": 2,
+						"x": -300,
+						"y": 80,
+						"horizontal_gravity": "left",
+						"vertical_gravity": "top",
+						"text": "Game Designer: Leila Bobrova",
+						"fontSize": 24,
+						"color": [
+							255,
+							255,
+							255,
+							1
+						],
+						"centered": false
+					},
+					{
+						"type": "TextView",
+						"name": "aboutText2",
+						"width": 434,
+						"height": 30,
 						"x": -300,
 						"y": 120,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
-						"text": "Game Designer: Leila Bobrova",
-						"fontSize": 32,
+						"text": "Developers: ",
+						"fontSize": 24,
+						"color": [
+							255,
+							255,
+							255,
+							1
+						],
+						"centered": false
+					},
+					{
+						"type": "TextView",
+						"name": "aboutText2",
+						"width": 434,
+						"height": 40,
+						"x": -300,
+						"y": 150,
+						"horizontal_gravity": "left",
+						"vertical_gravity": "top",
+						"text": "Vladislav Kan",
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -95,46 +133,8 @@
 						"y": 180,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
-						"text": "Developers: ",
-						"fontSize": 32,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 220,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
-						"text": "Vladislav Kan",
-						"fontSize": 32,
-						"color": [
-							255,
-							255,
-							255,
-							1
-						],
-						"centered": false
-					},
-					{
-						"type": "TextView",
-						"name": "aboutText2",
-						"width": 434,
-						"height": 40,
-						"x": -300,
-						"y": 260,
-						"horizontal_gravity": "left",
-						"vertical_gravity": "top",
 						"text": "Beksultan Almazbekov",
-						"fontSize": 32,
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -149,11 +149,11 @@
 						"width": 434,
 						"height": 40,
 						"x": -300,
-						"y": 300,
+						"y": 210,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
 						"text": "Sergei Zotov",
-						"fontSize": 32,
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -168,11 +168,11 @@
 						"width": 434,
 						"height": 40,
 						"x": -300,
-						"y": 360,
+						"y": 250,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
 						"text": "3D Artist: David \"nokken\" Im",
-						"fontSize": 32,
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
@@ -187,11 +187,49 @@
 						"width": 434,
 						"height": 40,
 						"x": -300,
-						"y": 420,
+						"y": 290,
 						"horizontal_gravity": "left",
 						"vertical_gravity": "top",
 						"text": "UI/UX Design: Kenje Kazmatova",
-						"fontSize": 32,
+						"fontSize": 24,
+						"color": [
+							255,
+							255,
+							255,
+							1
+						],
+						"centered": false
+					},
+					{
+						"type": "TextView",
+						"name": "aboutText2",
+						"width": 434,
+						"height": 40,
+						"x": -300,
+						"y": 330,
+						"horizontal_gravity": "left",
+						"vertical_gravity": "top",
+						"text": "Sky Trek Tales v. 0.1",
+						"fontSize": 24,
+						"color": [
+							255,
+							255,
+							255,
+							1
+						],
+						"centered": false
+					},
+					{
+						"type": "TextView",
+						"name": "aboutText2",
+						"width": 434,
+						"height": 40,
+						"x": -300,
+						"y": 370,
+						"horizontal_gravity": "left",
+						"vertical_gravity": "top",
+						"text": "https://fishrungames.com",
+						"fontSize": 24,
 						"color": [
 							255,
 							255,
diff --git a/resources/rockdark3.png b/resources/rockdark3.png
index 1fb9bd8..363b196 100644
--- a/resources/rockdark3.png
+++ b/resources/rockdark3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73deb9d2f2ae15adcb85cfb391020097f9c91b87b1ac9d55a40e9da16353d924
-size 337933
+oid sha256:b1d92e3dc20ea15bbaab4f7b86d8855fda7a9e72ee7ea8366dc7e58d9386fba7
+size 299957
diff --git a/resources/sand2.png b/resources/sand2.png
index c6071bf..41d78ed 100644
--- a/resources/sand2.png
+++ b/resources/sand2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d9d8ab954d9bbaed4e56f9539e2e535dece08a5c6befa136afe80d46b00f649
-size 616658
+oid sha256:f081e6e88c67a5eb2413f30f9ae6c28fb2ef8a04a1943a735132568d39846963
+size 577917
diff --git a/resources/sky/space1.png b/resources/sky/space1.png
index 1f52586..4e90828 100644
--- a/resources/sky/space1.png
+++ b/resources/sky/space1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c82b1046b9996368f0a2aee0dabd755b9edb1c91635e49b96c53d20a900759ff
-size 62234
+oid sha256:adedf88c37fa72e0bbff668e4defeb7698f195b224f1f6a040cedf366bbd3786
+size 275905
diff --git a/server/server.cpp b/server/server.cpp
index 716cb65..db50b1a 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -25,7 +25,6 @@ Session::Session(Server& server, tcp::socket&& socket, int id)
 }
 
 bool Session::is_timed_out(std::chrono::system_clock::time_point now) const {
-	if (!joined_) return false;
 	auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - lastReceivedTime_).count();
 	return elapsed > PLAYER_TIMEOUT_MS;
 }
@@ -268,6 +267,7 @@ void Session::process_message(const std::string& msg) {
 			std::lock_guard<std::mutex> lock(server_.g_sessions_mutex);
 			for (auto& session : server_.g_sessions) {
 				if (session->get_id() == this->id_) continue;
+				if (!session->joined_) continue;
 				std::string otherInfo = "PLAYERINFO:" + std::to_string(session->get_id()) + ":" + session->nickname + ":" + std::to_string(session->shipType);
 
 				this->send_message(otherInfo);
diff --git a/src/Game.cpp b/src/Game.cpp
index b58236e..f5ca8b4 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -37,7 +37,6 @@ namespace ZL
 #ifdef EMSCRIPTEN
 	const char* CONST_ZIP_FILE = "resources.zip";
 #else
-	//const char* CONST_ZIP_FILE = "C:\\Work\\Projects\\space-game001\\resources.zip";
 	const char* CONST_ZIP_FILE = "";
 #endif
 
@@ -72,13 +71,6 @@ namespace ZL
 	}
 
 	Game::~Game() {
-		/*
-		if (glContext) {
-			SDL_GL_DeleteContext(glContext);
-		}
-		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.
diff --git a/src/Space.cpp b/src/Space.cpp
index 8cc316f..84de330 100644
--- a/src/Space.cpp
+++ b/src/Space.cpp
@@ -570,6 +570,7 @@ namespace ZL
 		renderer.PushMatrix();
 		renderer.TranslateMatrix({ 0, -6.f, 0 }); //Ship camera offset
 
+		//renderer.RotateMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI * 150 / 180.f, Eigen::Vector3f::UnitY())).toRotationMatrix());
 		if (shipAlive) {
 			if (Environment::shipState.shipType == 1 && cargoTexture) {
 				glBindTexture(GL_TEXTURE_2D, cargoTexture->getTexID());
diff --git a/src/SparkEmitter.cpp b/src/SparkEmitter.cpp
index 4baa1dc..abcbe33 100644
--- a/src/SparkEmitter.cpp
+++ b/src/SparkEmitter.cpp
@@ -100,7 +100,10 @@ namespace ZL {
 				 }
 				else {
 					posCam = particle.position;
+					//Vector3f rel = particle.position - Environment::shipState.position;
+					//posCam = Environment::shipState.position + Eigen::Quaternionf(Eigen::AngleAxisf(M_PI * 150 / 180.f, Eigen::Vector3f::UnitY())).toRotationMatrix() * Environment::inverseShipMatrix * rel;
 				}
+				//sortedParticles.push_back({ &particle, particle.position(2) });
 				sortedParticles.push_back({ &particle, posCam(2) });
 			}
 		}
diff --git a/src/network/WebSocketClientEmscripten.cpp b/src/network/WebSocketClientEmscripten.cpp
index 083b748..4f4fcbb 100644
--- a/src/network/WebSocketClientEmscripten.cpp
+++ b/src/network/WebSocketClientEmscripten.cpp
@@ -51,12 +51,12 @@ namespace ZL {
         {
             std::lock_guard<std::mutex> lock(outgoingMutex);
             if (connected && socket_ > 0) {
-                std::cout << "[WebWS] Sending message (immediate): " << signedMsg << std::endl;
+                //std::cout << "[WebWS] Sending message (immediate): " << signedMsg << std::endl;
                 emscripten_websocket_send_utf8_text(socket_, signedMsg.c_str());
                 return;
             }
             outgoingQueue.push(signedMsg);
-            std::cout << "[WebWS] Queued outgoing message (waiting for open): " << signedMsg << std::endl;
+            //std::cout << "[WebWS] Queued outgoing message (waiting for open): " << signedMsg << std::endl;
         }
     }
 
@@ -69,7 +69,7 @@ namespace ZL {
 
         while (!localQueue.empty()) {
             const std::string& msg = localQueue.front();
-            std::cout << "[WebWS] Processing message: " << msg << std::endl;
+            //std::cout << "[WebWS] Processing message: " << msg << std::endl;
 
             // Передаем в базовый класс для парсинга игровых событий (BOXES, UPD, и т.д.)
             HandlePollMessage(msg);
@@ -83,7 +83,7 @@ namespace ZL {
     EM_BOOL WebSocketClientEmscripten::onOpen(int eventType, const EmscriptenWebSocketOpenEvent* e, void* userData) {
         auto* self = static_cast<WebSocketClientEmscripten*>(userData);
         self->connected = true;
-        std::cout << "[WebWS] Connection opened" << std::endl;
+        //std::cout << "[WebWS] Connection opened" << std::endl;
 
         self->flushOutgoingQueue();
 
@@ -91,7 +91,7 @@ namespace ZL {
     }
 
     EM_BOOL WebSocketClientEmscripten::onMessage(int eventType, const EmscriptenWebSocketMessageEvent* e, void* userData) {
-        std::cout << "[WebWS] onMessage " << std::endl;
+        //std::cout << "[WebWS] onMessage " << std::endl;
         auto* self = static_cast<WebSocketClientEmscripten*>(userData);
         if (e->isText && e->data) {
             std::string msg(reinterpret_cast<const char*>(e->data), e->numBytes);
@@ -103,14 +103,14 @@ namespace ZL {
     EM_BOOL WebSocketClientEmscripten::onError(int eventType, const EmscriptenWebSocketErrorEvent* e, void* userData) {
         auto* self = static_cast<WebSocketClientEmscripten*>(userData);
         self->connected = false;
-        std::cerr << "[WebWS] Error detected" << std::endl;
+        //std::cerr << "[WebWS] Error detected" << std::endl;
         return EM_TRUE;
     }
 
     EM_BOOL WebSocketClientEmscripten::onClose(int eventType, const EmscriptenWebSocketCloseEvent* e, void* userData) {
         auto* self = static_cast<WebSocketClientEmscripten*>(userData);
         self->connected = false;
-        std::cout << "[WebWS] Connection closed" << std::endl;
+        //std::cout << "[WebWS] Connection closed" << std::endl;
         return EM_TRUE;
     }
 
