From dbcbe15bb92c2295b92ba572bac3be10bb8c2f9e Mon Sep 17 00:00:00 2001 From: Squinty Date: Fri, 12 Apr 2024 16:16:06 +0000 Subject: [PATCH] Minor cleanup: IFF uses editor-set nodes rather than hardcoded paths to the external scene --- characters/player/player.tscn | 10 ++++++---- interfaces/hud/iff.gd | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/characters/player/player.tscn b/characters/player/player.tscn index 19f0d2a..b316f90 100644 --- a/characters/player/player.tscn +++ b/characters/player/player.tscn @@ -246,9 +246,11 @@ root_path = NodePath(".") replication_config = SubResource("SceneReplicationConfig_5j4ew") script = ExtResource("6_xwlxv") -[node name="IFFAttachment" type="Node3D" parent="."] +[node name="ThirdPerson" type="Node3D" parent="."] + +[node name="IFFAttachment" type="Node3D" parent="ThirdPerson"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.27457, 0) -[node name="ThirdPerson" type="Node" parent="."] - -[node name="IFF" parent="ThirdPerson" instance=ExtResource("7_8hc80")] +[node name="IFF" parent="ThirdPerson" node_paths=PackedStringArray("attach_point", "player") instance=ExtResource("7_8hc80")] +attach_point = NodePath("../IFFAttachment") +player = NodePath("../..") diff --git a/interfaces/hud/iff.gd b/interfaces/hud/iff.gd index b31bdbd..6e9fe81 100644 --- a/interfaces/hud/iff.gd +++ b/interfaces/hud/iff.gd @@ -1,20 +1,21 @@ extends Node2D -@onready var _player = $"../.." +@export var attach_point : Node3D +@export var player : Player + @onready var _player_name_label = $Offset/VBoxContainer/PlayerNameLabel -@onready var _iff_attachment = $"../../IFFAttachment" @onready var _health_bar = $Offset/VBoxContainer/HealthBar @onready var _v_box_container = $Offset/VBoxContainer func _process(_delta): var camera : Camera3D = get_viewport().get_camera_3d() - if camera.is_position_behind(_iff_attachment.global_position): + if camera.is_position_behind(attach_point.global_position): _v_box_container.hide() else: _v_box_container.show() - _player_name_label.text = _player.name - position = camera.unproject_position(_iff_attachment.global_position) + _player_name_label.text = player.name + position = camera.unproject_position(attach_point.global_position) var viewport_size : Vector2 = get_viewport_rect().size position.x = clampf(position.x, 0, viewport_size.x - _v_box_container.size.x) position.y = clampf(position.y, _v_box_container.size.y, viewport_size.y)