Skip to content

Commit a4cc56f

Browse files
AndreaCataniaAndreaCatania
committed
Renamed set_trickled and PROCESS_PHASE
1 parent 5b3a750 commit a4cc56f

10 files changed

Lines changed: 33 additions & 33 deletions

‎core/core.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ObjectLocalId ObjectLocalId::NONE = { std::numeric_limits<uint32_t>::max()
1818
const ObjectNetId ObjectNetId::NONE = { std::numeric_limits<uint32_t>::max() };
1919
const ObjectHandle ObjectHandle::NONE = { 0 };
2020

21-
static const char *ProcessPhaseName[PROCESSPHASE_COUNT] = {
21+
static const char *ProcessPhaseName[PROCESS_PHASE_COUNT] = {
2222
"EARLY PROCESS",
2323
"PRE PROCESS",
2424
"PROCESS",

‎core/core.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ enum NetEventFlag {
5858
};
5959

6060
enum ProcessPhase {
61-
PROCESSPHASE_EARLY = 0,
62-
PROCESSPHASE_PRE,
63-
PROCESSPHASE_PROCESS,
64-
PROCESSPHASE_POST,
65-
PROCESSPHASE_LATE,
66-
PROCESSPHASE_COUNT
61+
PROCESS_PHASE_EARLY = 0,
62+
PROCESS_PHASE_PRE,
63+
PROCESS_PHASE_PROCESS,
64+
PROCESS_PHASE_POST,
65+
PROCESS_PHASE_LATE,
66+
PROCESS_PHASE_COUNT
6767
};
6868

6969
const char *get_process_phase_name(ProcessPhase pp);

‎core/object_data.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ObjectLocalId ObjectData::get_local_id() const {
4040
}
4141

4242
bool ObjectData::has_registered_process_functions() const {
43-
for (int process_phase = PROCESSPHASE_EARLY; process_phase < PROCESSPHASE_COUNT; ++process_phase) {
43+
for (int process_phase = PROCESS_PHASE_EARLY; process_phase < PROCESS_PHASE_COUNT; ++process_phase) {
4444
if (functions[process_phase].size() > 0) {
4545
return true;
4646
}

‎core/object_data.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct ObjectData {
6969
/// The sync variables of this node. The order of this vector matters
7070
/// because the index is the `VarId`.
7171
std::vector<VarDescriptor> vars;
72-
NS::Processor<double> functions[PROCESSPHASE_COUNT];
72+
NS::Processor<double> functions[PROCESS_PHASE_COUNT];
7373

7474
std::function<void(DataBuffer & /*out_buffer*/, float /*update_rate*/)> func_trickled_collect;
7575
std::function<void(double /*delta*/, float /*interpolation_alpha*/, DataBuffer & /*past_buffer*/, DataBuffer & /*future_buffer*/)> func_trickled_apply;

‎doc_classes/GdSceneSynchronizer.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,15 @@
301301
</constant>
302302
<constant name="ALWAYS" value="31" enum="NetEventFlag">
303303
</constant>
304-
<constant name="PROCESSPHASE_EARLY" value="0" enum="ProcessPhase">
304+
<constant name="PROCESS_PHASE_EARLY" value="0" enum="ProcessPhase">
305305
</constant>
306-
<constant name="PROCESSPHASE_PRE" value="1" enum="ProcessPhase">
306+
<constant name="PROCESS_PHASE_PRE" value="1" enum="ProcessPhase">
307307
</constant>
308-
<constant name="PROCESSPHASE_PROCESS" value="2" enum="ProcessPhase">
308+
<constant name="PROCESS_PHASE_PROCESS" value="2" enum="ProcessPhase">
309309
</constant>
310-
<constant name="PROCESSPHASE_POST" value="3" enum="ProcessPhase">
310+
<constant name="PROCESS_PHASE_POST" value="3" enum="ProcessPhase">
311311
</constant>
312-
<constant name="PROCESSPHASE_LATE" value="4" enum="ProcessPhase">
312+
<constant name="PROCESS_PHASE_LATE" value="4" enum="ProcessPhase">
313313
</constant>
314314
</constants>
315315
</class>

‎godot4/gd_scene_synchronizer.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ void GdSceneSynchronizer::_bind_methods() {
3434
BIND_ENUM_CONSTANT(SYNC)
3535
BIND_ENUM_CONSTANT(ALWAYS)
3636

37-
BIND_ENUM_CONSTANT(PROCESSPHASE_EARLY)
38-
BIND_ENUM_CONSTANT(PROCESSPHASE_PRE)
39-
BIND_ENUM_CONSTANT(PROCESSPHASE_PROCESS)
40-
BIND_ENUM_CONSTANT(PROCESSPHASE_POST)
41-
BIND_ENUM_CONSTANT(PROCESSPHASE_LATE)
37+
BIND_ENUM_CONSTANT(PROCESS_PHASE_EARLY)
38+
BIND_ENUM_CONSTANT(PROCESS_PHASE_PRE)
39+
BIND_ENUM_CONSTANT(PROCESS_PHASE_PROCESS)
40+
BIND_ENUM_CONSTANT(PROCESS_PHASE_POST)
41+
BIND_ENUM_CONSTANT(PROCESS_PHASE_LATE)
4242

4343
ClassDB::bind_method(D_METHOD("reset_synchronizer_mode"), &GdSceneSynchronizer::reset_synchronizer_mode);
4444
ClassDB::bind_method(D_METHOD("clear"), &GdSceneSynchronizer::clear);
@@ -604,7 +604,7 @@ void GdSceneSynchronizer::setup_simulated_sync(
604604
}
605605

606606
void GdSceneSynchronizer::setup_trickled_sync(Node *p_node, const Callable &p_collect_epoch_func, const Callable &p_apply_epoch_func) {
607-
scene_synchronizer.set_trickled_sync(
607+
scene_synchronizer.setup_trickled_sync(
608608
scene_synchronizer.find_object_local_id(scene_synchronizer.to_handle(p_node)),
609609
[p_collect_epoch_func](DataBuffer &db, float p_update_rate) -> void {
610610
Array a;

‎scene_synchronizer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ void SceneSynchronizerBase::unregister_process(ObjectLocalId p_id, ProcessPhase
652652
}
653653
}
654654

655-
void SceneSynchronizerBase::set_trickled_sync(
655+
void SceneSynchronizerBase::setup_trickled_sync(
656656
ObjectLocalId p_id,
657657
std::function<void(DataBuffer & /*out_buffer*/, float /*update_rate*/)> p_func_trickled_collect,
658658
std::function<void(double /*delta*/, float /*interpolation_alpha*/, DataBuffer & /*past_buffer*/, DataBuffer & /*future_buffer*/)> p_func_trickled_apply) {
@@ -1391,7 +1391,7 @@ void SceneSynchronizerBase::process_functions__execute() {
13911391

13921392
if (cached_process_functions_valid == false) {
13931393
// Clear the process_functions.
1394-
for (int process_phase = PROCESSPHASE_EARLY; process_phase < PROCESSPHASE_COUNT; ++process_phase) {
1394+
for (int process_phase = PROCESS_PHASE_EARLY; process_phase < PROCESS_PHASE_COUNT; ++process_phase) {
13951395
cached_process_functions[process_phase].clear();
13961396
}
13971397

@@ -1403,7 +1403,7 @@ void SceneSynchronizerBase::process_functions__execute() {
14031403
}
14041404

14051405
// For each valid NodeData.
1406-
for (int process_phase = PROCESSPHASE_EARLY; process_phase < PROCESSPHASE_COUNT; ++process_phase) {
1406+
for (int process_phase = PROCESS_PHASE_EARLY; process_phase < PROCESS_PHASE_COUNT; ++process_phase) {
14071407
// Append the contained functions.
14081408
cached_process_functions[process_phase].append(od->functions[process_phase]);
14091409
}
@@ -1415,7 +1415,7 @@ void SceneSynchronizerBase::process_functions__execute() {
14151415
SceneSynchronizerDebugger::singleton()->print(INFO, "Process functions START");
14161416

14171417
// Pre process phase
1418-
for (int process_phase = PROCESSPHASE_EARLY; process_phase < PROCESSPHASE_PROCESS; ++process_phase) {
1418+
for (int process_phase = PROCESS_PHASE_EARLY; process_phase < PROCESS_PHASE_PROCESS; ++process_phase) {
14191419
const std::string info = "process phase: " + std::to_string(process_phase);
14201420
NS_PROFILE_WITH_INFO(info);
14211421
cached_process_functions[process_phase].broadcast(get_fixed_frame_delta());
@@ -1435,7 +1435,7 @@ void SceneSynchronizerBase::process_functions__execute() {
14351435
}
14361436

14371437
// Post process
1438-
for (int process_phase = PROCESSPHASE_PROCESS; process_phase < PROCESSPHASE_COUNT; ++process_phase) {
1438+
for (int process_phase = PROCESS_PHASE_PROCESS; process_phase < PROCESS_PHASE_COUNT; ++process_phase) {
14391439
const std::string info = "process phase: " + std::to_string(process_phase);
14401440
NS_PROFILE_WITH_INFO(info);
14411441
cached_process_functions[process_phase].broadcast(get_fixed_frame_delta());

‎scene_synchronizer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ class SceneSynchronizerBase {
212212
std::vector<ChangesListener *> changes_listeners;
213213

214214
bool cached_process_functions_valid = false;
215-
Processor<double> cached_process_functions[PROCESSPHASE_COUNT];
215+
Processor<double> cached_process_functions[PROCESS_PHASE_COUNT];
216216

217217
// Set at runtime by the constructor by reading the project settings.
218218
bool debug_rewindings_enabled = false;

‎tests/test_doll_simulation.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ struct TestDollSimulationBase {
151151
controller_2_peer1 = peer_1_scene.add_object<TDSLocalNetworkedController>("controller_2", peer_2_scene.get_peer());
152152
controller_2_peer2 = peer_2_scene.add_object<TDSLocalNetworkedController>("controller_2", peer_2_scene.get_peer());
153153

154-
server_scene.scene_sync->register_process(server_scene.scene_sync->find_local_id(), PROCESSPHASE_LATE, [=](double p_delta) -> void {
154+
server_scene.scene_sync->register_process(server_scene.scene_sync->find_local_id(), PROCESS_PHASE_LATE, [=](double p_delta) -> void {
155155
on_server_process(p_delta);
156156
});
157-
peer_1_scene.scene_sync->register_process(peer_1_scene.scene_sync->find_local_id(), PROCESSPHASE_LATE, [=](double p_delta) -> void {
157+
peer_1_scene.scene_sync->register_process(peer_1_scene.scene_sync->find_local_id(), PROCESS_PHASE_LATE, [=](double p_delta) -> void {
158158
on_client_1_process(p_delta);
159159
});
160-
peer_2_scene.scene_sync->register_process(peer_2_scene.scene_sync->find_local_id(), PROCESSPHASE_LATE, [=](double p_delta) -> void {
160+
peer_2_scene.scene_sync->register_process(peer_2_scene.scene_sync->find_local_id(), PROCESS_PHASE_LATE, [=](double p_delta) -> void {
161161
on_client_2_process(p_delta);
162162
});
163163

‎tests/test_simulation.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,16 +283,16 @@ struct TestSimulationBase {
283283
MagnetSceneObject *heavy_magnet_p1 = peer_1_scene.add_object<MagnetSceneObject>("magnet_2", server_scene.get_peer());
284284

285285
// Register the process
286-
server_scene.scene_sync->register_process(controlled_obj_server->local_id, PROCESSPHASE_POST, [=](double p_delta) -> void {
286+
server_scene.scene_sync->register_process(controlled_obj_server->local_id, PROCESS_PHASE_POST, [=](double p_delta) -> void {
287287
process_magnets_simulation(*server_scene.scene_sync, p_delta);
288288
});
289-
peer_1_scene.scene_sync->register_process(controlled_obj_p1->local_id, PROCESSPHASE_POST, [=](double p_delta) -> void {
289+
peer_1_scene.scene_sync->register_process(controlled_obj_p1->local_id, PROCESS_PHASE_POST, [=](double p_delta) -> void {
290290
process_magnets_simulation(*peer_1_scene.scene_sync, p_delta);
291291
});
292-
server_scene.scene_sync->register_process(controlled_obj_server->local_id, PROCESSPHASE_LATE, [=](double p_delta) -> void {
292+
server_scene.scene_sync->register_process(controlled_obj_server->local_id, PROCESS_PHASE_LATE, [=](double p_delta) -> void {
293293
on_server_process(p_delta);
294294
});
295-
peer_1_scene.scene_sync->register_process(controlled_obj_p1->local_id, PROCESSPHASE_LATE, [=](double p_delta) -> void {
295+
peer_1_scene.scene_sync->register_process(controlled_obj_p1->local_id, PROCESS_PHASE_LATE, [=](double p_delta) -> void {
296296
on_client_process(p_delta);
297297
});
298298

0 commit comments

Comments
 (0)