Merge pull request #13 from LowFire/main

Implement P2P Interface

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "godot-cpp"]
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp
+	branch = 4.1

sample/addons/epic-online-services-godot/eos.gd

@@ -1797,6 +1797,26 @@ class P2P:
 
 	enum RelayControl { NoRelays = 0, AllowRelays = 1, ForceRelays = 2 }
 
+	enum NetworkType { NoConnection = 0, DirectConnection = 1, RelayedConnection = 2 }
+
+	enum Mode { None = 0, Server = 1, Client = 2, Mesh = 3 }
+
+	enum ConnectionStatus { Disconnected = 0, Connecting = 1, Connected = 2 }
+
+	class SetPortRangeOptions extends BaseClass:
+		func _init():
+			super._init("SetPortRangeOptions")
+
+		var port : int
+		var max_additional_ports_to_try : int
+
+	class SetPacketQueueSizeOptions extends BaseClass:
+		func _init():
+			super._init("SetPacketQueueSizeOptions")
+
+		var incoming_packet_queue_max_size_bytes : int
+		var outgoing_packet_queue_max_size_bytes : int
+
 
 
 

sample/addons/epic-online-services-godot/eosg.gdextension

@@ -1,6 +1,7 @@
 [configuration]
 
 entry_symbol = "eosg_library_init"
+compatibility_minimum = 4.1
 
 [libraries]
 linux.x86_64.debug = "bin/libeosg.linux.template_debug.dev.x86_64.so"

sample/project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Epic Online Services Godot 4.x"
 run/main_scene="res://Main.tscn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.1")
 config/icon="res://logo.png"
 
 [autoload]
@@ -21,6 +21,10 @@ Env="*res://scripts/Env.gd"
 Store="*res://scripts/Store.gd"
 EOS_tick="*res://addons/epic-online-services-godot/tick.gd"
 
+[dotnet]
+
+project/assembly_name="Epic Online Services Godot 4.x"
+
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/epic-online-services-godot/plugin.cfg")

src/auth_interface.cpp

@@ -39,7 +39,7 @@ void IEOS::auth_interface_login(Ref<RefCounted> p_options) {
         ret["local_user_id"] = eosg_epic_account_id_to_string(data->LocalUserId);
         ret["pin_grant_info"] = eosg_auth_pin_grant_info_to_dict(data->PinGrantInfo);
         ret["continuance_token"] = eosg_continuance_token_to_wrapper(data->ContinuanceToken);
-        ret["account_feature_restricted_info"] = eosg_auth_account_feature_restricted_info_to_dict(data->AccountFeatureRestrictedInfo);
+        ret["account_feature_restricted_info"] = eosg_auth_account_feature_restricted_info_to_dict(data->AccountFeatureRestrictedInfo_DEPRECATED); //This should change at some point
         ret["selected_account_id"] = eosg_epic_account_id_to_string(data->SelectedAccountId);
 
         if (data->ResultCode == EOS_EResult::EOS_Success) {

src/connect_interface.cpp

@@ -15,7 +15,11 @@ void IEOS::connect_interface_login(Ref<RefCounted> p_options) {
     memset(&credentials, 0, sizeof(EOS_Connect_Credentials));
     credentials.ApiVersion = EOS_CONNECT_CREDENTIALS_API_LATEST;
     credentials.Type = static_cast<EOS_EExternalCredentialType>((int)p_credentials->get("type"));
-    credentials.Token = token.get_data();
+    if (credentials.Type == EOS_EExternalCredentialType::EOS_ECT_DEVICEID_ACCESS_TOKEN) {
+        credentials.Token = nullptr; //It needs to be nullptr for deviceid, otherwise login will fail
+    } else {
+        credentials.Token = token.get_data();
+    }
 
     EOS_Connect_UserLoginInfo userLoginInfo;
     memset(&userLoginInfo, 0, sizeof(EOS_Connect_LoginOptions));