diff --git a/assets/core/player-controller/scenes/player.tscn b/assets/core/player-controller/scenes/player.tscn index 84c7e6c..3c9eb95 100644 --- a/assets/core/player-controller/scenes/player.tscn +++ b/assets/core/player-controller/scenes/player.tscn @@ -24,13 +24,14 @@ shader = ExtResource("3_rakxt") [sub_resource type="ShaderMaterial" id="ShaderMaterial_0n7pd"] shader = ExtResource("3_rakxt") -[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera", "neck", "player_avatar_face", "body")] +[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("camera", "neck", "player_avatar_face", "body", "head")] collision_mask = 242 script = ExtResource("1_bv7t4") camera = NodePath("Neck/Camera3D") neck = NodePath("Neck") player_avatar_face = NodePath("Neck/PlayerAvatarFace") body = NodePath("Body") +head = NodePath("Neck/Camera3D/Head") [node name="PlayerTag" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26654, 0) @@ -49,9 +50,6 @@ shape = SubResource("CapsuleShape3D_qlkab") [node name="Neck" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.65, 0) -[node name="Head" type="MeshInstance3D" parent="Neck"] -mesh = SubResource("SphereMesh_vu2l8") - [node name="Camera3D" type="Camera3D" parent="Neck"] [node name="RayCast3D" type="RayCast3D" parent="Neck/Camera3D" node_paths=PackedStringArray("player")] @@ -60,9 +58,15 @@ collision_mask = 256 script = ExtResource("2_wvu3d") player = NodePath("../../..") +[node name="Head" type="MeshInstance3D" parent="Neck/Camera3D"] +mesh = SubResource("SphereMesh_vu2l8") +skeleton = NodePath("../..") + [node name="PlayerAvatarFace" type="Sprite3D" parent="Neck"] -transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, -0.349588) +transform = Transform3D(-0.1, 0, -8.74228e-09, 0, 0.1, 0, 8.74228e-09, 0, -0.1, 0, 0, -0.349588) flip_h = true +shaded = true +double_sided = false texture = ExtResource("2_omgn1") [node name="PlayerHUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("fps_label")] diff --git a/assets/core/player-controller/scripts/player.gd b/assets/core/player-controller/scripts/player.gd index 5c5ebc3..8cd756a 100644 --- a/assets/core/player-controller/scripts/player.gd +++ b/assets/core/player-controller/scripts/player.gd @@ -19,6 +19,7 @@ var steam_id: int = 0 @export var neck: Node3D @export var player_avatar_face: Sprite3D @export var body: MeshInstance3D +@export var head: MeshInstance3D var jumping: bool = false var is_using_joystick: bool = false @@ -48,6 +49,7 @@ func _ready() -> void: if is_network_authority: camera.make_current() body.hide() + head.hdie() player_avatar_face.hide()