Skip to content

Commit 639d10c

Browse files
committed
Disabled the Doll snapshot handling.
1 parent 4747efc commit 639d10c

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

core/peer_networked_controller.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,9 @@ bool is_doll_snap_A_older(const DollController::DollSnapshot &p_snap_a, const Do
14101410
}
14111411

14121412
void DollController::received_snapshot(const Snapshot &p_snapshot) {
1413+
// TODO enable this.
1414+
return;
1415+
14131416
const std::vector<ObjectData *> *controlled_objects = peer_controller->scene_synchronizer->get_peer_controlled_objects_data(peer_controller->get_authority_peer());
14141417
if (!controlled_objects) {
14151418
// Nothing to store.

scene_synchronizer.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,18 +3667,18 @@ void ClientSynchronizer::apply_snapshot(
36673667
continue;
36683668
}
36693669

3670-
if (object_data->get_controlled_by_peer() > 0) {
3671-
PeerNetworkedController *controller = scene_synchronizer->get_controller_for_peer(object_data->get_controlled_by_peer(), false);
3672-
if (controller && controller->is_doll_controller()) {
3673-
// This object data is being controller by a doll controller;
3674-
// in this case the rewind is handled by the controller.
3675-
controller->get_doll_controller()->notify_applied_snapshot(p_snapshot.input_id, object_data->get_net_id());
3676-
if (r_applied_data_info) {
3677-
r_applied_data_info->push_back("Applied snapshot forwarded to DollController for the object: " + object_data->object_name);
3678-
}
3679-
continue;
3680-
}
3681-
}
3670+
//if (object_data->get_controlled_by_peer() > 0) {
3671+
// PeerNetworkedController *controller = scene_synchronizer->get_controller_for_peer(object_data->get_controlled_by_peer(), false);
3672+
// if (controller && controller->is_doll_controller()) {
3673+
// // This object data is being controller by a doll controller;
3674+
// // in this case the rewind is handled by the controller.
3675+
// controller->get_doll_controller()->notify_applied_snapshot(p_snapshot.input_id, object_data->get_net_id());
3676+
// if (r_applied_data_info) {
3677+
// r_applied_data_info->push_back("Applied snapshot forwarded to DollController for the object: " + object_data->object_name);
3678+
// }
3679+
// continue;
3680+
// }
3681+
//}
36823682

36833683
const std::vector<NS::NameAndVar> &snap_object_vars = snap_objects_vars[net_node_id.id];
36843684

0 commit comments

Comments
 (0)