openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-07-16 00:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cleanup/iff-attach-point' into 'develop'

Browse source 
Minor cleanup: IFF uses editor-set nodes rather than hardcoded paths to the external scene

See merge request open-fpsz/open-fpsz!23
This commit is contained in:
Squinty 2024-04-12 16:16:06 +00:00
commit 06346b2d98
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
characters/player/player.tscn
View file

@ -246,9 +246,11 @@ root_path = NodePath(".")
replication_config = SubResource("SceneReplicationConfig_5j4ew") replication_config = SubResource("SceneReplicationConfig_5j4ew")
script = ExtResource("6_xwlxv") 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) 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" node_paths=PackedStringArray("attach_point", "player") instance=ExtResource("7_8hc80")]
attach_point = NodePath("../IFFAttachment")
[node name="IFF" parent="ThirdPerson" instance=ExtResource("7_8hc80")] player = NodePath("../..")

11
interfaces/hud/iff.gd
View file

@ -1,20 +1,21 @@
extends Node2D extends Node2D
@onready var _player = $"../.." @export var attach_point : Node3D
@export var player : Player
@onready var _player_name_label = $Offset/VBoxContainer/PlayerNameLabel @onready var _player_name_label = $Offset/VBoxContainer/PlayerNameLabel
@onready var _iff_attachment = $"../../IFFAttachment"
@onready var _health_bar = $Offset/VBoxContainer/HealthBar @onready var _health_bar = $Offset/VBoxContainer/HealthBar
@onready var _v_box_container = $Offset/VBoxContainer @onready var _v_box_container = $Offset/VBoxContainer
func _process(_delta): func _process(_delta):
var camera : Camera3D = get_viewport().get_camera_3d() 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() _v_box_container.hide()
else: else:
_v_box_container.show() _v_box_container.show()
_player_name_label.text = _player.name _player_name_label.text = player.name
position = camera.unproject_position(_iff_attachment.global_position) position = camera.unproject_position(attach_point.global_position)
var viewport_size : Vector2 = get_viewport_rect().size var viewport_size : Vector2 = get_viewport_rect().size
position.x = clampf(position.x, 0, viewport_size.x - _v_box_container.size.x) 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) position.y = clampf(position.y, _v_box_container.size.y, viewport_size.y)