This commit is contained in:
2022-10-24 14:30:08 +02:00
parent 479a83fdef
commit b8697e7204
3 changed files with 15 additions and 15 deletions
+6 -6
View File
@@ -9,9 +9,9 @@ enum class NetworkMessageIDs : uint8
None = 0,
Handshake,
HandshakeReply,
ReplicatedObject,
SpawnObject,
DespawnObject,
ObjectReplicate,
ObjectSpawn,
ObjectDespawn,
MAX,
};
@@ -24,7 +24,7 @@ public:
static void NetworkReplicatorClear();
static void NetworkReplicatorPreUpdate();
static void NetworkReplicatorUpdate();
static void OnNetworkMessageReplicatedObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
static void OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
static void OnNetworkMessageDespawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
static void OnNetworkMessageObjectReplicate(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
static void OnNetworkMessageObjectSpawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
static void OnNetworkMessageObjectDespawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer);
};
+3 -3
View File
@@ -128,9 +128,9 @@ namespace
nullptr,
OnNetworkMessageHandshake,
OnNetworkMessageHandshakeReply,
NetworkInternal::OnNetworkMessageReplicatedObject,
NetworkInternal::OnNetworkMessageSpawnObject,
NetworkInternal::OnNetworkMessageDespawnObject,
NetworkInternal::OnNetworkMessageObjectReplicate,
NetworkInternal::OnNetworkMessageObjectSpawn,
NetworkInternal::OnNetworkMessageObjectDespawn,
};
}
@@ -26,7 +26,7 @@
PACK_STRUCT(struct NetworkMessageReplicatedObject
{
NetworkMessageIDs ID = NetworkMessageIDs::ReplicatedObject;
NetworkMessageIDs ID = NetworkMessageIDs::ObjectReplicate;
uint32 OwnerFrame;
Guid ObjectId; // TODO: introduce networked-ids to synchronize unique ids as ushort (less data over network)
Guid ParentId;
@@ -36,7 +36,7 @@ PACK_STRUCT(struct NetworkMessageReplicatedObject
PACK_STRUCT(struct NetworkMessageSpawnObject
{
NetworkMessageIDs ID = NetworkMessageIDs::SpawnObject;
NetworkMessageIDs ID = NetworkMessageIDs::ObjectSpawn;
Guid ObjectId;
Guid ParentId;
uint32 OwnerClientId;
@@ -45,7 +45,7 @@ PACK_STRUCT(struct NetworkMessageSpawnObject
PACK_STRUCT(struct NetworkMessageDespawnObject
{
NetworkMessageIDs ID = NetworkMessageIDs::SpawnObject;
NetworkMessageIDs ID = NetworkMessageIDs::ObjectSpawn;
Guid ObjectId;
});
@@ -546,7 +546,7 @@ void NetworkInternal::NetworkReplicatorUpdate()
Scripting::ObjectsLookupIdMapping.Set(nullptr);
}
void NetworkInternal::OnNetworkMessageReplicatedObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
void NetworkInternal::OnNetworkMessageObjectReplicate(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
{
NetworkMessageReplicatedObject msgData;
event.Message.ReadStructure(msgData);
@@ -594,7 +594,7 @@ void NetworkInternal::OnNetworkMessageReplicatedObject(NetworkEvent& event, Netw
}
}
void NetworkInternal::OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
void NetworkInternal::OnNetworkMessageObjectSpawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
{
NetworkMessageSpawnObject msgData;
event.Message.ReadStructure(msgData);
@@ -656,7 +656,7 @@ void NetworkInternal::OnNetworkMessageSpawnObject(NetworkEvent& event, NetworkCl
}
}
void NetworkInternal::OnNetworkMessageDespawnObject(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
void NetworkInternal::OnNetworkMessageObjectDespawn(NetworkEvent& event, NetworkClient* client, NetworkPeer* peer)
{
NetworkMessageDespawnObject msgData;
event.Message.ReadStructure(msgData);