Improved the function bind implementation.

Author: AndreaCatania

core/peer_networked_controller.cpp

@@ -258,19 +258,13 @@ void PeerNetworkedController::setup_synchronizer(NS::SceneSynchronizerBase &p_sy
 	authority_peer = p_peer;
 
 	event_handler_peer_status_updated =
-			scene_synchronizer->event_peer_status_updated.bind([this](int p_peer_id, bool p_connected, bool p_enabled) -> void {
-				on_peer_status_updated(p_peer_id, p_connected, p_enabled);
-			});
+			scene_synchronizer->event_peer_status_updated.bind(std::bind(&PeerNetworkedController::on_peer_status_updated, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 
 	event_handler_state_validated =
-			scene_synchronizer->event_state_validated.bind([this](FrameIndex p_input_id, bool p_desync_detected) -> void {
-				on_state_validated(p_input_id);
-			});
+			scene_synchronizer->event_state_validated.bind(std::bind(&PeerNetworkedController::on_state_validated, this, std::placeholders::_1, std::placeholders::_2));
 
 	event_handler_rewind_frame_begin =
-			scene_synchronizer->event_rewind_frame_begin.bind([this](FrameIndex p_frame_index, int p_index, int p_count) -> void {
-				on_rewind_frame_begin(p_frame_index, p_index, p_count);
-			});
+			scene_synchronizer->event_rewind_frame_begin.bind(std::bind(&PeerNetworkedController::on_rewind_frame_begin, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 }
 
 void PeerNetworkedController::remove_synchronizer() {
@@ -306,7 +300,7 @@ void PeerNetworkedController::on_peer_status_updated(int p_peer_id, bool p_conne
 	}
 }
 
-void PeerNetworkedController::on_state_validated(FrameIndex p_frame_index) {
+void PeerNetworkedController::on_state_validated(FrameIndex p_frame_index, bool p_detected_desync) {
 	if (controller) {
 		controller->on_state_validated(p_frame_index);
 	}

core/peer_networked_controller.h

@@ -196,7 +196,7 @@ class PeerNetworkedController final {
 	bool has_scene_synchronizer() const;
 
 	void on_peer_status_updated(int p_peer_id, bool p_connected, bool p_enabled);
-	void on_state_validated(FrameIndex p_frame_index);
+	void on_state_validated(FrameIndex p_frame_index, bool p_detected_desync);
 	void on_rewind_frame_begin(FrameIndex p_input_id, int p_index, int p_count);
 
 	void controllable_collect_input(double p_delta, DataBuffer &r_data_buffer);

tests/test_scene_synchronizer.cpp

@@ -60,10 +60,10 @@ class LocalNetworkedController : public NS::LocalSceneObject {
 		p_scene_sync.setup_controller(
 				p_id,
 				authoritative_peer_id,
-				[this](double p_delta, DataBuffer &r_buffer) -> void { collect_inputs(p_delta, r_buffer); },
-				[this](DataBuffer &p_buffer) -> int { return count_input_size(p_buffer); },
-				[this](DataBuffer &p_buffer_A, DataBuffer &p_buffer_b) -> bool { return are_inputs_different(p_buffer_A, p_buffer_b); },
-				[this](double p_delta, DataBuffer &p_buffer) -> void { controller_process(p_delta, p_buffer); });
+				std::bind(&LocalNetworkedController::collect_inputs, this, std::placeholders::_1, std::placeholders::_2),
+				std::bind(&LocalNetworkedController::count_input_size, this, std::placeholders::_1),
+				std::bind(&LocalNetworkedController::are_inputs_different, this, std::placeholders::_1, std::placeholders::_2),
+				std::bind(&LocalNetworkedController::controller_process, this, std::placeholders::_1, std::placeholders::_2));
 
 		p_scene_sync.register_variable(p_id, "position");
 	}