merge lobby-system and player-character into develop #4

Merged
chrisbell merged 15 commits from lobby-system into develop 2025-08-12 23:05:42 +00:00
2 changed files with 6 additions and 3 deletions
Showing only changes of commit 3d44cc7761 - Show all commits

View File

@@ -28,10 +28,11 @@ properties/2/path = NodePath("Camera3D/head:rotation")
properties/2/spawn = true
properties/2/replication_mode = 1
[node name="Player" type="CharacterBody3D"]
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("head")]
collision_layer = 2
collision_mask = 3
script = ExtResource("1_ulp21")
head = NodePath("Camera3D/head")
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.510896, 0.0644827)

View File

@@ -4,6 +4,7 @@ class_name Player
@export var speed = 5.0
@export var jump_velocity = 4.5
@export var mouse_sensitivity = 0.002
@export var head: Node3D
var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
var camera_node: Camera3D
@@ -20,7 +21,7 @@ func _ready():
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
$Mesh.hide()
$Label3D.hide()
$Camera3D/head.hide()
head.hide()
func set_player_name(peer_id: String, player_name: String):
name = peer_id
@@ -66,7 +67,8 @@ func _input(event):
if is_multiplayer_authority():
if event is InputEventMouseMotion:
# Rotate the CharacterBody3D around the Y-axis for horizontal look
rotate_y(-event.relative.x * mouse_sensitivity)
#rotate_y(-event.relative.x * mouse_sensitivity)
head.rotate_y(-event.relative.x * mouse_sensitivity)
# Rotate the Camera3D around its local X-axis for vertical look
var change = -event.relative.y * mouse_sensitivity