Merge remote-tracking branch 'origin/test'

.gitignore

@@ -13,3 +13,5 @@ android/
 .venv/
 .vscode
 bin
+override.cfg
+addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll

assets/Materials/Black.tres

@@ -0,0 +1,7 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://cnwftrvvfqkqp"]
+
+[resource]
+resource_name = "Emission"
+albedo_color = Color(0, 0, 0, 1)
+roughness = 0.5
+emission = Color(0.741793, 0.548567, 0.129865, 1)

assets/Materials/Blue Gray.tres

@@ -0,0 +1,7 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://dyqprt5gwngi4"]
+
+[resource]
+resource_name = "Emission"
+albedo_color = Color(0.224536, 0.308107, 0.580711, 1)
+roughness = 0.5
+emission = Color(0.741793, 0.548567, 0.129865, 1)

assets/Materials/Emission Green.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://bro45xdnhcxst"]
+
+[resource]
+resource_name = "Emission"
+cull_mode = 2
+albedo_color = Color(0, 0.835294, 0.447059, 1)
+roughness = 0.5
+emission_enabled = true
+emission = Color(0.156863, 0.929412, 0.407843, 1)

assets/Materials/Silver Grey.tres

@@ -0,0 +1,9 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://6w5en0784o0v"]
+
+[resource]
+resource_name = "Emission"
+albedo_color = Color(0.839924, 0.818519, 0.793853, 1)
+metallic = 0.66
+metallic_specular = 0.38
+roughness = 0.5
+emission = Color(0.741793, 0.548567, 0.129865, 1)

assets/Models/Arm End.glb.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bjpm8xt3axvmi"
+path="res://.godot/imported/Arm End.glb-f0a6f245e10e6c36489303379e2ec397.scn"
+
+[deps]
+
+source_file="res://assets/Models/Arm End.glb"
+dest_files=["res://.godot/imported/Arm End.glb-f0a6f245e10e6c36489303379e2ec397.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

assets/Models/Arm End_Metal061A_1K-JPG_Color.jpg.import

@@ -0,0 +1,39 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bbqxeducdalmw"
+path.s3tc="res://.godot/imported/Arm End_Metal061A_1K-JPG_Color.jpg-8bec34f12931a0352a8ad3da93dcd2df.s3tc.ctex"
+path.etc2="res://.godot/imported/Arm End_Metal061A_1K-JPG_Color.jpg-8bec34f12931a0352a8ad3da93dcd2df.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "f8d3069a6110ae8a4501aee7c9285a69"
+}
+
+[deps]
+
+source_file="res://assets/Models/Arm End_Metal061A_1K-JPG_Color.jpg"
+dest_files=["res://.godot/imported/Arm End_Metal061A_1K-JPG_Color.jpg-8bec34f12931a0352a8ad3da93dcd2df.s3tc.ctex", "res://.godot/imported/Arm End_Metal061A_1K-JPG_Color.jpg-8bec34f12931a0352a8ad3da93dcd2df.etc2.ctex"]
+
+[params]
+
+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=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+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=0

assets/Models/Arm.glb.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://da1x5taouke7c"
+path="res://.godot/imported/Arm.glb-4881265180c082ef8185d4361e0d579c.scn"
+
+[deps]
+
+source_file="res://assets/Models/Arm.glb"
+dest_files=["res://.godot/imported/Arm.glb-4881265180c082ef8185d4361e0d579c.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

assets/Models/Arm_Metal061A_1K-JPG_Color.jpg.import

@@ -0,0 +1,39 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c84c51kp4yx6b"
+path.s3tc="res://.godot/imported/Arm_Metal061A_1K-JPG_Color.jpg-e105d40777f0425b1a796c81363fee5c.s3tc.ctex"
+path.etc2="res://.godot/imported/Arm_Metal061A_1K-JPG_Color.jpg-e105d40777f0425b1a796c81363fee5c.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "f8d3069a6110ae8a4501aee7c9285a69"
+}
+
+[deps]
+
+source_file="res://assets/Models/Arm_Metal061A_1K-JPG_Color.jpg"
+dest_files=["res://.godot/imported/Arm_Metal061A_1K-JPG_Color.jpg-e105d40777f0425b1a796c81363fee5c.s3tc.ctex", "res://.godot/imported/Arm_Metal061A_1K-JPG_Color.jpg-e105d40777f0425b1a796c81363fee5c.etc2.ctex"]
+
+[params]
+
+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=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+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=0

assets/Models/Door.glb.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://b5bxxscp4i2l6"
+path="res://.godot/imported/Door.glb-2f102e9d82d5303e3976db8a860a0178.scn"
+
+[deps]
+
+source_file="res://assets/Models/Door.glb"
+dest_files=["res://.godot/imported/Door.glb-2f102e9d82d5303e3976db8a860a0178.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

assets/Models/Table.glb.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cimd7p5gfuicp"
+path="res://.godot/imported/Table.glb-6b8570842c93ac915e180d8cf51fca34.scn"
+
+[deps]
+
+source_file="res://assets/Models/Table.glb"
+dest_files=["res://.godot/imported/Table.glb-6b8570842c93ac915e180d8cf51fca34.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

assets/Models/Table_Plastic013A_1K-JPG_Color.jpg.import

@@ -0,0 +1,39 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://8h6elgpac6j1"
+path.s3tc="res://.godot/imported/Table_Plastic013A_1K-JPG_Color.jpg-4811202676817ec059861e812cf4b4ba.s3tc.ctex"
+path.etc2="res://.godot/imported/Table_Plastic013A_1K-JPG_Color.jpg-4811202676817ec059861e812cf4b4ba.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "c18682b106d8757654ca2f653244dc68"
+}
+
+[deps]
+
+source_file="res://assets/Models/Table_Plastic013A_1K-JPG_Color.jpg"
+dest_files=["res://.godot/imported/Table_Plastic013A_1K-JPG_Color.jpg-4811202676817ec059861e812cf4b4ba.s3tc.ctex", "res://.godot/imported/Table_Plastic013A_1K-JPG_Color.jpg-4811202676817ec059861e812cf4b4ba.etc2.ctex"]
+
+[params]
+
+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=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+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=0

assets/Models/Table_Porcelain003_1K-JPG_Color.jpg.import

@@ -0,0 +1,39 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d4e0uph0gd1aq"
+path.s3tc="res://.godot/imported/Table_Porcelain003_1K-JPG_Color.jpg-f8aa90953a70a9fa6138d1416d97b710.s3tc.ctex"
+path.etc2="res://.godot/imported/Table_Porcelain003_1K-JPG_Color.jpg-f8aa90953a70a9fa6138d1416d97b710.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "1e0a67f177182d5f06b942194512ed96"
+}
+
+[deps]
+
+source_file="res://assets/Models/Table_Porcelain003_1K-JPG_Color.jpg"
+dest_files=["res://.godot/imported/Table_Porcelain003_1K-JPG_Color.jpg-f8aa90953a70a9fa6138d1416d97b710.s3tc.ctex", "res://.godot/imported/Table_Porcelain003_1K-JPG_Color.jpg-f8aa90953a70a9fa6138d1416d97b710.etc2.ctex"]
+
+[params]
+
+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=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+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=0

assets/Models/Table_Porcelain003_1K-JPG_NormalGL.jpg.import

@@ -0,0 +1,39 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dq1wb1tvmd6a2"
+path.s3tc="res://.godot/imported/Table_Porcelain003_1K-JPG_NormalGL.jpg-d7b76b40a23b89993c535aafcc983637.s3tc.ctex"
+path.etc2="res://.godot/imported/Table_Porcelain003_1K-JPG_NormalGL.jpg-d7b76b40a23b89993c535aafcc983637.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "b71f63705063d9e61ef2c7bad8fc58a4"
+}
+
+[deps]
+
+source_file="res://assets/Models/Table_Porcelain003_1K-JPG_NormalGL.jpg"
+dest_files=["res://.godot/imported/Table_Porcelain003_1K-JPG_NormalGL.jpg-d7b76b40a23b89993c535aafcc983637.s3tc.ctex", "res://.godot/imported/Table_Porcelain003_1K-JPG_NormalGL.jpg-d7b76b40a23b89993c535aafcc983637.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://assets/Models/Table_Porcelain003_1K-JPG_NormalGL.jpg"
+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=0

assets/arm.tscn

@@ -0,0 +1,44 @@
+[gd_scene load_steps=7 format=3 uid="uid://c5fqi1imv6y3k"]
+
+[ext_resource type="PackedScene" uid="uid://da1x5taouke7c" path="res://assets/Models/Arm.glb" id="1_3tf7j"]
+[ext_resource type="Material" uid="uid://bdefowx357g78" path="res://assets/Materials/Dark Gray.tres" id="2_rhbyi"]
+[ext_resource type="Material" uid="uid://6w5en0784o0v" path="res://assets/Materials/Silver Grey.tres" id="3_264p4"]
+[ext_resource type="PackedScene" uid="uid://bjpm8xt3axvmi" path="res://assets/Models/Arm End.glb" id="4_xh8m5"]
+[ext_resource type="Material" uid="uid://c3waeqeii0krh" path="res://assets/Materials/Glass.001.tres" id="5_3uqos"]
+[ext_resource type="Material" uid="uid://ci8s6gnyvf7s8" path="res://assets/Materials/Emission.tres" id="6_mojj4"]
+
+[node name="Arm" instance=ExtResource("1_3tf7j")]
+
+[node name="Arm Base" parent="." index="0"]
+transform = Transform3D(1.14559, 0, 0, 0, -1.14559, 4.46108e-07, 0, -4.46108e-07, -1.14559, 0, 0, 0)
+surface_material_override/0 = ExtResource("2_rhbyi")
+surface_material_override/1 = ExtResource("3_264p4")
+surface_material_override/2 = ExtResource("2_rhbyi")
+
+[node name="Arm J1" parent="Arm Base" index="0"]
+surface_material_override/0 = ExtResource("2_rhbyi")
+surface_material_override/1 = ExtResource("3_264p4")
+
+[node name="Arm J2" parent="Arm Base/Arm J1" index="0"]
+surface_material_override/0 = ExtResource("2_rhbyi")
+surface_material_override/1 = ExtResource("3_264p4")
+
+[node name="Arm End2" parent="Arm Base/Arm J1/Arm J2" index="0" instance=ExtResource("4_xh8m5")]
+transform = Transform3D(-0.872914, -3.39925e-07, -1.32372e-13, -3.39925e-07, 0.872914, 3.39925e-07, -9.77914e-21, 3.39925e-07, -0.872914, -0.366903, 1.33943, -0.00649305)
+
+[node name="Arm End" parent="Arm Base/Arm J1/Arm J2/Arm End2" index="0"]
+surface_material_override/0 = ExtResource("2_rhbyi")
+surface_material_override/1 = ExtResource("3_264p4")
+surface_material_override/2 = ExtResource("5_3uqos")
+
+[node name="Star" parent="Arm Base/Arm J1/Arm J2/Arm End2/Arm End" index="0"]
+transform = Transform3D(1, -1.94152e-13, 4.13264e-07, 1.94152e-13, 1, 2.71839e-13, -4.13264e-07, -2.71839e-13, 1, 0, 0, 0)
+surface_material_override/0 = ExtResource("6_mojj4")
+
+[node name="Star_001" parent="Arm Base/Arm J1/Arm J2/Arm End2/Arm End" index="1"]
+surface_material_override/0 = ExtResource("6_mojj4")
+
+[node name="Star_002" parent="Arm Base/Arm J1/Arm J2/Arm End2/Arm End" index="2"]
+surface_material_override/0 = ExtResource("6_mojj4")
+
+[editable path="Arm Base/Arm J1/Arm J2/Arm End2"]

assets/door.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=7 format=3 uid="uid://drupxpigi5gir"]
+
+[ext_resource type="PackedScene" uid="uid://b5bxxscp4i2l6" path="res://assets/Models/Door.glb" id="1_g5a8x"]
+[ext_resource type="Material" uid="uid://cnwftrvvfqkqp" path="res://assets/Materials/Black.tres" id="2_nwt2g"]
+[ext_resource type="Material" uid="uid://6w5en0784o0v" path="res://assets/Materials/Silver Grey.tres" id="3_4r2pm"]
+[ext_resource type="Material" uid="uid://dyqprt5gwngi4" path="res://assets/Materials/Blue Gray.tres" id="4_qqh0a"]
+[ext_resource type="Material" uid="uid://cqoutm8rt5ai2" path="res://assets/Materials/Emission Red.tres" id="5_rgw6y"]
+[ext_resource type="Material" uid="uid://bro45xdnhcxst" path="res://assets/Materials/Emission Green.tres" id="6_vj42a"]
+
+[node name="Door2" instance=ExtResource("1_g5a8x")]
+
+[node name="Door" parent="." index="0"]
+surface_material_override/0 = ExtResource("2_nwt2g")
+surface_material_override/1 = ExtResource("3_4r2pm")
+surface_material_override/2 = ExtResource("4_qqh0a")
+surface_material_override/3 = ExtResource("5_rgw6y")
+surface_material_override/4 = ExtResource("6_vj42a")

override.cfg

@@ -1,3 +0,0 @@
-[xr]
-
-openxr/enabled=true