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

fix keyboard not showing

Browse Source
This commit is contained in:
Nitwel 2024-05-27 11:29:55 +02:00
parent a2e423ece9
commit 241feb631d
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/content/main.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=3 uid="uid://eecv28y6jxk4"] [gd_scene load_steps=14 format=3 uid="uid://eecv28y6jxk4"]
[ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="1_i4c04"] [ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="1_i4c04"]
[ext_resource type="Script" path="res://content/main.gd" id="1_uvrd4"] [ext_resource type="Script" path="res://content/main.gd" id="1_uvrd4"]
@ -12,6 +12,7 @@
[ext_resource type="Script" path="res://lib/utils/screenshot.gd" id="12_e13ym"] [ext_resource type="Script" path="res://lib/utils/screenshot.gd" id="12_e13ym"]
[ext_resource type="PackedScene" uid="uid://ds60i5n211hi3" path="res://content/system/miniature/miniature.tscn" id="12_lmxhs"] [ext_resource type="PackedScene" uid="uid://ds60i5n211hi3" path="res://content/system/miniature/miniature.tscn" id="12_lmxhs"]
[ext_resource type="PackedScene" uid="uid://bhyddd1f0ry1x" path="res://content/ui/onboarding/onboarding.tscn" id="12_uq2nj"] [ext_resource type="PackedScene" uid="uid://bhyddd1f0ry1x" path="res://content/ui/onboarding/onboarding.tscn" id="12_uq2nj"]
[ext_resource type="PackedScene" uid="uid://lrehk38exd5n" path="res://content/system/keyboard/keyboard.tscn" id="13_kylpi"]
[node name="Main" type="Node3D"] [node name="Main" type="Node3D"]
script = ExtResource("1_uvrd4") script = ExtResource("1_uvrd4")
@ -25,6 +26,7 @@ visible = false
shadow_enabled = true shadow_enabled = true
[node name="StartXR" parent="." instance=ExtResource("1_i4c04")] [node name="StartXR" parent="." instance=ExtResource("1_i4c04")]
render_target_size_multiplier = 1.5
enable_passthrough = true enable_passthrough = true
[node name="XROrigin3D" type="XROrigin3D" parent="."] [node name="XROrigin3D" type="XROrigin3D" parent="."]
@ -57,3 +59,6 @@ transform = Transform3D(1, -1.39636e-11, 0, 4.42413e-11, 1, 0, 0, 0, 1, -0.57679
[node name="Screenshot" type="Node" parent="."] [node name="Screenshot" type="Node" parent="."]
script = ExtResource("12_e13ym") script = ExtResource("12_e13ym")
[node name="Keyboard" parent="." instance=ExtResource("13_kylpi")]
transform = Transform3D(0.5, 0, 0, 0, 0.237697, 0.439887, 0, -0.439887, 0.237697, -0.0241798, 0.452996, -0.531271)

5
app/content/system/keyboard/keyboard.gd
View File

@ -20,9 +20,12 @@ var caps = false:
update_labels() update_labels()
func _ready(): func _ready():
_create_keys()
if Engine.is_editor_hint():
return
get_parent().remove_child.call_deferred(self) get_parent().remove_child.call_deferred(self)
_create_keys()
_prepare_keyboard_spawn() _prepare_keyboard_spawn()
_connect_key_events() _connect_key_events()

10
app/content/system/miniature/miniature.tscn
View File

@ -1,9 +1,8 @@
[gd_scene load_steps=9 format=3 uid="uid://ds60i5n211hi3"] [gd_scene load_steps=7 format=3 uid="uid://ds60i5n211hi3"]
[ext_resource type="Script" path="res://content/system/miniature/miniature.gd" id="1_b53yn"] [ext_resource type="Script" path="res://content/system/miniature/miniature.gd" id="1_b53yn"]
[ext_resource type="Script" path="res://content/functions/movable.gd" id="2_x7oed"] [ext_resource type="Script" path="res://content/functions/movable.gd" id="2_x7oed"]
[ext_resource type="Script" path="res://content/system/miniature/entity_select.gd" id="3_tgpny"] [ext_resource type="Script" path="res://content/system/miniature/entity_select.gd" id="3_tgpny"]
[ext_resource type="Material" uid="uid://bcfcough6ucvc" path="res://content/system/miniature/mini_wall.tres" id="4_be66c"]
[sub_resource type="BoxShape3D" id="BoxShape3D_bckw3"] [sub_resource type="BoxShape3D" id="BoxShape3D_bckw3"]
@ -16,8 +15,6 @@ albedo_color = Color(0.404, 0.22, 0.627, 0.5)
radius = 0.3 radius = 0.3
height = 1.75 height = 1.75
[sub_resource type="QuadMesh" id="QuadMesh_4asi8"]
[node name="Miniature" type="Node3D"] [node name="Miniature" type="Node3D"]
script = ExtResource("1_b53yn") script = ExtResource("1_b53yn")
@ -46,8 +43,3 @@ mesh = SubResource("CapsuleMesh_f3avi")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.757576, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.757576, 0)
gizmo_extents = 0.1 gizmo_extents = 0.1
script = ExtResource("3_tgpny") script = ExtResource("3_tgpny")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.92, 0, 0)
material_override = ExtResource("4_be66c")
mesh = SubResource("QuadMesh_4asi8")

8
app/content/ui/components/input/input.tscn
View File

@ -5,7 +5,7 @@
[ext_resource type="Shader" path="res://content/ui/components/panel/glass.gdshader" id="3_nl02b"] [ext_resource type="Shader" path="res://content/ui/components/panel/glass.gdshader" id="3_nl02b"]
[ext_resource type="FontFile" uid="uid://drsixxc4tmvjf" path="res://assets/fonts/Montserrat-Medium.ttf" id="4_yukbj"] [ext_resource type="FontFile" uid="uid://drsixxc4tmvjf" path="res://assets/fonts/Montserrat-Medium.ttf" id="4_yukbj"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_j4b8n"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_4vor6"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("3_nl02b") shader = ExtResource("3_nl02b")
@ -20,7 +20,7 @@ shader_parameter/corner_radius = 0.2
shader_parameter/roughness = 0.3 shader_parameter/roughness = 0.3
shader_parameter/grain_amount = 0.02 shader_parameter/grain_amount = 0.02
[sub_resource type="QuadMesh" id="QuadMesh_ltwsx"] [sub_resource type="QuadMesh" id="QuadMesh_dndsq"]
size = Vector2(0.15, 0.03) size = Vector2(0.15, 0.03)
[sub_resource type="BoxShape3D" id="BoxShape3D_x4yp8"] [sub_resource type="BoxShape3D" id="BoxShape3D_x4yp8"]
@ -83,8 +83,8 @@ collision_mask = 6
[node name="Panel3D" type="MeshInstance3D" parent="Body"] [node name="Panel3D" type="MeshInstance3D" parent="Body"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.005) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.005)
material_override = SubResource("ShaderMaterial_j4b8n") material_override = SubResource("ShaderMaterial_4vor6")
mesh = SubResource("QuadMesh_ltwsx") mesh = SubResource("QuadMesh_dndsq")
script = ExtResource("3_3bvrj") script = ExtResource("3_3bvrj")
size = Vector2(0.15, 0.03) size = Vector2(0.15, 0.03)