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

Merge pull request #169 from Nitwel/imp2

Browse Source 
Add Report a Bug button
This commit is contained in:
Nitwel 2024-05-28 15:50:40 +02:00 committed by GitHub
commit 9aacf22850
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 81 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/content/entities/camera/settings.gd
View File

@ -1,4 +1,4 @@
extends Node3D extends StaticBody3D
const Camera = preload ("./camera.gd") const Camera = preload ("./camera.gd")

21
app/content/entities/camera/settings.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://dejilst6cwqvi"] [gd_scene load_steps=10 format=3 uid="uid://dejilst6cwqvi"]
[ext_resource type="Script" path="res://content/entities/camera/settings.gd" id="1_1ixy6"] [ext_resource type="Script" path="res://content/entities/camera/settings.gd" id="1_1ixy6"]
[ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="1_myvk1"] [ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="1_myvk1"]
@ -7,7 +7,7 @@
[ext_resource type="PackedScene" uid="uid://pk5k1q8bx0rj" path="res://content/ui/components/slider/slider.tscn" id="4_t8xp5"] [ext_resource type="PackedScene" uid="uid://pk5k1q8bx0rj" path="res://content/ui/components/slider/slider.tscn" id="4_t8xp5"]
[ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="5_opf0y"] [ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="5_opf0y"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_oovyb"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_smnuk"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("2_wwobq") shader = ExtResource("2_wwobq")
@ -22,15 +22,20 @@ 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_cftc5"] [sub_resource type="QuadMesh" id="QuadMesh_jill0"]
size = Vector2(0.3, 0.2) size = Vector2(0.3, 0.2)
[node name="Settings" type="Node3D"] [sub_resource type="BoxShape3D" id="BoxShape3D_ctomk"]
size = Vector3(0.3, 0.2, 0.02)
[node name="Settings" type="StaticBody3D"]
collision_layer = 6
collision_mask = 0
script = ExtResource("1_1ixy6") script = ExtResource("1_1ixy6")
[node name="Panel" parent="." instance=ExtResource("1_myvk1")] [node name="Panel" parent="." instance=ExtResource("1_myvk1")]
material_override = SubResource("ShaderMaterial_oovyb") material_override = SubResource("ShaderMaterial_smnuk")
mesh = SubResource("QuadMesh_cftc5") mesh = SubResource("QuadMesh_jill0")
skeleton = NodePath("../..") skeleton = NodePath("../..")
size = Vector2(0.3, 0.2) size = Vector2(0.3, 0.2)
@ -96,3 +101,7 @@ value = 1.0
step = 1.0 step = 1.0
label_unit = "FPS" label_unit = "FPS"
size = Vector3(0.11, 0.02, 0.01) size = Vector3(0.11, 0.02, 0.01)
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.01)
shape = SubResource("BoxShape3D_ctomk")

2
app/content/entities/light/settings.gd
View File

@ -1,4 +1,4 @@
extends Node3D extends StaticBody3D
const Light = preload ("./light.gd") const Light = preload ("./light.gd")

21
app/content/entities/light/settings.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=3 uid="uid://de34yde00ngkv"] [gd_scene load_steps=9 format=3 uid="uid://de34yde00ngkv"]
[ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="1_78ups"] [ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="1_78ups"]
[ext_resource type="Script" path="res://content/entities/light/settings.gd" id="1_gw2gi"] [ext_resource type="Script" path="res://content/entities/light/settings.gd" id="1_gw2gi"]
@ -6,7 +6,7 @@
[ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="3_2gpr3"] [ext_resource type="PackedScene" uid="uid://bsjqdvkt0u87c" path="res://content/ui/components/button/button.tscn" id="3_2gpr3"]
[ext_resource type="PackedScene" uid="uid://blrhy2uccrdn4" path="res://content/ui/components/input/input.tscn" id="4_upyp3"] [ext_resource type="PackedScene" uid="uid://blrhy2uccrdn4" path="res://content/ui/components/input/input.tscn" id="4_upyp3"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_vmdy0"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_t0vpw"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("2_m4moa") shader = ExtResource("2_m4moa")
@ -21,16 +21,21 @@ 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_qu5ku"] [sub_resource type="QuadMesh" id="QuadMesh_s453u"]
size = Vector2(0.3, 0.25) size = Vector2(0.3, 0.25)
[node name="Settings" type="Node3D"] [sub_resource type="BoxShape3D" id="BoxShape3D_bu024"]
size = Vector3(0.3, 0.25, 0.02)
[node name="Settings" type="StaticBody3D"]
collision_layer = 6
collision_mask = 0
script = ExtResource("1_gw2gi") script = ExtResource("1_gw2gi")
[node name="Panel" parent="." instance=ExtResource("1_78ups")] [node name="Panel" parent="." instance=ExtResource("1_78ups")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.45058e-09, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.45058e-09, 0)
material_override = SubResource("ShaderMaterial_vmdy0") material_override = SubResource("ShaderMaterial_t0vpw")
mesh = SubResource("QuadMesh_qu5ku") mesh = SubResource("QuadMesh_s453u")
skeleton = NodePath("../..") skeleton = NodePath("../..")
size = Vector2(0.3, 0.25) size = Vector2(0.3, 0.25)
@ -110,3 +115,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00999999, -0.08, 0)
label = "check" label = "check"
icon = true icon = true
toggleable = true toggleable = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.01)
shape = SubResource("BoxShape3D_bu024")

2
app/content/entities/line_chart/line_chart.tscn
View File

@ -10,7 +10,7 @@
size = Vector3(0.5, 0.3, 0.001) size = Vector3(0.5, 0.3, 0.001)
[node name="LineChart" type="StaticBody3D"] [node name="LineChart" type="StaticBody3D"]
collision_layer = 5 collision_layer = 6
collision_mask = 0 collision_mask = 0
script = ExtResource("1_5dxim") script = ExtResource("1_5dxim")

2
app/content/entities/line_chart/settings.gd
View File

@ -1,4 +1,4 @@
extends Node3D extends StaticBody3D
const LineChart = preload ("./line_chart.gd") const LineChart = preload ("./line_chart.gd")

21
app/content/entities/line_chart/settings.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://q5p1701gdfiq"] [gd_scene load_steps=10 format=3 uid="uid://q5p1701gdfiq"]
[ext_resource type="Script" path="res://content/entities/line_chart/settings.gd" id="1_xxfkt"] [ext_resource type="Script" path="res://content/entities/line_chart/settings.gd" id="1_xxfkt"]
[ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="2_4g761"] [ext_resource type="PackedScene" uid="uid://dnam3fe36gg62" path="res://content/ui/components/panel/panel.tscn" id="2_4g761"]
@ -7,7 +7,7 @@
[ext_resource type="PackedScene" uid="uid://blrhy2uccrdn4" path="res://content/ui/components/input/input.tscn" id="5_ecnnd"] [ext_resource type="PackedScene" uid="uid://blrhy2uccrdn4" path="res://content/ui/components/input/input.tscn" id="5_ecnnd"]
[ext_resource type="PackedScene" uid="uid://wgnowarejk5y" path="res://content/ui/components/select/select.tscn" id="6_egqee"] [ext_resource type="PackedScene" uid="uid://wgnowarejk5y" path="res://content/ui/components/select/select.tscn" id="6_egqee"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_boysj"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_3ewpv"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("3_vjmg5") shader = ExtResource("3_vjmg5")
@ -22,15 +22,20 @@ 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_e21ey"] [sub_resource type="QuadMesh" id="QuadMesh_t2fh8"]
size = Vector2(0.3, 0.2) size = Vector2(0.3, 0.2)
[node name="Settings" type="Node3D"] [sub_resource type="BoxShape3D" id="BoxShape3D_53oq0"]
size = Vector3(0.3, 0.2, 0.02)
[node name="Settings" type="StaticBody3D"]
collision_layer = 6
collision_mask = 0
script = ExtResource("1_xxfkt") script = ExtResource("1_xxfkt")
[node name="Panel" parent="." instance=ExtResource("2_4g761")] [node name="Panel" parent="." instance=ExtResource("2_4g761")]
material_override = SubResource("ShaderMaterial_boysj") material_override = SubResource("ShaderMaterial_3ewpv")
mesh = SubResource("QuadMesh_e21ey") mesh = SubResource("QuadMesh_t2fh8")
skeleton = NodePath("../..") skeleton = NodePath("../..")
size = Vector2(0.3, 0.2) size = Vector2(0.3, 0.2)
@ -83,3 +88,7 @@ options = {
4: "Last Year" 4: "Last Year"
} }
size = Vector3(0.16, 0.03, 0.01) size = Vector3(0.16, 0.03, 0.01)
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.01)
shape = SubResource("BoxShape3D_53oq0")

1
app/content/system/raycast/raycast.tscn
View File

@ -55,6 +55,7 @@ material_override = SubResource("ShaderMaterial_ov0gt")
mesh = ExtResource("5_3o4gy") mesh = ExtResource("5_3o4gy")
[node name="Grid" type="MeshInstance3D" parent="."] [node name="Grid" type="MeshInstance3D" parent="."]
visible = false
material_override = ExtResource("7_tnbkv") material_override = ExtResource("7_tnbkv")
mesh = SubResource("PlaneMesh_cq16e") mesh = SubResource("PlaneMesh_cq16e")

16
app/content/ui/components/select/select.tscn
View File

@ -5,7 +5,7 @@
[ext_resource type="Shader" path="res://content/ui/components/panel/glass.gdshader" id="3_8yxox"] [ext_resource type="Shader" path="res://content/ui/components/panel/glass.gdshader" id="3_8yxox"]
[ext_resource type="FontVariation" uid="uid://sshfnckriqxn" path="res://assets/icons/icons.tres" id="4_61i7u"] [ext_resource type="FontVariation" uid="uid://sshfnckriqxn" path="res://assets/icons/icons.tres" id="4_61i7u"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_o58sw"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_81jws"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("3_8yxox") shader = ExtResource("3_8yxox")
@ -20,14 +20,14 @@ 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_xblx4"] [sub_resource type="QuadMesh" id="QuadMesh_3uyfs"]
size = Vector2(0.2, 0.04) size = Vector2(0.2, 0.04)
[sub_resource type="BoxShape3D" id="BoxShape3D_uwnbp"] [sub_resource type="BoxShape3D" id="BoxShape3D_uwnbp"]
resource_local_to_scene = true resource_local_to_scene = true
size = Vector3(0.2, 0.04, 0.01) size = Vector3(0.2, 0.04, 0.01)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_fnoxg"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_t7hp2"]
resource_local_to_scene = true resource_local_to_scene = true
render_priority = 10 render_priority = 10
shader = ExtResource("3_8yxox") shader = ExtResource("3_8yxox")
@ -42,7 +42,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_6v0t1"] [sub_resource type="QuadMesh" id="QuadMesh_b0yu6"]
size = Vector2(0.02, 0.01) size = Vector2(0.02, 0.01)
[sub_resource type="BoxShape3D" id="BoxShape3D_cv4hj"] [sub_resource type="BoxShape3D" id="BoxShape3D_cv4hj"]
@ -63,8 +63,8 @@ collision_mask = 0
[node name="Panel" parent="Body" instance=ExtResource("2_5mspw")] [node name="Panel" parent="Body" instance=ExtResource("2_5mspw")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.01) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.01)
material_override = SubResource("ShaderMaterial_o58sw") material_override = SubResource("ShaderMaterial_81jws")
mesh = SubResource("QuadMesh_xblx4") mesh = SubResource("QuadMesh_3uyfs")
skeleton = NodePath("../..") skeleton = NodePath("../..")
size = Vector2(0.2, 0.04) size = Vector2(0.2, 0.04)
@ -101,8 +101,8 @@ collision_mask = 0
[node name="Panel" parent="Options" instance=ExtResource("2_5mspw")] [node name="Panel" parent="Options" instance=ExtResource("2_5mspw")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.01, -0.005, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.01, -0.005, 0)
material_override = SubResource("ShaderMaterial_fnoxg") material_override = SubResource("ShaderMaterial_t7hp2")
mesh = SubResource("QuadMesh_6v0t1") mesh = SubResource("QuadMesh_b0yu6")
skeleton = NodePath("../..") skeleton = NodePath("../..")
size = Vector2(0.02, 0.01) size = Vector2(0.02, 0.01)

5
app/content/ui/menu/settings/settings_menu.gd
View File

@ -3,12 +3,17 @@ extends Node3D
@onready var credits = $Content/Credits/Clickable @onready var credits = $Content/Credits/Clickable
@onready var background = $Background @onready var background = $Background
@onready var version_label = $Content/LabelVersion @onready var version_label = $Content/LabelVersion
@onready var report_bug_button = $Content/ReportBugButton
func _ready(): func _ready():
_load_game_version() _load_game_version()
background.visible = false background.visible = false
report_bug_button.on_button_up.connect(func():
OS.shell_open("https://github.com/Nitwel/Immersive-Home/issues")
)
func _load_game_version(): func _load_game_version():
var presets = ConfigFile.new() var presets = ConfigFile.new()
presets.load("res://export_presets.cfg") presets.load("res://export_presets.cfg")

18
app/content/ui/menu/settings/settings_menu.tscn
View File

@ -78,6 +78,23 @@ font_size = 10
outline_size = 0 outline_size = 0
horizontal_alignment = 2 horizontal_alignment = 2
[node name="ReportBugLabel" type="Label3D" parent="Content"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.31, -0.285, 0)
pixel_size = 0.001
render_priority = 15
outline_render_priority = 14
text = "Report a Bug"
font_size = 10
outline_size = 0
horizontal_alignment = 0
[node name="ReportBugButton" parent="Content" instance=ExtResource("1_faxng")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.395, -0.285, 0)
font_size = 18
label = "bug_report"
icon = true
size = Vector3(0.03, 0.03, 0.01)
[node name="Background" type="MeshInstance3D" parent="."] [node name="Background" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 1.06581e-14, 0, -1.06581e-14, 1, 0.21, -0.16, 0) transform = Transform3D(1, 0, 0, 0, 1, 1.06581e-14, 0, -1.06581e-14, 1, 0.21, -0.16, 0)
material_override = SubResource("ShaderMaterial_3iv64") material_override = SubResource("ShaderMaterial_3iv64")
@ -112,6 +129,7 @@ script = ExtResource("8_ctbdo")
tabs = NodePath("../Tabs") tabs = NodePath("../Tabs")
[node name="ApiMenu" parent="TabsContent3D" instance=ExtResource("8_jicvf")] [node name="ApiMenu" parent="TabsContent3D" instance=ExtResource("8_jicvf")]
visible = false
[node name="FeaturesMenu" parent="TabsContent3D" instance=ExtResource("9_k7004")] [node name="FeaturesMenu" parent="TabsContent3D" instance=ExtResource("9_k7004")]
visible = false visible = false