alexandru.stanciu/immersive-home
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

move keyboard and fix signal tool error

Browse Source
This commit is contained in:
Nitwel 2023-11-22 17:05:34 +01:00
parent 222b0feae7
commit d2a8e927c9
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/main.tscn
View File

@ -7,7 +7,7 @@
[ext_resource type="PackedScene" uid="uid://ctltchlf2j2r4" path="res://addons/xr-simulator/XRSimulator.tscn" id="5_3qc8g"] [ext_resource type="PackedScene" uid="uid://ctltchlf2j2r4" path="res://addons/xr-simulator/XRSimulator.tscn" id="5_3qc8g"]
[ext_resource type="Material" uid="uid://bf5ina366dwm6" path="res://assets/materials/sky.material" id="5_wgwf8"] [ext_resource type="Material" uid="uid://bf5ina366dwm6" path="res://assets/materials/sky.material" id="5_wgwf8"]
[ext_resource type="PackedScene" uid="uid://83lb5p4e0qk0" path="res://content/scenes/house.tscn" id="8_qkrg7"] [ext_resource type="PackedScene" uid="uid://83lb5p4e0qk0" path="res://content/scenes/house.tscn" id="8_qkrg7"]
[ext_resource type="PackedScene" uid="uid://lrehk38exd5n" path="res://content/ui/keyboard/keyboard.tscn" id="9_e5n3p"] [ext_resource type="PackedScene" uid="uid://lrehk38exd5n" path="res://content/system/keyboard/keyboard.tscn" id="9_e5n3p"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m58yb"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m58yb"]
ao_enabled = true ao_enabled = true

1
content/ui/keyboard/keyboard.gd → content/system/keyboard/keyboard.gd
View File

@ -23,6 +23,7 @@ func _ready():
for key in row: for key in row:
var button = create_key(key) var button = create_key(key)
keys.add_child(button) keys.add_child(button)
button.on_button_down.connect(func(): button.on_button_down.connect(func():
_emit_event("key_down", key) _emit_event("key_down", key)
) )

2
content/ui/keyboard/keyboard.tscn → content/system/keyboard/keyboard.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=6 format=3 uid="uid://lrehk38exd5n"] [gd_scene load_steps=6 format=3 uid="uid://lrehk38exd5n"]
[ext_resource type="Script" path="res://content/ui/keyboard/keyboard.gd" id="1_maojw"] [ext_resource type="Script" path="res://content/system/keyboard/keyboard.gd" id="1_maojw"]
[ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="1_xdpwr"] [ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="1_xdpwr"]
[ext_resource type="Script" path="res://content/ui/menu/grid.gd" id="3_mx544"] [ext_resource type="Script" path="res://content/ui/menu/grid.gd" id="3_mx544"]
[ext_resource type="Script" path="res://content/functions/movable.gd" id="4_86fct"] [ext_resource type="Script" path="res://content/functions/movable.gd" id="4_86fct"]

2
content/ui/components/button/button.gd
View File

@ -1,3 +1,4 @@
@tool
extends StaticBody3D extends StaticBody3D
class_name Button3D class_name Button3D
@ -21,7 +22,6 @@ var active: bool = false :
animation_player.play_backwards("down") animation_player.play_backwards("down")
@onready var animation_player: AnimationPlayer = $AnimationPlayer @onready var animation_player: AnimationPlayer = $AnimationPlayer
@onready var click_sound: AudioStreamPlayer = $ClickSound
func _ready(): func _ready():
if initial_active: if initial_active: