Skip to content

Commit 105faf1

Browse files
committed
Improved classes naming and removed useless includes.
1 parent a4cc56f commit 105faf1

10 files changed

Lines changed: 239 additions & 263 deletions

net_utilities.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "net_utilities.h"
22

3+
#include "core/ensure.h"
34
#include "core/object_data.h"
4-
#include "modules/network_synchronizer/net_utilities.h"
5-
#include "modules/network_synchronizer/networked_controller.h"
6-
#include "modules/network_synchronizer/scene_synchronizer_debugger.h"
7-
#include "networked_controller.h"
5+
#include "peer_networked_controller.h"
86
#include "scene_synchronizer.h"
97
#include "scene_synchronizer_debugger.h"
108
#include <limits>
@@ -19,7 +17,7 @@ int NS::PeerData::get_latency() const {
1917
}
2018

2119
void NS::PeerData::make_controller(NS::SceneSynchronizerBase &p_scene_sync, int p_peer) {
22-
controller = std::make_unique<NS::NetworkedControllerBase>();
20+
controller = std::make_unique<NS::PeerNetworkedController>();
2321
controller->setup_synchronizer(p_scene_sync, p_peer);
2422
}
2523

@@ -322,15 +320,15 @@ void NS::SyncGroup::notify_controller_changed(NS::ObjectData *p_object_data, int
322320

323321
void NS::SyncGroup::notify_simulating_peers_about_listener_status(int p_peer_listener, bool p_simulating) {
324322
for (int peer : simulating_peers) {
325-
NetworkedControllerBase *controller = scene_sync->get_controller_for_peer(peer);
323+
PeerNetworkedController *controller = scene_sync->get_controller_for_peer(peer);
326324
if (controller) {
327325
controller->server_set_peer_simulating_this_controller(p_peer_listener, p_simulating);
328326
}
329327
}
330328
}
331329

332330
void NS::SyncGroup::update_listeners_to_simulating_peer(int p_simulating_peer, bool p_simulating) {
333-
NetworkedControllerBase *controller = scene_sync->get_controller_for_peer(p_simulating_peer);
331+
PeerNetworkedController *controller = scene_sync->get_controller_for_peer(p_simulating_peer);
334332
if (controller) {
335333
for (int peer : listening_peers) {
336334
controller->server_set_peer_simulating_this_controller(peer, p_simulating);

net_utilities.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
#include "core/core.h"
77
#include "core/processor.h"
88
#include "core/var_data.h"
9-
#include "modules/network_synchronizer/core/core.h"
109
#include <chrono>
1110
#include <map>
12-
#include <memory>
1311
#include <string>
1412
#include <vector>
1513

@@ -433,7 +431,7 @@ struct PeerAuthorityData {
433431
};
434432

435433
struct PeerData {
436-
std::unique_ptr<class NetworkedControllerBase> controller;
434+
std::unique_ptr<class PeerNetworkedController> controller;
437435

438436
public:
439437
PeerAuthorityData authority_data;
@@ -452,10 +450,10 @@ struct PeerData {
452450
std::uint8_t get_compressed_latency() const { return compressed_latency; }
453451

454452
void make_controller(class SceneSynchronizerBase &p_scene_sync, int p_peer);
455-
NetworkedControllerBase *get_controller() {
453+
PeerNetworkedController *get_controller() {
456454
return controller.get();
457455
}
458-
const NetworkedControllerBase *get_controller() const {
456+
const PeerNetworkedController *get_controller() const {
459457
return controller.get();
460458
}
461459
};

0 commit comments

Comments
 (0)