forked from unfa/liblast
Fixed failing HUD referencing in Player.gd
parent
2a7b83012c
commit
004247e8bf
|
@ -2,3 +2,4 @@
|
||||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
|
|
@ -3,9 +3,12 @@ extends CharacterBody3D
|
||||||
@export var mouse_sensitivity := 0.35
|
@export var mouse_sensitivity := 0.35
|
||||||
#var speed := 15
|
#var speed := 15
|
||||||
|
|
||||||
var hud: Node
|
@onready var hud = get_tree().root.get_node("Main").get_node("HUD")
|
||||||
var crosshair: Node
|
@onready var crosshair = hud.get_node("Crosshair")
|
||||||
var vignette: Node
|
@onready var vignette = hud.get_node("Vignette")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@onready var head = $Head
|
@onready var head = $Head
|
||||||
@onready var camera = $Head/Camera
|
@onready var camera = $Head/Camera
|
||||||
@onready var tween = $Head/Camera/Tween
|
@onready var tween = $Head/Camera/Tween
|
||||||
|
@ -108,10 +111,6 @@ var gravity_vec := Vector3.ZERO
|
||||||
head.set_rotation(head_rotation)
|
head.set_rotation(head_rotation)
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
hud = get_tree().root.find_node("HUD", true, false)
|
|
||||||
crosshair = hud.get_node("Crosshair")
|
|
||||||
vignette = hud.get_node("Vignette")
|
|
||||||
|
|
||||||
#Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
#Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||||
view_zoom = 1.0
|
view_zoom = 1.0
|
||||||
|
|
||||||
|
@ -146,14 +145,18 @@ func _input(event) -> void:
|
||||||
return
|
return
|
||||||
|
|
||||||
if Input.is_action_just_pressed("view_zoom"):
|
if Input.is_action_just_pressed("view_zoom"):
|
||||||
tween.remove_all()
|
# tween.remove_all()
|
||||||
tween.interpolate_property(self, "view_zoom", view_zoom, 4.0, 0.5, Tween.TRANS_SINE, Tween.EASE_IN_OUT)
|
# tween.interpolate_property(self, "view_zoom", view_zoom, 4.0, 0.5, Tween.TRANS_SINE, Tween.EASE_IN_OUT)
|
||||||
tween.start()
|
# tween.start()
|
||||||
|
|
||||||
|
view_zoom = 4.0
|
||||||
|
|
||||||
if Input.is_action_just_released("view_zoom"):
|
if Input.is_action_just_released("view_zoom"):
|
||||||
tween.remove_all()
|
# tween.remove_all()
|
||||||
tween.interpolate_property(self, "view_zoom", view_zoom, 1.0, 0.25, Tween.TRANS_SINE, Tween.EASE_IN_OUT)
|
# tween.interpolate_property(self, "view_zoom", view_zoom, 1.0, 0.25, Tween.TRANS_SINE, Tween.EASE_IN_OUT)
|
||||||
tween.start()
|
# tween.start()
|
||||||
|
|
||||||
|
view_zoom = 1.0
|
||||||
|
|
||||||
# rpc_unreliable(&'aim', event)
|
# rpc_unreliable(&'aim', event)
|
||||||
aim(event)
|
aim(event)
|
||||||
|
|
|
@ -181,7 +181,7 @@ __meta__ = {
|
||||||
[node name="Typing" type="HBoxContainer" parent="Chat/VBoxContainer"]
|
[node name="Typing" type="HBoxContainer" parent="Chat/VBoxContainer"]
|
||||||
visible = false
|
visible = false
|
||||||
offset_top = 474.0
|
offset_top = 474.0
|
||||||
offset_right = 339.0
|
offset_right = 309.0
|
||||||
offset_bottom = 507.0
|
offset_bottom = 507.0
|
||||||
script = null
|
script = null
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
|
@ -202,7 +202,7 @@ __meta__ = {
|
||||||
|
|
||||||
[node name="Editor" type="LineEdit" parent="Chat/VBoxContainer/Typing"]
|
[node name="Editor" type="LineEdit" parent="Chat/VBoxContainer/Typing"]
|
||||||
offset_left = 59.0
|
offset_left = 59.0
|
||||||
offset_right = 339.0
|
offset_right = 309.0
|
||||||
offset_bottom = 33.0
|
offset_bottom = 33.0
|
||||||
rect_min_size = Vector2(250, 0)
|
rect_min_size = Vector2(250, 0)
|
||||||
max_length = 80
|
max_length = 80
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue