update to latest master and remove dead code

ValorZard · ValorZard · commit 9e2184d5e929 · 2025-06-26T18:34:06.000-07:00
diff --git a/net-pong/rust/Cargo.toml b/net-pong/rust/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 license = "MIT"
 
 [dependencies]
-godot = "0.3.1"
+godot = {git = "https://github.com/godot-rust/gdext.git", rev = "18d8a2200cb0bb85b587336ba853db3bb54c9ffa"}
 
 [lib]
 crate-type = ["cdylib"] # Compile this crate to a dynamic C library.
diff --git a/net-pong/rust/src/ball.rs b/net-pong/rust/src/ball.rs
@@ -15,7 +15,6 @@ pub struct Ball {
 use godot::classes::IArea2D;
 
 use crate::pong::Pong;
-use crate::variant_array_to_vec;
 
 #[godot_api]
 impl IArea2D for Ball {
@@ -61,11 +60,9 @@ impl IArea2D for Ball {
             // fast. Otherwise, the ball might be out in the other
             // player's screen but not this one.
             if ball_pos.x < 0.0 {
-                //self.base().get_parent().update_score.rpc(false);
-                let args = varray![false];
-                let args = variant_array_to_vec(args);
-                parent.rpc("update_score", args.as_slice());
-                self.base_mut().rpc("reset_ball", args.as_slice());
+                let args = vslice![false];
+                parent.rpc("update_score", args);
+                self.base_mut().rpc("reset_ball", args);
             }
         } else {
             // Only the puppet will decide when the ball is out in
@@ -74,64 +71,16 @@ impl IArea2D for Ball {
             // is going fast. Otherwise, the ball might be out in the
             // other player's screen but not this one.
             if ball_pos.x > screen_size.x {
-                //self.base().get_parent().update_score.rpc(true);
-                let args = varray![true];
-                let args = variant_array_to_vec(args);
-                parent.rpc("update_score", args.as_slice());
-                self.base_mut().rpc("reset_ball", args.as_slice());
+                let args = vslice![true];
+                parent.rpc("update_score", args);
+                self.base_mut().rpc("reset_ball", args);
             }
         }
-
-        /*
-           _speed += delta
-           # Ball will move normally for both players,
-           # even if it's sightly out of sync between them,
-           # so each player sees the motion as smooth and not jerky.
-           if not stopped:
-               translate(_speed * delta * direction)
-
-           # Check screen bounds to make ball bounce.
-           var ball_pos := position
-           if (ball_pos.y < 0 and direction.y < 0) or (ball_pos.y > _screen_size.y and direction.y > 0):
-               direction.y = -direction.y
-
-           if is_multiplayer_authority():
-               # Only the master will decide when the ball is out in
-               # the left side (its own side). This makes the game
-               # playable even if latency is high and ball is going
-               # fast. Otherwise, the ball might be out in the other
-               # player's screen but not this one.
-               if ball_pos.x < 0:
-                   get_parent().update_score.rpc(false)
-                   _reset_ball.rpc(false)
-           else:
-               # Only the puppet will decide when the ball is out in
-               # the right side, which is its own side. This makes
-               # the game playable even if latency is high and ball
-               # is going fast. Otherwise, the ball might be out in the
-               # other player's screen but not this one.
-               if ball_pos.x > _screen_size.x:
-                   get_parent().update_score.rpc(true)
-                   _reset_ball.rpc(true)
-        */
     }
 }
 
 #[godot_api]
 impl Ball {
-    /*
-    @rpc("any_peer", "call_local")
-    func bounce(left: bool, random: float) -> void:
-        # Using sync because both players can make it bounce.
-        if left:
-            direction.x = abs(direction.x)
-        else:
-            direction.x = -abs(direction.x)
-
-        _speed *= 1.1
-        direction.y = random * 2.0 - 1
-        direction = direction.normalized()
-    */
     #[rpc(any_peer, call_local)]
     fn bounce(&mut self, is_left: bool, random: f32) {
         // Using sync because both players can make it bounce.
@@ -145,27 +94,11 @@ impl Ball {
         self.direction = self.direction.normalized();
     }
 
-    /*
-    @rpc("any_peer", "call_local")
-    func stop() -> void:
-        stopped = true
-     */
     #[rpc(any_peer, call_local)]
     fn stop(&mut self) {
         self.stopped = true;
     }
 
-    /*
-    @rpc("any_peer", "call_local")
-    func _reset_ball(for_left: float) -> void:
-        position = _screen_size / 2
-        if for_left:
-            direction = Vector2.LEFT
-        else:
-            direction = Vector2.RIGHT
-        _speed = DEFAULT_SPEED
-     */
-
     #[rpc(any_peer, call_local)]
     fn reset_ball(&mut self, for_left: bool) {
         let screen_center = self.base().get_viewport_rect().size / 2.0;
diff --git a/net-pong/rust/src/lib.rs b/net-pong/rust/src/lib.rs
@@ -5,18 +5,6 @@ struct RustExtension;
 #[gdextension]
 unsafe impl ExtensionLibrary for RustExtension {}
 
-fn variant_array_to_vec(array: VariantArray) -> Vec<Variant> {
-    let mut vec = Vec::new();
-    for i in 0..array.len() {
-        vec.push(
-            array
-                .get(i)
-                .expect("Failed to get element from VariantArray"),
-        );
-    }
-    vec
-}
-
 mod ball;
 mod lobby;
 mod paddle;
diff --git a/net-pong/rust/src/lobby.rs b/net-pong/rust/src/lobby.rs
@@ -1,143 +1,13 @@
-use godot::classes::enet_connection::CompressionMode;
-use godot::classes::object::ConnectFlags;
-use godot::classes::project_settings;
-/*
-extends Panel
-
-# Default game server port. Can be any number between 1024 and 49151.
-# Not present on the list of registered or common ports as of May 2024:
-# https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers
-const DEFAULT_PORT = 8910
-
-@onready var address: LineEdit = $Address
-@onready var host_button: Button = $HostButton
-@onready var join_button: Button = $JoinButton
-@onready var status_ok: Label = $StatusOk
-@onready var status_fail: Label = $StatusFail
-@onready var port_forward_label: Label = $PortForward
-@onready var find_public_ip_button: LinkButton = $FindPublicIP
-
-var peer: ENetMultiplayerPeer
-
-func _ready() -> void:
-    # Connect all the callbacks related to networking.
-    multiplayer.peer_connected.connect(_player_connected)
-    multiplayer.peer_disconnected.connect(_player_disconnected)
-    multiplayer.connected_to_server.connect(_connected_ok)
-    multiplayer.connection_failed.connect(_connected_fail)
-    multiplayer.server_disconnected.connect(_server_disconnected)
-
-#region Network callbacks from SceneTree
-# Callback from SceneTree.
-func _player_connected(_id: int) -> void:
-    # Someone connected, start the game!
-    var pong: Node2D = load("res://pong.tscn").instantiate()
-    # Connect deferred so we can safely erase it from the callback.
-    pong.game_finished.connect(_end_game, CONNECT_DEFERRED)
-
-    get_tree().get_root().add_child(pong)
-    hide()
-
-
-func _player_disconnected(_id: int) -> void:
-    if multiplayer.is_server():
-        _end_game("Client disconnected.")
-    else:
-        _end_game("Server disconnected.")
-
-
-# Callback from SceneTree, only for clients (not server).
-func _connected_ok() -> void:
-    pass # This function is not needed for this project.
-
-
-# Callback from SceneTree, only for clients (not server).
-func _connected_fail() -> void:
-    _set_status("Couldn't connect.", false)
-
-    multiplayer.set_multiplayer_peer(null)  # Remove peer.
-    host_button.set_disabled(false)
-    join_button.set_disabled(false)
-
-
-func _server_disconnected() -> void:
-    _end_game("Server disconnected.")
-#endregion
-
-#region Game creation methods
-func _end_game(with_error: String = "") -> void:
-    if has_node("/root/Pong"):
-        # Erase immediately, otherwise network might show
-        # errors (this is why we connected deferred above).
-        get_node(^"/root/Pong").free()
-        show()
-
-    multiplayer.set_multiplayer_peer(null)  # Remove peer.
-    host_button.set_disabled(false)
-    join_button.set_disabled(false)
-
-    _set_status(with_error, false)
-
-
-func _set_status(text: String, is_ok: bool) -> void:
-    # Simple way to show status.
-    if is_ok:
-        status_ok.set_text(text)
-        status_fail.set_text("")
-    else:
-        status_ok.set_text("")
-        status_fail.set_text(text)
-
-
-func _on_host_pressed() -> void:
-    peer = ENetMultiplayerPeer.new()
-    # Set a maximum of 1 peer, since Pong is a 2-player game.
-    var err := peer.create_server(DEFAULT_PORT, 1)
-    if err != OK:
-        # Is another server running?
-        _set_status("Can't host, address in use.",false)
-        return
-    peer.get_host().compress(ENetConnection.COMPRESS_RANGE_CODER)
-
-    multiplayer.set_multiplayer_peer(peer)
-    host_button.set_disabled(true)
-    join_button.set_disabled(true)
-    _set_status("Waiting for player...", true)
-    get_window().title = ProjectSettings.get_setting("application/config/name") + ": Server"
-
-    # Only show hosting instructions when relevant.
-    port_forward_label.visible = true
-    find_public_ip_button.visible = true
-
-
-func _on_join_pressed() -> void:
-    var ip := address.get_text()
-    if not ip.is_valid_ip_address():
-        _set_status("IP address is invalid.", false)
-        return
-
-    peer = ENetMultiplayerPeer.new()
-    peer.create_client(ip, DEFAULT_PORT)
-    peer.get_host().compress(ENetConnection.COMPRESS_RANGE_CODER)
-    multiplayer.set_multiplayer_peer(peer)
-
-    _set_status("Connecting...", true)
-    get_window().title = ProjectSettings.get_setting("application/config/name") + ": Client"
-#endregion
-
-func _on_find_public_ip_pressed() -> void:
-    OS.shell_open("https://icanhazip.com/")
-
- */
 use godot::classes::Button;
-use godot::classes::ENetConnection;
 use godot::classes::ENetMultiplayerPeer;
 use godot::classes::Label;
 use godot::classes::LineEdit;
 use godot::classes::LinkButton;
 use godot::classes::Os;
 use godot::classes::Panel;
 use godot::classes::ProjectSettings;
+use godot::classes::enet_connection::CompressionMode;
+use godot::classes::object::ConnectFlags;
 use godot::global::Error;
 use godot::prelude::*;
 
@@ -288,16 +158,6 @@ impl IPanel for Lobby {
 
 #[godot_api]
 impl Lobby {
-    /*
-    func _set_status(text: String, is_ok: bool) -> void:
-    # Simple way to show status.
-    if is_ok:
-        status_ok.set_text(text)
-        status_fail.set_text("")
-    else:
-        status_ok.set_text("")
-        status_fail.set_text(text)
-     */
     fn _set_status(&mut self, text: String, is_ok: bool) {
         // Simple way to show status.
         if is_ok {
@@ -309,20 +169,6 @@ impl Lobby {
         }
     }
 
-    /*
-    func _end_game(with_error: String = "") -> void:
-    if has_node("/root/Pong"):
-        # Erase immediately, otherwise network might show
-        # errors (this is why we connected deferred above).
-        get_node(^"/root/Pong").free()
-        show()
-
-    multiplayer.set_multiplayer_peer(null)  # Remove peer.
-    host_button.set_disabled(false)
-    join_button.set_disabled(false)
-
-    _set_status(with_error, false)
-     */
     #[func]
     fn _end_game(&mut self, with_error: String) {
         if self.base().has_node("/root/Pong") {
@@ -340,27 +186,6 @@ impl Lobby {
         self._set_status(with_error, false);
     }
 
-    /*
-    func _on_host_pressed() -> void:
-        peer = ENetMultiplayerPeer.new()
-        # Set a maximum of 1 peer, since Pong is a 2-player game.
-        var err := peer.create_server(DEFAULT_PORT, 1)
-        if err != OK:
-            # Is another server running?
-            _set_status("Can't host, address in use.",false)
-            return
-        peer.get_host().compress(ENetConnection.COMPRESS_RANGE_CODER)
-
-        multiplayer.set_multiplayer_peer(peer)
-        host_button.set_disabled(true)
-        join_button.set_disabled(true)
-        _set_status("Waiting for player...", true)
-        get_window().title = ProjectSettings.get_setting("application/config/name") + ": Server"
-
-        # Only show hosting instructions when relevant.
-        port_forward_label.visible = true
-        find_public_ip_button.visible = true
-     */
     fn _on_host_pressed(&mut self) {
         let mut peer = ENetMultiplayerPeer::new_gd();
         self.peer = Some(peer.clone());
@@ -397,21 +222,6 @@ impl Lobby {
             .set_visible(true);
     }
 
-    /*
-    func _on_join_pressed() -> void:
-        var ip := address.get_text()
-        if not ip.is_valid_ip_address():
-            _set_status("IP address is invalid.", false)
-            return
-
-        peer = ENetMultiplayerPeer.new()
-        peer.create_client(ip, DEFAULT_PORT)
-        peer.get_host().compress(ENetConnection.COMPRESS_RANGE_CODER)
-        multiplayer.set_multiplayer_peer(peer)
-
-        _set_status("Connecting...", true)
-        get_window().title = ProjectSettings.get_setting("application/config/name") + ": Client"
-     */
     fn _on_join_pressed(&mut self) {
         let ip = self.address.as_mut().unwrap().get_text();
         if !ip.is_valid_ip_address() {
diff --git a/net-pong/rust/src/paddle.rs b/net-pong/rust/src/paddle.rs
diff --git a/net-pong/rust/src/pong.rs b/net-pong/rust/src/pong.rs
