godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Use const ref parameters in the Web modules

Browse Source
This commit is contained in:
Aaron Franke
2025-09-27 10:46:27 -07:00
parent b4472f4670
commit ac2e01684c
19 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/webrtc/webrtc_multiplayer_peer.cpp
View File

@@ -187,20 +187,20 @@ MultiplayerPeer::ConnectionStatus WebRTCMultiplayerPeer::get_connection_status()
return connection_status;
}
Error WebRTCMultiplayerPeer::create_server(Array p_channels_config) {
Error WebRTCMultiplayerPeer::create_server(const Array &p_channels_config) {
return _initialize(1, MODE_SERVER, p_channels_config);
}
Error WebRTCMultiplayerPeer::create_client(int p_self_id, Array p_channels_config) {
Error WebRTCMultiplayerPeer::create_client(int p_self_id, const Array &p_channels_config) {
ERR_FAIL_COND_V_MSG(p_self_id == 1, ERR_INVALID_PARAMETER, "Clients cannot have ID 1.");
return _initialize(p_self_id, MODE_CLIENT, p_channels_config);
}
Error WebRTCMultiplayerPeer::create_mesh(int p_self_id, Array p_channels_config) {
Error WebRTCMultiplayerPeer::create_mesh(int p_self_id, const Array &p_channels_config) {
return _initialize(p_self_id, MODE_MESH, p_channels_config);
}
Error WebRTCMultiplayerPeer::_initialize(int p_self_id, NetworkMode p_mode, Array p_channels_config) {
Error WebRTCMultiplayerPeer::_initialize(int p_self_id, NetworkMode p_mode, const Array &p_channels_config) {
ERR_FAIL_COND_V(p_self_id < 1 || p_self_id > ~(1 << 31), ERR_INVALID_PARAMETER);
channels_config.clear();
channels_modes.clear();
@@ -254,7 +254,7 @@ int WebRTCMultiplayerPeer::get_unique_id() const {
return unique_id;
}
void WebRTCMultiplayerPeer::_peer_to_dict(Ref<ConnectedPeer> p_connected_peer, Dictionary &r_dict) {
void WebRTCMultiplayerPeer::_peer_to_dict(const Ref<ConnectedPeer> &p_connected_peer, Dictionary &r_dict) {
Array channels;
for (Ref<WebRTCDataChannel> &F : p_connected_peer->channels) {
channels.push_back(F);
@@ -285,7 +285,7 @@ Dictionary WebRTCMultiplayerPeer::get_peers() {
return out;
}
Error WebRTCMultiplayerPeer::add_peer(Ref<WebRTCPeerConnection> p_peer, int p_peer_id, int p_unreliable_lifetime) {
Error WebRTCMultiplayerPeer::add_peer(const Ref<WebRTCPeerConnection> &p_peer, int p_peer_id, int p_unreliable_lifetime) {
ERR_FAIL_COND_V(network_mode == MODE_NONE, ERR_UNCONFIGURED);
ERR_FAIL_COND_V(network_mode == MODE_CLIENT && p_peer_id != 1, ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(network_mode == MODE_SERVER && p_peer_id == 1, ERR_INVALID_PARAMETER);

12
modules/webrtc/webrtc_multiplayer_peer.h
View File

@@ -81,19 +81,19 @@ private:
List<TransferMode> channels_modes;
List<Dictionary> channels_config;
void _peer_to_dict(Ref<ConnectedPeer> p_connected_peer, Dictionary &r_dict);
void _peer_to_dict(const Ref<ConnectedPeer> &p_connected_peer, Dictionary &r_dict);
void _find_next_peer();
Ref<ConnectedPeer> _get_next_peer();
Error _initialize(int p_self_id, NetworkMode p_mode, Array p_channels_config = Array());
Error _initialize(int p_self_id, NetworkMode p_mode, const Array &p_channels_config = Array());
public:
WebRTCMultiplayerPeer() {}
~WebRTCMultiplayerPeer();
Error create_server(Array p_channels_config = Array());
Error create_client(int p_self_id, Array p_channels_config = Array());
Error create_mesh(int p_self_id, Array p_channels_config = Array());
Error add_peer(Ref<WebRTCPeerConnection> p_peer, int p_peer_id, int p_unreliable_lifetime = 1);
Error create_server(const Array &p_channels_config = Array());
Error create_client(int p_self_id, const Array &p_channels_config = Array());
Error create_mesh(int p_self_id, const Array &p_channels_config = Array());
Error add_peer(const Ref<WebRTCPeerConnection> &p_peer, int p_peer_id, int p_unreliable_lifetime = 1);
void remove_peer(int p_peer_id);
bool has_peer(int p_peer_id);
Dictionary get_peer(int p_peer_id);

10
modules/webrtc/webrtc_peer_connection.h
View File

@@ -73,12 +73,12 @@ public:
virtual GatheringState get_gathering_state() const = 0;
virtual SignalingState get_signaling_state() const = 0;
virtual Error initialize(Dictionary p_config = Dictionary()) = 0;
virtual Ref<WebRTCDataChannel> create_data_channel(String p_label, Dictionary p_options = Dictionary()) = 0;
virtual Error initialize(const Dictionary &p_config = Dictionary()) = 0;
virtual Ref<WebRTCDataChannel> create_data_channel(const String &p_label, const Dictionary &p_options = Dictionary()) = 0;
virtual Error create_offer() = 0;
virtual Error set_remote_description(String type, String sdp) = 0;
virtual Error set_local_description(String type, String sdp) = 0;
virtual Error add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) = 0;
virtual Error set_remote_description(const String &p_type, const String &p_sdp) = 0;
virtual Error set_local_description(const String &p_type, const String &p_sdp) = 0;
virtual Error add_ice_candidate(const String &p_sdp_mid_name, int p_sdp_mline_index_name, const String &p_sdp_name) = 0;
virtual Error poll() = 0;
virtual void close() = 0;

10
modules/webrtc/webrtc_peer_connection_extension.h
View File

@@ -46,12 +46,12 @@ public:
EXBIND0RC(ConnectionState, get_connection_state);
EXBIND0RC(GatheringState, get_gathering_state);
EXBIND0RC(SignalingState, get_signaling_state);
EXBIND1R(Error, initialize, Dictionary);
EXBIND2R(Ref<WebRTCDataChannel>, create_data_channel, String, Dictionary);
EXBIND1R(Error, initialize, const Dictionary &);
EXBIND2R(Ref<WebRTCDataChannel>, create_data_channel, const String &, const Dictionary &);
EXBIND0R(Error, create_offer);
EXBIND2R(Error, set_remote_description, String, String);
EXBIND2R(Error, set_local_description, String, String);
EXBIND3R(Error, add_ice_candidate, String, int, String);
EXBIND2R(Error, set_remote_description, const String &, const String &);
EXBIND2R(Error, set_local_description, const String &, const String &);
EXBIND3R(Error, add_ice_candidate, const String &, int, const String &);
EXBIND0R(Error, poll);
EXBIND0(close);

18
modules/webrtc/webrtc_peer_connection_js.cpp
View File

@@ -83,26 +83,26 @@ Error WebRTCPeerConnectionJS::create_offer() {
return OK;
}
Error WebRTCPeerConnectionJS::set_local_description(String type, String sdp) {
godot_js_rtc_pc_local_description_set(_js_id, type.utf8().get_data(), sdp.utf8().get_data(), this, &_on_error);
Error WebRTCPeerConnectionJS::set_local_description(const String &p_type, const String &p_sdp) {
godot_js_rtc_pc_local_description_set(_js_id, p_type.utf8().get_data(), p_sdp.utf8().get_data(), this, &_on_error);
return OK;
}
Error WebRTCPeerConnectionJS::set_remote_description(String type, String sdp) {
if (type == "offer") {
Error WebRTCPeerConnectionJS::set_remote_description(const String &p_type, const String &p_sdp) {
if (p_type == "offer") {
ERR_FAIL_COND_V(_conn_state != STATE_NEW, FAILED);
_conn_state = STATE_CONNECTING;
}
godot_js_rtc_pc_remote_description_set(_js_id, type.utf8().get_data(), sdp.utf8().get_data(), this, &_on_session_created, &_on_error);
godot_js_rtc_pc_remote_description_set(_js_id, p_type.utf8().get_data(), p_sdp.utf8().get_data(), this, &_on_session_created, &_on_error);
return OK;
}
Error WebRTCPeerConnectionJS::add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) {
godot_js_rtc_pc_ice_candidate_add(_js_id, sdpMidName.utf8().get_data(), sdpMlineIndexName, sdpName.utf8().get_data());
Error WebRTCPeerConnectionJS::add_ice_candidate(const String &p_sdp_mid_name, int p_sdp_mline_index_name, const String &p_sdp_name) {
godot_js_rtc_pc_ice_candidate_add(_js_id, p_sdp_mid_name.utf8().get_data(), p_sdp_mline_index_name, p_sdp_name.utf8().get_data());
return OK;
}
Error WebRTCPeerConnectionJS::initialize(Dictionary p_config) {
Error WebRTCPeerConnectionJS::initialize(const Dictionary &p_config) {
if (_js_id) {
godot_js_rtc_pc_destroy(_js_id);
_js_id = 0;
@@ -114,7 +114,7 @@ Error WebRTCPeerConnectionJS::initialize(Dictionary p_config) {
return _js_id ? OK : FAILED;
}
Ref<WebRTCDataChannel> WebRTCPeerConnectionJS::create_data_channel(String p_channel, Dictionary p_channel_config) {
Ref<WebRTCDataChannel> WebRTCPeerConnectionJS::create_data_channel(const String &p_channel, const Dictionary &p_channel_config) {
ERR_FAIL_COND_V(_conn_state != STATE_NEW, nullptr);
String config = Variant(p_channel_config).to_json_string();

10
modules/webrtc/webrtc_peer_connection_js.h
View File

@@ -74,12 +74,12 @@ public:
virtual GatheringState get_gathering_state() const override;
virtual SignalingState get_signaling_state() const override;
virtual Error initialize(Dictionary configuration = Dictionary()) override;
virtual Ref<WebRTCDataChannel> create_data_channel(String p_channel_name, Dictionary p_channel_config = Dictionary()) override;
virtual Error initialize(const Dictionary &p_config = Dictionary()) override;
virtual Ref<WebRTCDataChannel> create_data_channel(const String &p_channel_name, const Dictionary &p_channel_config = Dictionary()) override;
virtual Error create_offer() override;
virtual Error set_remote_description(String type, String sdp) override;
virtual Error set_local_description(String type, String sdp) override;
virtual Error add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) override;
virtual Error set_remote_description(const String &p_type, const String &p_sdp) override;
virtual Error set_local_description(const String &p_type, const String &p_sdp) override;
virtual Error add_ice_candidate(const String &p_sdp_mid_name, int p_sdp_mline_index_name, const String &p_sdp_name) override;
virtual Error poll() override;
virtual void close() override;