From 1590d1633b0910c3f120fc65a65d5a09dfed9b49 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Sun, 26 Nov 2023 12:58:31 +0100 Subject: [PATCH] re-improve ui components --- README.md | 7 ++++++- .../misc/Hold trigger to continue.png.import | 14 +++++++------ .../assets/misc/progress_bar.png.import | 14 +++++++------ .../textures/caucasian_baseColor.png.import | 14 +++++++------ .../cleaning_glove_baseColor.png.import | 14 +++++++------ .../glove_caucasian_dark_camo.png.import | 14 +++++++------ .../glove_caucasian_green_camo.png.import | 14 +++++++------ .../glove_fingerless_normal.png.import | 20 ++++++++++--------- ...less_occlusionRoughnessMetallic.png.import | 14 +++++++------ .../hands/textures/glove_normal.png.import | 20 ++++++++++--------- ...love_occlusionRoughnessMetallic.png.import | 14 +++++++------ ...ands_occlusionRoughnessMetallic.png.import | 14 +++++++------ .../textures/labglove_baseColor.png.import | 14 +++++++------ addons/godot-xr-tools/images/ring.png.import | 14 +++++++------ .../images/teleport_arrow.png.import | 14 +++++++------ .../images/teleport_target.png.import | 14 +++++++------ assets/materials/swich_on.png.import | 14 +++++++------ content/entities/light/light.tscn | 4 ++-- .../entities/media_player/media_player.tscn | 6 +++--- content/ui/components/button/button.gd | 10 ++-------- content/ui/components/input/input.gd | 11 +++------- 21 files changed, 150 insertions(+), 124 deletions(-) diff --git a/README.md b/README.md index 9fc9f79..ee930cc 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ Thus I've decided to use a custom event system that is similar to the one used i | Group | Description | | -- | -- | +| `entity` | Marks the object as being an entity placed in space | | `ui_focus` | The element can be focused | | `ui_focus_skip` | The focus will not be reset. Useful for keyboard | @@ -181,4 +182,8 @@ Click at the link to get a list of the supported controls. - In XRFeatures, select at least optional for passthrough - Ckeck Internet under the permissions - Under Resources > Filters to export, add `*.j2` -7. `` can be added to the `AndroidManifest.xml` to disable the boundary system. \ No newline at end of file +7. `` can be added to the `AndroidManifest.xml` to disable the boundary system. + +## Troubleshooting + +- If you encounter unexpected behavior when building compared to running locally, it may be that the cached data of godot is corrupted or outdated. Try deleting the `.godot` folder and / or all `*.import` files. \ No newline at end of file diff --git a/addons/godot-xr-tools/assets/misc/Hold trigger to continue.png.import b/addons/godot-xr-tools/assets/misc/Hold trigger to continue.png.import index 2a775ea..a7a574d 100644 --- a/addons/godot-xr-tools/assets/misc/Hold trigger to continue.png.import +++ b/addons/godot-xr-tools/assets/misc/Hold trigger to continue.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://dbbxlk5acoxfg" -path="res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.ctex" +path.s3tc="res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.ctex" +path.etc2="res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/assets/misc/Hold trigger to continue.png" -dest_files=["res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.ctex"] +dest_files=["res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.s3tc.ctex", "res://.godot/imported/Hold trigger to continue.png-ce0a3a4de13c262f7015326bad2cb09d.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/assets/misc/progress_bar.png.import b/addons/godot-xr-tools/assets/misc/progress_bar.png.import index e6030d8..97d88ca 100644 --- a/addons/godot-xr-tools/assets/misc/progress_bar.png.import +++ b/addons/godot-xr-tools/assets/misc/progress_bar.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://b77u06jwo4l5y" -path="res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.ctex" +path.s3tc="res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.ctex" +path.etc2="res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/assets/misc/progress_bar.png" -dest_files=["res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.ctex"] +dest_files=["res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.s3tc.ctex", "res://.godot/imported/progress_bar.png-2ef3cbffca173889900be004fdeb1700.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/caucasian_baseColor.png.import b/addons/godot-xr-tools/hands/textures/caucasian_baseColor.png.import index bb614d3..9931572 100644 --- a/addons/godot-xr-tools/hands/textures/caucasian_baseColor.png.import +++ b/addons/godot-xr-tools/hands/textures/caucasian_baseColor.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://ura2vjsqegjt" -path="res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.ctex" +path.s3tc="res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.s3tc.ctex" +path.etc2="res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/caucasian_baseColor.png" -dest_files=["res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.ctex"] +dest_files=["res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.s3tc.ctex", "res://.godot/imported/caucasian_baseColor.png-2ffa4b91e9a1b3bcc11c22eccd941be7.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png.import b/addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png.import index 6cd85a7..dae2602 100644 --- a/addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png.import +++ b/addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://deh22migllf4t" -path="res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.ctex" +path.s3tc="res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.s3tc.ctex" +path.etc2="res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png" -dest_files=["res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.ctex"] +dest_files=["res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.s3tc.ctex", "res://.godot/imported/cleaning_glove_baseColor.png-775896445d04c5f9ecad1dcd0609e336.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png.import b/addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png.import index 25df6c3..a4fef8f 100644 --- a/addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://daphmv2yp22x" -path="res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.ctex" +path.s3tc="res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.s3tc.ctex" +path.etc2="res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png" -dest_files=["res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.ctex"] +dest_files=["res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.s3tc.ctex", "res://.godot/imported/glove_caucasian_dark_camo.png-338e35680a2de0f7c6ad596eba6a3d5f.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png.import b/addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png.import index 01edf6c..e0bcacd 100644 --- a/addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://bvbbghjfsau1b" -path="res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.ctex" +path.s3tc="res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.s3tc.ctex" +path.etc2="res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png" -dest_files=["res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.ctex"] +dest_files=["res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.s3tc.ctex", "res://.godot/imported/glove_caucasian_green_camo.png-009f6b98bc0f9d73ac78a6b6900a0d00.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png.import b/addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png.import index 1a9de27..f2dc3f2 100644 --- a/addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png.import @@ -3,32 +3,34 @@ importer="texture" type="CompressedTexture2D" uid="uid://duqdr6qqrim0s" -path="res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.ctex" +path.s3tc="res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.s3tc.ctex" +path.etc2="res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" -dest_files=["res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.ctex"] +dest_files=["res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.s3tc.ctex", "res://.godot/imported/glove_fingerless_normal.png-46736b8f0a977e37b17257f7bbbb718f.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" process/fix_alpha_border=true process/premult_alpha=false 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/addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png.import b/addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png.import index ee5ac2f..a53ed10 100644 --- a/addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://3fax6yglkrd3" -path="res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.ctex" +path.s3tc="res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.s3tc.ctex" +path.etc2="res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png" -dest_files=["res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.ctex"] +dest_files=["res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.s3tc.ctex", "res://.godot/imported/glove_fingerless_occlusionRoughnessMetallic.png-441bf1f84442c3cd6ae3834c9c982565.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/glove_normal.png.import b/addons/godot-xr-tools/hands/textures/glove_normal.png.import index bd71f71..92ef95b 100644 --- a/addons/godot-xr-tools/hands/textures/glove_normal.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_normal.png.import @@ -3,32 +3,34 @@ importer="texture" type="CompressedTexture2D" uid="uid://dasjkfath7rqu" -path="res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.ctex" +path.s3tc="res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.s3tc.ctex" +path.etc2="res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_normal.png" -dest_files=["res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.ctex"] +dest_files=["res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.s3tc.ctex", "res://.godot/imported/glove_normal.png-da82759e655cb7106cb0172b7076b948.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://addons/godot-xr-tools/hands/textures/glove_normal.png" process/fix_alpha_border=true process/premult_alpha=false 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/addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png.import b/addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png.import index bbeecd4..c7df30b 100644 --- a/addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png.import +++ b/addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://b5v1xfnkyjaf6" -path="res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.ctex" +path.s3tc="res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.s3tc.ctex" +path.etc2="res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png" -dest_files=["res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.ctex"] +dest_files=["res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.s3tc.ctex", "res://.godot/imported/glove_occlusionRoughnessMetallic.png-1a61c4638e30c81daa59d92c8681eb2c.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png.import b/addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png.import index 0b73441..4400d8b 100644 --- a/addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png.import +++ b/addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://dy5hyp5n7o6gl" -path="res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.ctex" +path.s3tc="res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.s3tc.ctex" +path.etc2="res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png" -dest_files=["res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.ctex"] +dest_files=["res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.s3tc.ctex", "res://.godot/imported/hands_occlusionRoughnessMetallic.png-73229fc54301aa8833117ebde8abfd4e.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/hands/textures/labglove_baseColor.png.import b/addons/godot-xr-tools/hands/textures/labglove_baseColor.png.import index ed0d7a1..1bf3b7e 100644 --- a/addons/godot-xr-tools/hands/textures/labglove_baseColor.png.import +++ b/addons/godot-xr-tools/hands/textures/labglove_baseColor.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://cxwjhfe1yvm65" -path="res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.ctex" +path.s3tc="res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.s3tc.ctex" +path.etc2="res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/hands/textures/labglove_baseColor.png" -dest_files=["res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.ctex"] +dest_files=["res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.s3tc.ctex", "res://.godot/imported/labglove_baseColor.png-2eb9fa4d9955a5755a96f0663ee3ceb2.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/images/ring.png.import b/addons/godot-xr-tools/images/ring.png.import index ca9dc1e..301b20e 100644 --- a/addons/godot-xr-tools/images/ring.png.import +++ b/addons/godot-xr-tools/images/ring.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://ciimvkgy0mee0" -path="res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.ctex" +path.s3tc="res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.s3tc.ctex" +path.etc2="res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/images/ring.png" -dest_files=["res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.ctex"] +dest_files=["res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.s3tc.ctex", "res://.godot/imported/ring.png-34d9c9e9780f2732148a5b14fcac48dd.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/images/teleport_arrow.png.import b/addons/godot-xr-tools/images/teleport_arrow.png.import index b529cfc..0862ba6 100644 --- a/addons/godot-xr-tools/images/teleport_arrow.png.import +++ b/addons/godot-xr-tools/images/teleport_arrow.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://bbfwq7mhqgwjm" -path="res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.ctex" +path.s3tc="res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.s3tc.ctex" +path.etc2="res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/images/teleport_arrow.png" -dest_files=["res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.ctex"] +dest_files=["res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.s3tc.ctex", "res://.godot/imported/teleport_arrow.png-f1bd44b6f478277692b3fa29171b62d3.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/addons/godot-xr-tools/images/teleport_target.png.import b/addons/godot-xr-tools/images/teleport_target.png.import index d12d2e9..6a4f980 100644 --- a/addons/godot-xr-tools/images/teleport_target.png.import +++ b/addons/godot-xr-tools/images/teleport_target.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://cygfooytyfhyd" -path="res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.ctex" +path.s3tc="res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.s3tc.ctex" +path.etc2="res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://addons/godot-xr-tools/images/teleport_target.png" -dest_files=["res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.ctex"] +dest_files=["res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.s3tc.ctex", "res://.godot/imported/teleport_target.png-cd812f7d5692711ac91f6c8a4753ad73.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/assets/materials/swich_on.png.import b/assets/materials/swich_on.png.import index cfe6914..163dbea 100644 --- a/assets/materials/swich_on.png.import +++ b/assets/materials/swich_on.png.import @@ -3,25 +3,27 @@ importer="texture" type="CompressedTexture2D" uid="uid://br3p0c2foputg" -path="res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.ctex" +path.s3tc="res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.s3tc.ctex" +path.etc2="res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/materials/swich_on.png" -dest_files=["res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.ctex"] +dest_files=["res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.s3tc.ctex", "res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +33,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/content/entities/light/light.tscn b/content/entities/light/light.tscn index fc62b80..2c0a129 100644 --- a/content/entities/light/light.tscn +++ b/content/entities/light/light.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=15 format=3 uid="uid://cw86rc42dv2d8"] [ext_resource type="Script" path="res://content/entities/light/light.gd" id="1_ykxy3"] -[ext_resource type="Texture2D" uid="uid://b72vsbcvqqxg7" path="res://assets/materials/swich_on.png" id="2_6gn2e"] -[ext_resource type="Texture2D" uid="uid://cvc0o6dsktnvl" path="res://assets/materials/switch_off.png" id="3_qlm62"] +[ext_resource type="Texture2D" uid="uid://br3p0c2foputg" path="res://assets/materials/swich_on.png" id="2_6gn2e"] +[ext_resource type="Texture2D" uid="uid://co2ishj2hx57p" path="res://assets/materials/switch_off.png" id="3_qlm62"] [ext_resource type="Script" path="res://content/functions/movable.gd" id="4_4sfxb"] [ext_resource type="Material" uid="uid://vce66e7sbc3n" path="res://content/entities/light/light_on.tres" id="5_50gph"] diff --git a/content/entities/media_player/media_player.tscn b/content/entities/media_player/media_player.tscn index a3683e9..c587e08 100644 --- a/content/entities/media_player/media_player.tscn +++ b/content/entities/media_player/media_player.tscn @@ -5,13 +5,13 @@ [ext_resource type="Script" path="res://content/functions/movable.gd" id="3_bguto"] [sub_resource type="BoxShape3D" id="BoxShape3D_vi3eg"] -size = Vector3(0.23, 0.07, 0.01) +size = Vector3(0.23, 0.142768, 0.01) -[node name="MediaPlayer" type="StaticBody3D"] +[node name="MediaPlayer" type="StaticBody3D" groups=["entity"]] script = ExtResource("1_ame17") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -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.0364514, -0.01) shape = SubResource("BoxShape3D_vi3eg") [node name="Previous" parent="." instance=ExtResource("1_8opk3")] diff --git a/content/ui/components/button/button.gd b/content/ui/components/button/button.gd index a16b3a5..e6b9adb 100644 --- a/content/ui/components/button/button.gd +++ b/content/ui/components/button/button.gd @@ -13,15 +13,12 @@ const IconFont = preload("res://assets/icons/icons.tres") @export var label: String = "": set(value): label = value - if label_node == null: - return + if !is_node_ready(): await ready label_node.text = value @export var icon: bool = false: set(value): icon = value - - if label_node == null: - return + if !is_node_ready(): await ready if value: label_node.font = IconFont @@ -50,9 +47,6 @@ var active: bool = false : @onready var animation_player: AnimationPlayer = $AnimationPlayer func _ready(): - label = label - icon = icon - if initial_active: active = true diff --git a/content/ui/components/input/input.gd b/content/ui/components/input/input.gd index 2230348..1265a2f 100644 --- a/content/ui/components/input/input.gd +++ b/content/ui/components/input/input.gd @@ -13,11 +13,9 @@ var text_handler = preload("res://content/ui/components/input/text_handler.gd"). get: return text_handler.width set(value): - width = value text_handler.width = value - if mesh_box == null: - return + if !is_node_ready(): await ready mesh_box.mesh.size.x = value collision.shape.size.x = value @@ -27,10 +25,9 @@ var text_handler = preload("res://content/ui/components/input/text_handler.gd"). get: return text_handler.text set(value): - text = value var focused = Engine.is_editor_hint() == false && EventSystem.is_focused(self) == false - if label == null: - return + + if !is_node_ready(): await ready text_handler.set_text(value, focused) label.text = text_handler.get_display_text() @@ -41,8 +38,6 @@ var input_plane = Plane(Vector3.UP, Vector3.ZERO) func _ready(): text_handler.label = label - width = width - text = text if Engine.is_editor_hint(): return