From 4b2050b91ac03c11d88b634e50118f8a10073ae9 Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 5 Nov 2025 23:23:54 +0100 Subject: [PATCH] feat: now using actual "failed/succeeded" UI in VR --- vr-project/UI elements/VR_Failed.png.import | 13 ++++++----- vr-project/UI elements/VR_Succes.png.import | 13 ++++++----- vr-project/objects/game_over_ui.tscn | 26 ++++++++++----------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/vr-project/UI elements/VR_Failed.png.import b/vr-project/UI elements/VR_Failed.png.import index 005c3492..e2e8a109 100644 --- a/vr-project/UI elements/VR_Failed.png.import +++ b/vr-project/UI elements/VR_Failed.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3knvj2q7vmif" -path="res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.ctex" +path.s3tc="res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://UI elements/VR_Failed.png" -dest_files=["res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.ctex"] +dest_files=["res://.godot/imported/VR_Failed.png-77a7e60e22dd8ddfe5dd190b290a0614.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/vr-project/UI elements/VR_Succes.png.import b/vr-project/UI elements/VR_Succes.png.import index ff0020f4..361b6cc7 100644 --- a/vr-project/UI elements/VR_Succes.png.import +++ b/vr-project/UI elements/VR_Succes.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://eyeddfidmekf" -path="res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.ctex" +path.s3tc="res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://UI elements/VR_Succes.png" -dest_files=["res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.ctex"] +dest_files=["res://.godot/imported/VR_Succes.png-8393ebd9c72b81de1f2be0b2d3813302.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/vr-project/objects/game_over_ui.tscn b/vr-project/objects/game_over_ui.tscn index 3817a395..fe2e39fe 100644 --- a/vr-project/objects/game_over_ui.tscn +++ b/vr-project/objects/game_over_ui.tscn @@ -1,11 +1,15 @@ [gd_scene load_steps=4 format=3 uid="uid://chre5k8uyvfiu"] +[ext_resource type="Texture2D" uid="uid://d3knvj2q7vmif" path="res://UI elements/VR_Failed.png" id="1_pn3ym"] +[ext_resource type="Texture2D" uid="uid://eyeddfidmekf" path="res://UI elements/VR_Succes.png" id="2_f56il"] + [sub_resource type="GDScript" id="GDScript_ww6lu"] script/source = "extends Node3D func _enter_tree() -> void: visible = false - ClientNode.get_singleton().conclusion_received.connect(_on_conclusion_received) + if ClientNode.get_singleton(): + ClientNode.get_singleton().conclusion_received.connect(_on_conclusion_received) func _on_conclusion_received(_method : int, _motive : int, murderer : int) -> void: if murderer == NetworkData.CLUE_VELMA_GRAVES: @@ -20,25 +24,21 @@ func _process(_delta) -> void: " -[sub_resource type="TextMesh" id="TextMesh_d4vfo"] -text = "You Were Caught" - -[sub_resource type="TextMesh" id="TextMesh_pn3ym"] -text = "You Got Away With Murder!" - [node name="GameOverUI" type="Node3D"] script = SubResource("GDScript_ww6lu") [node name="Caught" type="Node3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, -0.03917709, -1.6931363) +transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, 0.5939863, -0.068029165) -[node name="MeshInstance3D" type="MeshInstance3D" parent="Caught"] -mesh = SubResource("TextMesh_d4vfo") +[node name="Sprite3D" type="Sprite3D" parent="Caught"] +transform = Transform3D(-0.44277924, 0, -3.8708997e-08, 0, 0.44277924, 0, 3.8708997e-08, 0, -0.44277924, 0, 0, 0) +texture = ExtResource("1_pn3ym") [node name="Escaped" type="Node3D" parent="."] unique_name_in_owner = true -transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, -0.03917709, -1.6931363) +transform = Transform3D(0.32968247, 0, 0, 0, 0.32968247, 0, 0, 0, 0.32968247, 0, 0.5939863, -0.068029165) -[node name="MeshInstance3D" type="MeshInstance3D" parent="Escaped"] -mesh = SubResource("TextMesh_pn3ym") +[node name="Sprite3D2" type="Sprite3D" parent="Escaped"] +transform = Transform3D(-0.44277924, 0, -3.8708997e-08, 0, 0.44277924, 0, 3.8708997e-08, 0, -0.44277924, 0, 0, 0) +texture = ExtResource("2_f56il")