diff --git a/HUD.tscn b/HUD.tscn index 77086c7..4667c2a 100644 --- a/HUD.tscn +++ b/HUD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://SlapGauge.gd" type="Script" id=1] [ext_resource path="res://Start.gd" type="Script" id=2] @@ -51,11 +51,6 @@ shader_param/kill = null shader_param/bkgcol = Plane( 0, 0, 0, 0.3 ) shader_param/kilcol = Plane( 0.5, 0, 0, 0.3 ) -[sub_resource type="DynamicFont" id=12] -size = 33 -use_filter = true -font_data = ExtResource( 3 ) - [sub_resource type="DynamicFont" id=7] size = 88 outline_size = 5 diff --git a/Player.gd b/Player.gd index db631cc..f396c08 100644 --- a/Player.gd +++ b/Player.gd @@ -26,17 +26,13 @@ onready var head = $Head onready var ground_check = $GroundCheck onready var slap_gauge = $HUD/ActualHUD/SlapGauge onready var slap_animator = $HandMovement - -func _ready(): - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - slap_animator.current_animation = "basic_slap" -onready var SlapGauge = $HUD/ActualHUD/SlapGauge onready var Menu = $HUD/Start onready var AudioSlap = $AudioSlap onready var AudioMegaSlap = $AudioMegaSlap func _ready(): - pass + slap_animator.current_animation = "basic_slap" + func _input(event): if event is InputEventMouseMotion: @@ -106,8 +102,8 @@ func _physics_process(delta): slap_gauge.fill = slap slap_animator.seek(slap, true) - SlapGauge.fill = slap; - SlapGauge.kill = slapkill; + slap_gauge.fill = slap; + slap_gauge.kill = slapkill; direction = direction.normalized() diff --git a/Player.tscn b/Player.tscn index fd6387c..4da6f3f 100644 --- a/Player.tscn +++ b/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Player.gd" type="Script" id=1] [ext_resource path="res://BlenderStuff/Hand/protohand.obj" type="ArrayMesh" id=2] @@ -13,6 +13,7 @@ height = 3.0 [sub_resource type="CylinderShape" id=3] [sub_resource type="SpatialMaterial" id=4] +flags_no_depth_test = true albedo_texture = ExtResource( 3 ) uv1_triplanar = true @@ -120,6 +121,7 @@ cast_to = Vector3( 0, -1.5, 0 ) [node name="HandMovement" type="AnimationPlayer" parent="."] anims/RESET = SubResource( 5 ) anims/basic_slap = SubResource( 6 ) + [node name="AudioSlap" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 5 )