fixed: spawning ships

src/Game.cpp

@@ -16,6 +16,7 @@
 #endif
 
 #ifdef NETWORK
+#include "network/WebSocketClientBase.h"
 #ifdef EMSCRIPTEN
 #include "network/WebSocketClientEmscripten.h"
 #else
@@ -443,6 +444,31 @@ namespace ZL
 			}
 #endif
 			networkClient->Poll();
+#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();
 

src/network/WebSocketClientBase.cpp

@@ -190,7 +190,28 @@ namespace ZL {
 			}
 			return;
 		}
+		if (msg.rfind("SPAWN:", 0) == 0) {
+			// SPAWN:playerId:serverTime:<14 полей>
+			if (parts.size() >= 3 + 14) {
+				try {
+					int pid = std::stoi(parts[1]);
+					uint64_t serverTime = std::stoull(parts[2]);
 
+					ClientState st;
+					st.id = pid;
+					std::chrono::system_clock::time_point tp{ std::chrono::milliseconds(serverTime) };
+					st.lastUpdateServerTime = tp;
+
+					// данные начинаются с parts[3]
+					st.handle_full_sync(parts, 3);
+
+					pendingSpawns_.push_back(st);
+					std::cout << "Client: SPAWN received for player " << pid << std::endl;
+				}
+				catch (...) {}
+			}
+			return;
+		}
 		if (msg.rfind("EVENT:", 0) == 0) {
 			//auto parts = split(msg, ':');
 			if (parts.size() < 5) return; // EVENT:ID:TYPE:TIME:DATA...
@@ -334,6 +355,12 @@ namespace ZL {
 		copy.swap(pendingBoxDestructions_);
 		return copy;
 	}
+
+	std::vector<ClientState> WebSocketClientBase::getPendingSpawns() {
+		std::vector<ClientState> copy;
+		copy.swap(pendingSpawns_);
+		return copy;
+	}
 }
 
 #endif

src/network/WebSocketClientBase.h

@@ -22,6 +22,7 @@ namespace ZL {
 		std::vector<BoxDestroyedInfo> pendingBoxDestructions_;
 		int clientId = -1;
 		int64_t timeOffset = 0;
+		std::vector<ClientState> pendingSpawns_;
 
 	public:
 		int GetClientId() const override { return clientId; }
@@ -48,6 +49,8 @@ namespace ZL {
 		std::vector<DeathInfo> getPendingDeaths() override;
 		std::vector<int> getPendingRespawns() override;
 		std::vector<BoxDestroyedInfo> getPendingBoxDestructions() override;
+		std::vector<ClientState> getPendingSpawns();
+		int getClientId() const { return clientId; }
 	};
 
 }