From bbe5bf9537058d7fa3113cbb9fb4bb42910ed6f3 Mon Sep 17 00:00:00 2001 From: Sara Date: Wed, 5 Nov 2025 13:53:24 +0100 Subject: [PATCH] feat: replaced UI placeholders with A/B buttons --- vr-project/UI elements/A_Button.png.import | 13 +++++++------ vr-project/UI elements/B_Button.png.import | 13 +++++++------ vr-project/vr_base.tscn | 22 ++++++++++------------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/vr-project/UI elements/A_Button.png.import b/vr-project/UI elements/A_Button.png.import index bb643711..027349e1 100644 --- a/vr-project/UI elements/A_Button.png.import +++ b/vr-project/UI elements/A_Button.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://tuq77602j30a" -path="res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.ctex" +path.s3tc="res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://UI elements/A_Button.png" -dest_files=["res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.ctex"] +dest_files=["res://.godot/imported/A_Button.png-9bf3f1241f7b4bda84870c93a4d6dcfb.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/B_Button.png.import b/vr-project/UI elements/B_Button.png.import index 227bcb0a..b2fdca05 100644 --- a/vr-project/UI elements/B_Button.png.import +++ b/vr-project/UI elements/B_Button.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://brnep4ge1rh17" -path="res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.ctex" +path.s3tc="res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://UI elements/B_Button.png" -dest_files=["res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.ctex"] +dest_files=["res://.godot/imported/B_Button.png-aaea9e4d22350e4d05608f1cc98929ee.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/vr_base.tscn b/vr-project/vr_base.tscn index a2e44901..e91c3dea 100644 --- a/vr-project/vr_base.tscn +++ b/vr-project/vr_base.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=18 format=4 uid="uid://ctf3dsro4aqon"] +[gd_scene load_steps=19 format=4 uid="uid://ctf3dsro4aqon"] [ext_resource type="Texture2D" uid="uid://c0aarcidro2ml" path="res://Textures/HandLeftMat.png" id="1_pvnbl"] [ext_resource type="PackedScene" uid="uid://jl44wibohg6a" path="res://3D Models/Camera_asset.blend" id="2_pvnbl"] [ext_resource type="Texture2D" uid="uid://bgyefxmoyrpqe" path="res://Textures/HandRightCameraMat.png" id="3_pvnbl"] [ext_resource type="Texture2D" uid="uid://cvm0k5l7n5w7n" path="res://UI elements/Dele_Button.png" id="4_ho4oo"] [ext_resource type="Texture2D" uid="uid://dh1v02dybfrey" path="res://UI elements/Save Photo_Button.png" id="4_qs2no"] -[ext_resource type="Texture2D" uid="uid://g81rhcfasgdj" path="res://UI elements/Left_Button.png" id="6_iyk8l"] +[ext_resource type="Texture2D" uid="uid://tuq77602j30a" path="res://UI elements/A_Button.png" id="5_71qfo"] +[ext_resource type="Texture2D" uid="uid://brnep4ge1rh17" path="res://UI elements/B_Button.png" id="6_x2gwt"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nmntx"] resource_name = "Material" @@ -478,26 +479,23 @@ libraries = { } [node name="SendDeletePopup" type="Node3D" parent="RightController"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.03526345, -0.004750766, 0.0015540421) script = SubResource("GDScript_x2gwt") [node name="Sprite3D" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(0.024243923, 0, 0, 0, 0.012121962, 0.020995853, 0, -0.020995853, 0.012121962, 0.19533283, 0.00052747875, -0.054790676) +transform = Transform3D(0.024243923, 0, 0, 0, 0.0044933865, 0.02382388, 0, -0.02382388, 0.0044933865, 0.19429836, -0.0030314997, -0.05541283) texture = ExtResource("4_qs2no") -[node name="Sprite3D4" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(-1.3237387e-09, 0.030283615, 0, -0.015141808, -1.1633353e-09, 0.02622638, 0.026226377, 1.1633353e-09, 0.015141809, 0.055142492, -0.0019377172, -0.050520867) -texture = ExtResource("6_iyk8l") - [node name="Sprite3D5" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(-0.02155451, -2.0732596e-09, 6.6287337e-10, 0, -0.010777256, 0.018666755, -1.3257467e-09, 0.018666754, 0.010777257, 0.023266464, 0.03297473, -0.11117923) -texture = ExtResource("6_iyk8l") +transform = Transform3D(0.017495712, 3.2123806e-09, 5.380519e-10, -2.0423974e-09, 0.0032426696, 0.017192593, 2.1196422e-09, -0.01719259, 0.00324267, -0.002893582, 0.012185816, -0.13660312) +texture = ExtResource("5_71qfo") [node name="Sprite3D6" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(-0.02155451, -2.0732596e-09, 6.6287337e-10, 0, -0.010777256, 0.018666755, -1.3257467e-09, 0.018666754, 0.010777257, 0.023942843, 0.02654134, -0.10003632) -texture = ExtResource("6_iyk8l") +transform = Transform3D(0.017495712, 3.2123806e-09, 5.380519e-10, -2.0423974e-09, 0.0032426696, 0.017192593, 2.1196422e-09, -0.01719259, 0.00324267, 0.041216433, -0.0015267655, -0.0638991) +texture = ExtResource("6_x2gwt") [node name="Sprite3D2" type="Sprite3D" parent="RightController/SendDeletePopup"] -transform = Transform3D(0.028563617, 0, 0, 0, 0.014281811, 0.024736822, 0, -0.024736822, 0.014281811, -0.06360234, 0.025699826, -0.09839058) +transform = Transform3D(0.032038964, 0, 0, 0, 0.0059381267, 0.031483874, 0, -0.031483874, 0.0059381267, 0.119416386, 0.012528613, -0.13791326) texture = ExtResource("4_ho4oo") [connection signal="found_marker_changed" from="RightController/ClueFinder" to="RightController/SendDeletePopup" method="_on_clue_finder_found_marker_changed"]