From f91ceba3ee27da71c0d7f413f5f8681cbc9aaba8 Mon Sep 17 00:00:00 2001 From: Chris Bell Date: Sat, 14 Dec 2024 22:07:41 -0600 Subject: [PATCH] Maybe fixed the sync? --- assets/core/networking/scripts/NetworkManager.gd | 2 ++ assets/core/player-controller/scenes/player.tscn | 9 ++------- assets/core/player-controller/scripts/player.gd | 6 +++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/core/networking/scripts/NetworkManager.gd b/assets/core/networking/scripts/NetworkManager.gd index 2f334a7..3f0954f 100644 --- a/assets/core/networking/scripts/NetworkManager.gd +++ b/assets/core/networking/scripts/NetworkManager.gd @@ -363,3 +363,5 @@ func _on_game_started(): level.add_child(player) if member["steam_id"] == steam_id: player.is_network_authority = true + else: + player.is_network_authority = false \ No newline at end of file diff --git a/assets/core/player-controller/scenes/player.tscn b/assets/core/player-controller/scenes/player.tscn index 17a93d3..1ab7490 100644 --- a/assets/core/player-controller/scenes/player.tscn +++ b/assets/core/player-controller/scenes/player.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=12 format=3 uid="uid://c6w0ivy4hetrl"] +[gd_scene load_steps=11 format=3 uid="uid://c6w0ivy4hetrl"] [ext_resource type="Script" path="res://assets/core/player-controller/scripts/player.gd" id="1_bv7t4"] [ext_resource type="Script" path="res://assets/core/player-controller/scripts/player_interacter.gd" id="2_wvu3d"] [ext_resource type="Script" path="res://assets/core/player-controller/scripts/player_hud.gd" id="3_02ne1"] [ext_resource type="Shader" path="res://assets/core/player-controller/scenes/inverted_crosshair.gdshader" id="3_rakxt"] [ext_resource type="Texture2D" uid="uid://c3lblkyavjtol" path="res://assets/core/player-controller/2d_crosshair_dot.png" id="4_3uwxe"] -[ext_resource type="Script" path="res://assets/core/networking/scripts/Syncronizer.gd" id="6_hwrq2"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_v7b3h"] radius = 0.35 @@ -23,10 +22,9 @@ shader = ExtResource("3_rakxt") [sub_resource type="ShaderMaterial" id="ShaderMaterial_0n7pd"] shader = ExtResource("3_rakxt") -[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("synchronizer", "camera")] +[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera")] collision_mask = 242 script = ExtResource("1_bv7t4") -synchronizer = NodePath("Syncronizer") camera = NodePath("Neck/Camera3D") [node name="PlayerTag" type="Label3D" parent="."] @@ -113,6 +111,3 @@ theme_override_font_sizes/font_size = 35 text = "999 FPS" horizontal_alignment = 2 vertical_alignment = 1 - -[node name="Syncronizer" type="Node" parent="."] -script = ExtResource("6_hwrq2") diff --git a/assets/core/player-controller/scripts/player.gd b/assets/core/player-controller/scripts/player.gd index 2e0e428..7ec5fc4 100644 --- a/assets/core/player-controller/scripts/player.gd +++ b/assets/core/player-controller/scripts/player.gd @@ -1,6 +1,6 @@ class_name Player extends CharacterBody3D -@export var synchronizer: Syncronizer +var synchronizer: Syncronizer var player_tag: Label3D var username: String = "" @@ -8,6 +8,7 @@ var is_piloting: bool = false var is_network_authority: bool = false + @export_category("Player") @export_range(1, 35, 1) var speed: float = 5 # m/s @export_range(10, 400, 1) var acceleration: float = 100 # m/s^2 @@ -31,6 +32,9 @@ var current_ship: Ship func _enter_tree() -> void: + synchronizer = Syncronizer.new() + add_child(synchronizer) + player_tag = get_node("PlayerTag") player_tag.text = username