MayaTheShy/Starworld
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: enhance entity query handling by adding server readiness check and simplifying packet structure

Browse Source
This commit is contained in:
MayaTheShy
2025-11-08 17:14:45 -05:00
parent 1b79c2eee9
commit 25c73e05d2
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OverteClient.cpp
View File

@@ -516,24 +516,26 @@ void OverteClient::sendPing(int fd, const sockaddr_storage& addr, socklen_t addr
} }
void OverteClient::sendEntityQuery() { void OverteClient::sendEntityQuery() {
if (m_entityFd < 0) return; if (m_entityFd < 0 || !m_entityServerReady) return;
const unsigned char PACKET_TYPE_ENTITY_QUERY = 0x15; const unsigned char PACKET_TYPE_ENTITY_QUERY = 0x15;
// EntityQuery packet structure: // EntityQuery packet structure (simplified):
// [PacketType:u8][ConicalViews:bool][CameraPosition:vec3][CameraOrientation:quat][CameraFov:float][CameraAspectRatio:float][CameraNearClip:float][CameraFarClip:float][CameraEyeOffsetPosition:vec3] // [PacketType:u8][ConicalViews:bool][CameraFrustum if ConicalViews=true]
// Simplified version: just send packet type + false for conical views (requests all entities) // For simplicity, send with ConicalViews=false to request all entities
unsigned char packet[1 + 1]; // PacketType + ConicalViews flag std::vector<char> packet;
packet[0] = PACKET_TYPE_ENTITY_QUERY; packet.push_back(static_cast<char>(PACKET_TYPE_ENTITY_QUERY));
packet[1] = 0; // false - no conical frustum, send all entities packet.push_back(0); // ConicalViews = false
ssize_t sent = sendto(m_entityFd, packet, sizeof(packet), 0, // With ConicalViews=false, we're requesting all entities
// Additional octree query parameters can be added here
ssize_t sent = sendto(m_entityFd, packet.data(), packet.size(), 0,
reinterpret_cast<const sockaddr*>(&m_entityAddr), m_entityAddrLen); reinterpret_cast<const sockaddr*>(&m_entityAddr), m_entityAddrLen);
if (sent > 0) { if (sent > 0) {
std::cout << "[OverteClient] Sent EntityQuery (all entities)" << std::endl; std::cout << "[OverteClient] Sent EntityQuery to EntityServer" << std::endl;
m_entityServerReady = true;
} else { } else {
std::cerr << "[OverteClient] Failed to send EntityQuery: " << strerror(errno) << std::endl; std::cerr << "[OverteClient] Failed to send EntityQuery: " << strerror(errno) << std::endl;
} }