badhouseplants/killbox
4
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Activity

Trying to make sync work

Browse Source
This commit is contained in:
Nikolai Rodionov
2025-02-06 13:42:14 +01:00
parent 8f61ab6c6b
commit ad95c99149
11 changed files with 165 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
godot/scenes/maps/base/map_controller.gd
View File

@ -45,19 +45,20 @@ func _process(delta: float) -> void:
func _request_spawn():
var id: int = multiplayer.get_remote_sender_id()
_spawn_player(id)
_spawn_player_controller_node.rpc_id(id)
func _spawn_player(id: int):
player_spawner.spawn_players(spawn_locations, id)
_spawn_player_controller_node.rpc_id(id)
@rpc("call_local", "reliable", "any_peer")
@rpc("any_peer", "call_local", "reliable")
func _spawn_player_controller_node():
var path := "res://scenes/player/player_input.tscn"
var path := "res://scenes/player/player_node.tscn"
var scene: PackedScene = ResourceLoader.load(path)
var controller_scene: PlayerPlaceholder = player_spawner.get_player_node(multiplayer.get_unique_id())
var player_node: PlayerInputController = scene.instantiate()
player_node.controlled_node = controller_scene
var controlled_node: ServerNode = player_spawner.get_player_node(multiplayer.get_unique_id())
player_node.controlled_node = controlled_node
client_node.add_child(player_node)
player_node.initial_position_sync()
func _remove_player(id: int):

15
godot/scenes/maps/base/player_spawner/player_spawner.gd
View File

@ -1,5 +1,5 @@
class_name PlayerSpawnerController extends Node3D
class_name PlayerSpawnerController
extends Node3D
func _get_spawner() -> MultiplayerSpawner:
return $MultiplayerSpawner
@ -10,14 +10,15 @@ func _get_root() -> Node3D:
# -- Spawn a player node and sync it across all peers
func spawn_players(spawn_location: SpawnController, id: int) -> Error:
if multiplayer.is_server():
var char : PlayerPlaceholder = null
var char : ServerNode = null
var player_data: PlayerData = GameServerAutoload.players[id]
char = ResourceLoader.load("res://scenes/player/placeholder.tscn").instantiate()
char = ResourceLoader.load("res://scenes/player/server_node.tscn").instantiate()
char.name = "PlayerPlaceholder_" + str(player_data.id)
var new_position: Vector3 = spawn_location.get_spawner(SpawnController.Sides.BLUE)
char.global_position = new_position
char.owner_id = id
_get_root().add_child(char)
char.shared_node.global_position = new_position
print(new_position)
return OK
return ERR_UNAUTHORIZED
@ -31,8 +32,8 @@ func remove_player(id: int) -> Error:
return OK
return ERR_UNAUTHORIZED
func get_player_node(id: int) -> PlayerPlaceholder:
var nodes: Array[Node] = _get_root().get_children().filter(func(x: PlayerPlaceholder): return x.owner_id == id)
func get_player_node(id: int) -> ServerNode:
var nodes: Array[Node] = _get_root().get_children().filter(func(x: ServerNode): return x.owner_id == id)
if nodes.size() > 0:
return nodes[0]
return null

2
godot/scenes/maps/base/player_spawner/player_spawner.tscn
View File

@ -6,7 +6,7 @@
script = ExtResource("1_2hsyd")
[node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."]
_spawnable_scenes = PackedStringArray("res://scenes/player/placeholder.tscn")
_spawnable_scenes = PackedStringArray("res://scenes/player/server_node.tscn")
spawn_path = NodePath("../Players")
spawn_limit = 100