From 6a27e2c6e5bda17eade7c5d17e07a6d1c05a3fd3 Mon Sep 17 00:00:00 2001 From: Dragos Daian Date: Sun, 15 Dec 2024 19:48:11 +0100 Subject: [PATCH] Update docs on blazium nodes (#198) update some docs Update LoginClient.xml update master server service Update LoginClient.xml Update BlaziumClient.xml update login client docs update docs --- .../blazium_sdk/doc_classes/BlaziumClient.xml | 17 +++++++- .../doc_classes/GameServerInfo.xml | 4 +- .../doc_classes/ListLobbyResponse.xml | 4 +- .../doc_classes/LobbyCallResponse.xml | 4 +- .../doc_classes/LobbyCallResult.xml | 2 +- .../blazium_sdk/doc_classes/LobbyClient.xml | 41 +++++++++++++++++-- modules/blazium_sdk/doc_classes/LobbyInfo.xml | 5 ++- modules/blazium_sdk/doc_classes/LobbyPeer.xml | 5 ++- .../blazium_sdk/doc_classes/LobbyResponse.xml | 4 +- .../blazium_sdk/doc_classes/LoginClient.xml | 24 +++++++---- .../blazium_sdk/doc_classes/LoginResponse.xml | 6 +-- .../blazium_sdk/doc_classes/LoginResult.xml | 2 +- .../doc_classes/MasterServerClient.xml | 13 ++++-- .../doc_classes/MasterServerListResponse.xml | 6 +-- .../doc_classes/MasterServerResponse.xml | 4 +- .../blazium_sdk/doc_classes/POGRClient.xml | 24 +++++++++-- .../blazium_sdk/doc_classes/POGRResponse.xml | 4 +- .../blazium_sdk/doc_classes/POGRResult.xml | 8 ++-- .../doc_classes/ViewLobbyResponse.xml | 4 +- modules/blazium_sdk/icons/LoginClient.svg | 2 +- .../blazium_sdk/icons/MasterServerClient.svg | 2 +- modules/blazium_sdk/login/login_client.cpp | 2 +- modules/blazium_sdk/login/login_client.h | 3 +- .../master_server/master_server_client.h | 2 +- modules/blazium_sdk/pogr/pogr_client.h | 1 + 25 files changed, 138 insertions(+), 55 deletions(-) diff --git a/modules/blazium_sdk/doc_classes/BlaziumClient.xml b/modules/blazium_sdk/doc_classes/BlaziumClient.xml index adf4edff715f..2df6d3e3dc0c 100644 --- a/modules/blazium_sdk/doc_classes/BlaziumClient.xml +++ b/modules/blazium_sdk/doc_classes/BlaziumClient.xml @@ -1,10 +1,23 @@ - An abstract base node used to connect to Blazium services. + Base node for connecting to the Blazium services. - An abstract base node used to connect to Blazium services. + The [BlaziumClient] node provides an interface for connecting to the Blazium services. These services are designed to simplify game development with aspects such as multiplayer, authentication, etc. + Developers have the flexibility to either: + - Connect to the free Blazium services hosted on the [url=https://blazium.app]blazium.app[/url] domain. + - Self-deploy the Blazium services on their own infrastructure for full control and customization. + [codeblock lang=text] + + +---------------------+ +---------------------+ + | Blazium Engine | HTTP and | Blazium Service | + |---------------------| WebSocket |---------------------| + | - Send requests | <---------> | - Handle requests | + | - Receive responses | | - Send responses | + +---------------------+ +---------------------+ + + [/codeblock] diff --git a/modules/blazium_sdk/doc_classes/GameServerInfo.xml b/modules/blazium_sdk/doc_classes/GameServerInfo.xml index 01526b117330..73b660c951dd 100644 --- a/modules/blazium_sdk/doc_classes/GameServerInfo.xml +++ b/modules/blazium_sdk/doc_classes/GameServerInfo.xml @@ -4,7 +4,7 @@ Game server info used by the [MasterServerClient]. - Game server info used by the [MasterServerClient]. Used to create or update a game server. + Game server info used by the [MasterServerClient]. Used to [method MasterServerClient.create_game] or [method MasterServerClient.update_game]. @@ -16,7 +16,7 @@ Name of the game server. - Id of the game server. Generated after call to create game server. + Id of the game server. Generated after call to [method MasterServerClient.create_game]. Ip address of the game server. diff --git a/modules/blazium_sdk/doc_classes/ListLobbyResponse.xml b/modules/blazium_sdk/doc_classes/ListLobbyResponse.xml index 0ebb8baca298..74f319244ffc 100644 --- a/modules/blazium_sdk/doc_classes/ListLobbyResponse.xml +++ b/modules/blazium_sdk/doc_classes/ListLobbyResponse.xml @@ -1,10 +1,10 @@ - Response from a list lobby request. + Response from a [method LobbyClient.list_lobbies] call. - Response from a list lobby request. Await on finished to get the [ListLobbyResult]. + Response from a [method LobbyClient.list_lobbies] call. Await on [signal finished] signal to get the [ListLobbyResult]. diff --git a/modules/blazium_sdk/doc_classes/LobbyCallResponse.xml b/modules/blazium_sdk/doc_classes/LobbyCallResponse.xml index 7d2a3e4d16e0..1a24850684d3 100644 --- a/modules/blazium_sdk/doc_classes/LobbyCallResponse.xml +++ b/modules/blazium_sdk/doc_classes/LobbyCallResponse.xml @@ -1,10 +1,10 @@ - Response from a lobby call function. + Response from a [method AuthoritativeClient.lobby_call] call. - Response from a lobby call function. Await on finished to get the [LobbyCallResult]. + Response from a [method AuthoritativeClient.lobby_call] call. Await on [signal finished] signal to get the [LobbyCallResult]. diff --git a/modules/blazium_sdk/doc_classes/LobbyCallResult.xml b/modules/blazium_sdk/doc_classes/LobbyCallResult.xml index ce51a41d80ae..a40307d47762 100644 --- a/modules/blazium_sdk/doc_classes/LobbyCallResult.xml +++ b/modules/blazium_sdk/doc_classes/LobbyCallResult.xml @@ -4,7 +4,7 @@ A result from a [LobbyCallResponse]. - A result from a [LobbyCallResponse]. + A result from a [LobbyCallResponse]. Contains either result or error. diff --git a/modules/blazium_sdk/doc_classes/LobbyClient.xml b/modules/blazium_sdk/doc_classes/LobbyClient.xml index 4c60fd8bc09c..5b8e44d145f7 100644 --- a/modules/blazium_sdk/doc_classes/LobbyClient.xml +++ b/modules/blazium_sdk/doc_classes/LobbyClient.xml @@ -1,10 +1,22 @@ - A node used to connect to a lobby server. + Node for connecting to the Blazium Lobby service. Offers non-authoritative lobby making features. - A node used to connect to a lobby server. It can be used to do matchmaking. You can do operations such as create lobby, join lobby, etc. The server is configurable and can either be self deployed or you can use the blazium free matchmaking server. + The [LobbyClient] node provides an interface for connecting to the Blazium Lobby service. There is a free instance hosted on the [url=https://blazium.app]blazium.app[/url] domain that is used by default. + The normal flow is as follows: + 1. Listen to all the signals you are interested in. + 2. Connect to the server using [method connect_to_lobby] method. + 3. Call any other methods to create, view or join lobbies, as well as add data to them. + 4. Close the session using [method disconnect_from_lobby] method at the end of the game. + [b]Note:[/b] Some methods are non blocking and can be awaited in order to get the result. + There are also members on this class that are automatically updated as the lobby gets updated, such as: + - [member peer]: The current peer. Reflects changes to the self peer. + - [member peers]: The lobby peers. Reflects changes to all peers. + - [member lobby]: The lobby. Reflects changes to the lobby. + - [member host_data]: The current lobby private data. Only works if you are host. + - [member peer_data]: The current peer private data. @@ -15,6 +27,7 @@ Add data to the lobby. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_lobby_data]. @@ -23,6 +36,7 @@ Add tags to the lobby. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_tagged]. @@ -33,6 +47,7 @@ Add data to a peer. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_peer_data]. @@ -42,6 +57,7 @@ Add data to all peers. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_peer_data]. @@ -49,6 +65,7 @@ Connect to a Blazium Lobby Server using the [member game_id] and [member server_url]. + Generates [signal connected_to_lobby] signal if successful. @@ -60,6 +77,7 @@ Create a lobby and become host. If you are already in a lobby, you cannot create one. You need to leave first. The new lobby can have a title, tags, max players and password. 0 max players means unlimited. + Returns a [ViewLobbyResponse] object that has a [signal ViewLobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_created] signal. @@ -69,6 +87,7 @@ Delete one or more keys from the lobby data. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_lobby_data]. @@ -77,6 +96,7 @@ Delete one or more keys from the lobby tags. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_tagged]. @@ -86,7 +106,8 @@ - one or more keys from the peer data. Only works if you are host. + Delete one or more keys from the peer data. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_peer_data]. @@ -95,7 +116,8 @@ - one or more keys from the peers data. Only works if you are host. + Delete one or more keys from the peers data. Only works if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal received_peer_data]. @@ -103,6 +125,7 @@ Disconnect from the lobby server. + Generates [signal disconnected_from_lobby] signal. @@ -118,6 +141,7 @@ Join a lobby. If you are already in a lobby, you cannot join another one. You need to leave first. If the lobby you want to join is password protected, you need to provide the password. + Returns a [ViewLobbyResponse] object that has a [signal ViewLobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_joined]. @@ -126,6 +150,7 @@ Kick a peer. You need to be host to do so. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal peer_left] signal with kicked set to true. @@ -133,6 +158,7 @@ Leave a lobby. You need to be in a lobby to leave one. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_left]. @@ -150,6 +176,7 @@ Send a notification either to the host, or if you are host send data to all peers. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_notified] signal. @@ -159,6 +186,7 @@ Send a notification to a peer, works only if you are host. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_notified] signal. @@ -167,6 +195,7 @@ Send a chat message. Only works if you are in a lobby. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal peer_messaged]. @@ -175,6 +204,7 @@ Ready up in the lobby. You need to be in a lobby and unready to run this. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal peer_ready]. @@ -183,6 +213,7 @@ Seals the lobby. You need to be the host to do this and the lobby needs to be unsealed. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal lobby_sealed]. @@ -191,6 +222,7 @@ Set your peer name. + Returns a [LobbyResponse] object that has a [signal LobbyResponse.finished] signal that is emitted when finished. Generates [signal peer_named] signal if you are in lobby. @@ -200,6 +232,7 @@ View data from a lobby. Returns lobby settings and peers. + Returns a [ViewLobbyResponse] object that has a [signal ViewLobbyResponse.finished] signal that is emitted when finished. diff --git a/modules/blazium_sdk/doc_classes/LobbyInfo.xml b/modules/blazium_sdk/doc_classes/LobbyInfo.xml index a21571197e12..ed10adffe20b 100644 --- a/modules/blazium_sdk/doc_classes/LobbyInfo.xml +++ b/modules/blazium_sdk/doc_classes/LobbyInfo.xml @@ -1,10 +1,10 @@ - Lobby information returned after a view lobby request. + Lobby information returned after a [LobbyClient] request that returns a lobby. - Lobby information returned after a view lobby request. + Lobby information returned after a [LobbyClient] request that returns a lobby. @@ -28,6 +28,7 @@ The maximum number of players allowed in the lobby. 0 = unlimited + Whether the lobby is password protected. The number of players currently in the lobby. diff --git a/modules/blazium_sdk/doc_classes/LobbyPeer.xml b/modules/blazium_sdk/doc_classes/LobbyPeer.xml index 36cf1f1e7ad1..812b6dc573cc 100644 --- a/modules/blazium_sdk/doc_classes/LobbyPeer.xml +++ b/modules/blazium_sdk/doc_classes/LobbyPeer.xml @@ -1,15 +1,16 @@ - Lobby peers information returned after a view lobby request. + Lobby information returned after a [LobbyClient] request that returns peers. - Lobby peers information returned after a view lobby request. + Lobby information returned after a [LobbyClient] request that returns peers. + Public data of the peer. Identifier of the peer. diff --git a/modules/blazium_sdk/doc_classes/LobbyResponse.xml b/modules/blazium_sdk/doc_classes/LobbyResponse.xml index 66729320f6b2..2a71c66f7e50 100644 --- a/modules/blazium_sdk/doc_classes/LobbyResponse.xml +++ b/modules/blazium_sdk/doc_classes/LobbyResponse.xml @@ -1,10 +1,10 @@ - Generic response from a lobby request. + Generic response from a [LobbyClient] call. - Generic response from a lobby request. Await on finished to get the result. + Generic response from a [LobbyClient] call. Await on [signal finished] signal to get the [LobbyResult]. diff --git a/modules/blazium_sdk/doc_classes/LoginClient.xml b/modules/blazium_sdk/doc_classes/LoginClient.xml index 33a7e9615981..3e4ebe099216 100644 --- a/modules/blazium_sdk/doc_classes/LoginClient.xml +++ b/modules/blazium_sdk/doc_classes/LoginClient.xml @@ -1,10 +1,17 @@ - A node used to connect to a login server. + Node for connecting to the Blazium Login service. Offers authentication mechanism. - A node used to connect to a login server. + The [LoginClient] node provides an interface for connecting to the Blazium Login service. There is a free instance hosted on the [url=https://blazium.app]blazium.app[/url] domain that is used by default. + The authentication flow is as follows: + 1. Listen to all the signals you are interested in. + 2. Connect to the server using the [method connect_to_server] method. + 3. Then you can request login info using the [method request_login_info] method. + 4. Open the resulting login url received after awaiting on the [signal LoginResponse.finished] signal. + 5. Obtain the jwt from the [signal received_jwt] signal. + [b]Note:[/b] Some methods are non blocking and can be awaited in order to get the result. @@ -12,7 +19,8 @@ - Connect to the server. + Connects to the server specified in [member server_url] using the game id specified in [member game_id]. Must be done before requesting login info. + Generates [signal connected_to_server] when connected. @@ -26,19 +34,21 @@ - Request login info. + Request login info using the login type specified. + Returns a [LoginResponse] object that has a [signal LoginResponse.finished] signal that is emitted when finished. - True if the client is connected, else false. + Client connected state. - The game id. + Set what game id this client should use when connecting to the server. If this is missing connection will error. + Can only contain alphanumeric characters. - Set to what url this login should connect to. + Set to what url this client should connect to. diff --git a/modules/blazium_sdk/doc_classes/LoginResponse.xml b/modules/blazium_sdk/doc_classes/LoginResponse.xml index 738e13200fd4..e8253ce6a0af 100644 --- a/modules/blazium_sdk/doc_classes/LoginResponse.xml +++ b/modules/blazium_sdk/doc_classes/LoginResponse.xml @@ -1,16 +1,16 @@ - Response from a connect request. + Response from a [method LoginClient.request_login_info] call. - Response from a connect request. + Response from a [method LoginClient.request_login_info] call. Await on [signal finished] signal to get the [LoginResult]. - + Signal emitted when the request is finished. diff --git a/modules/blazium_sdk/doc_classes/LoginResult.xml b/modules/blazium_sdk/doc_classes/LoginResult.xml index 289229971a8c..2551db3606a4 100644 --- a/modules/blazium_sdk/doc_classes/LoginResult.xml +++ b/modules/blazium_sdk/doc_classes/LoginResult.xml @@ -4,7 +4,7 @@ A result from a [LoginResponse]. - A result from a [LoginResponse]. + A result from a [LoginResponse]. Contains either result or error. diff --git a/modules/blazium_sdk/doc_classes/MasterServerClient.xml b/modules/blazium_sdk/doc_classes/MasterServerClient.xml index cf9279471fd2..7e4544a3be06 100644 --- a/modules/blazium_sdk/doc_classes/MasterServerClient.xml +++ b/modules/blazium_sdk/doc_classes/MasterServerClient.xml @@ -1,10 +1,11 @@ - A node used to connect to a master server. + Node for connecting to the Blazium Master Server service. Offers a centralized location for game server association. - A node used to connect to a master server. + The [MasterServerClient] node provides an interface for connecting to the Blazium Master Server service. There is a free instance hosted on the [url=https://blazium.app]blazium.app[/url] domain that is used by default. + [b]Note:[/b] All methods are non blocking and can be awaited in order to get the result. @@ -14,12 +15,14 @@ Create a game server. + Returns a [MasterServerResponse] object that has a [signal MasterServerResponse.finished] signal that is emitted when finished. Get a list of recent games. + Returns a [MasterServerListResponse] object that has a [signal MasterServerListResponse.finished] signal that is emitted when finished. @@ -27,15 +30,17 @@ Update a game server. + Returns a [MasterServerResponse] object that has a [signal MasterServerResponse.finished] signal that is emitted when finished. - Game id of the game server. + Set what game id this client should use when connecting to the server. If this is missing connection will error. + Can only contain alphanumeric characters. - Set to what url this master server should connect to. + Set to what url this client should connect to. diff --git a/modules/blazium_sdk/doc_classes/MasterServerListResponse.xml b/modules/blazium_sdk/doc_classes/MasterServerListResponse.xml index 4eaed5c27267..33fcc0b5de1a 100644 --- a/modules/blazium_sdk/doc_classes/MasterServerListResponse.xml +++ b/modules/blazium_sdk/doc_classes/MasterServerListResponse.xml @@ -1,16 +1,16 @@ - Response from a list games request. + Response from a [method MasterServerClient.recent_games] call. - Response from a list games request. + Response from a [method MasterServerClient.recent_games] call. Await on [signal finished] signal to get the [MasterServerListResult]. - + Signal emitted when the request is finished. diff --git a/modules/blazium_sdk/doc_classes/MasterServerResponse.xml b/modules/blazium_sdk/doc_classes/MasterServerResponse.xml index 833ee825ba3d..6bb73599f10f 100644 --- a/modules/blazium_sdk/doc_classes/MasterServerResponse.xml +++ b/modules/blazium_sdk/doc_classes/MasterServerResponse.xml @@ -1,10 +1,10 @@ - Response from a create or update game request. + Response from a [method MasterServerClient.create_game] or [method MasterServerClient.update_game] call. - Response from a create or update game request. + Response from a [method MasterServerClient.create_game] or [method MasterServerClient.update_game] call. Await on [signal finished] signal to get the [MasterServerResult]. diff --git a/modules/blazium_sdk/doc_classes/POGRClient.xml b/modules/blazium_sdk/doc_classes/POGRClient.xml index dd5fff0de05b..2f93948990f9 100644 --- a/modules/blazium_sdk/doc_classes/POGRClient.xml +++ b/modules/blazium_sdk/doc_classes/POGRClient.xml @@ -1,10 +1,15 @@ - Client for the pogr.io analytics website. + Node for connecting to the POGR analytics service. - Client for the pogr.io analytics website. + The [POGRClient] node provides an interface for connecting to the POGR analytics service. Find out more on the [url=https://pogr.gg]pogr.gg[/url] website. + The normal flow is as follows: + 1. Initiate a session using [method init] method. + 2. Send data using [method data], [method event], [method logs], [method metrics] and [method monitor] methods, depending on use case. + 3. Close the session using [method end] method at the end of the game. + [b]Note:[/b] All methods are non blocking and can be awaited in order to get the result. @@ -14,6 +19,14 @@ Send unstructured data. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. + + + + + + Send end request. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. @@ -26,6 +39,7 @@ Send event with unstructured data. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. @@ -49,13 +63,14 @@ - Get the session id. + Get the session id. This is a unique identifier for the current session generated after [method init] is called. Send init request. Needs to be called first. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. @@ -69,6 +84,7 @@ Add logs to the analytics. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. @@ -79,6 +95,7 @@ Add metrics to the analytics. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. @@ -86,6 +103,7 @@ Send monitor request. + Returns a [POGRResponse] object that has a [signal POGRResponse.finished] signal that is emitted when finished. diff --git a/modules/blazium_sdk/doc_classes/POGRResponse.xml b/modules/blazium_sdk/doc_classes/POGRResponse.xml index 7df044e70619..3227a66f1bb4 100644 --- a/modules/blazium_sdk/doc_classes/POGRResponse.xml +++ b/modules/blazium_sdk/doc_classes/POGRResponse.xml @@ -1,10 +1,10 @@ - A response from a pogr.io request. + Response from a [POGRClient] call. - A response from a pogr.io request. + Response from a [POGRClient] call. Await on [signal finished] signal to get the [POGRResult]. diff --git a/modules/blazium_sdk/doc_classes/POGRResult.xml b/modules/blazium_sdk/doc_classes/POGRResult.xml index b92cbaa573ea..5a983cb63530 100644 --- a/modules/blazium_sdk/doc_classes/POGRResult.xml +++ b/modules/blazium_sdk/doc_classes/POGRResult.xml @@ -1,10 +1,10 @@ - A result from a response from a pogr.io request. + A result from a [POGRResponse]. - A result from a response from a pogr.io request. + A result from a [POGRResponse]. Contains either result or error. @@ -18,10 +18,10 @@ - The error message, if any. + The error message. - The result, if any. + The result. diff --git a/modules/blazium_sdk/doc_classes/ViewLobbyResponse.xml b/modules/blazium_sdk/doc_classes/ViewLobbyResponse.xml index 815a10615132..cd468022fa15 100644 --- a/modules/blazium_sdk/doc_classes/ViewLobbyResponse.xml +++ b/modules/blazium_sdk/doc_classes/ViewLobbyResponse.xml @@ -1,10 +1,10 @@ - View response from a lobby request. + Response from a [LobbyClient] call. - View response from a lobby request. Await on finished to get the result. + Response from a [LobbyClient] call. Await on [signal finished] signal to get the [ViewLobbyResult]. diff --git a/modules/blazium_sdk/icons/LoginClient.svg b/modules/blazium_sdk/icons/LoginClient.svg index e000cd5827ab..d304a6c8d5ae 100644 --- a/modules/blazium_sdk/icons/LoginClient.svg +++ b/modules/blazium_sdk/icons/LoginClient.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/modules/blazium_sdk/icons/MasterServerClient.svg b/modules/blazium_sdk/icons/MasterServerClient.svg index e000cd5827ab..df4b6d512d80 100644 --- a/modules/blazium_sdk/icons/MasterServerClient.svg +++ b/modules/blazium_sdk/icons/MasterServerClient.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/modules/blazium_sdk/login/login_client.cpp b/modules/blazium_sdk/login/login_client.cpp index 0d2563e1ec78..90be58557ebe 100644 --- a/modules/blazium_sdk/login/login_client.cpp +++ b/modules/blazium_sdk/login/login_client.cpp @@ -39,7 +39,7 @@ bool LoginClient::connect_to_server() { return false; } set_process_internal(true); - emit_signal("log_updated", "connect_to_lobby", "Connected to: " + url); + emit_signal("log_updated", "connect_to_lobby", "Connecting to: " + url); return true; } diff --git a/modules/blazium_sdk/login/login_client.h b/modules/blazium_sdk/login/login_client.h index 2259faec233e..918d75cfc2d6 100644 --- a/modules/blazium_sdk/login/login_client.h +++ b/modules/blazium_sdk/login/login_client.h @@ -49,7 +49,7 @@ class LoginClient : public BlaziumClient { protected: static void _bind_methods() { - ADD_SIGNAL(MethodInfo("finished", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "LobbyResult"))); + ADD_SIGNAL(MethodInfo("finished", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "LoginResult"))); } public: @@ -120,6 +120,7 @@ class LoginClient : public BlaziumClient { WebSocketPeer::State state = _socket->get_ready_state(); if (state == WebSocketPeer::STATE_OPEN) { if (!connected) { + emit_signal("log_updated", "connect_to_lobby", "Connectied to: " + server_url); emit_signal("connected_to_server"); } connected = true; diff --git a/modules/blazium_sdk/master_server/master_server_client.h b/modules/blazium_sdk/master_server/master_server_client.h index 388109d3d4d6..2dd1ed0c32af 100644 --- a/modules/blazium_sdk/master_server/master_server_client.h +++ b/modules/blazium_sdk/master_server/master_server_client.h @@ -180,7 +180,7 @@ class MasterServerClient : public BlaziumClient { protected: static void _bind_methods() { - ADD_SIGNAL(MethodInfo("finished", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "MasterServerResult"))); + ADD_SIGNAL(MethodInfo("finished", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "MasterServerListResult"))); } public: diff --git a/modules/blazium_sdk/pogr/pogr_client.h b/modules/blazium_sdk/pogr/pogr_client.h index 5198427c27da..2e455f674db8 100644 --- a/modules/blazium_sdk/pogr/pogr_client.h +++ b/modules/blazium_sdk/pogr/pogr_client.h @@ -63,6 +63,7 @@ class POGRClient : public BlaziumClient { protected: static void _bind_methods() { ClassDB::bind_method(D_METHOD("init"), &POGRClient::init); + ClassDB::bind_method(D_METHOD("end"), &POGRClient::end); ClassDB::bind_method(D_METHOD("data", "data"), &POGRClient::data); ClassDB::bind_method(D_METHOD("event", "event_name", "event_data", "event_flag", "event_key", "event_type", "event_sub_type"), &POGRClient::event); ClassDB::bind_method(D_METHOD("logs", "tags", "data", "environment", "log", "service", "severity", "type"), &POGRClient::logs);