diff --git a/Counter.tscn b/Counter.tscn index 1f51b25..6b08195 100644 --- a/Counter.tscn +++ b/Counter.tscn @@ -6,7 +6,7 @@ [sub_resource type="BoxMesh" id="BoxMesh_i5j2u"] -[sub_resource type="SphereShape3D" id="SphereShape3D_vlqg6"] +[sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] [node name="Counter" type="StaticBody3D" unique_id=1487893288] @@ -20,14 +20,14 @@ mesh = SubResource("BoxMesh_i5j2u") transform = Transform3D(0.9999992, 0, 0, 0, 0.99999946, 0, 0, 0, 0.9999992, 0.002797456, 0.6309581, -0.2812457) text = "Counter" -[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=186065581] +[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1647380272] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) -collision_layer = 0 +collision_layer = 65536 collision_mask = 65536 script = ExtResource("1_dlkho") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=1196349092] +[node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=969340130] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_vlqg6") +shape = SubResource("SphereShape3D_dlkho") diff --git a/Textures/dev_material_3d.tres b/Textures/dev_material_3d.tres index c7758b5..1c71701 100644 --- a/Textures/dev_material_3d.tres +++ b/Textures/dev_material_3d.tres @@ -10,4 +10,6 @@ uv1_triplanar = true [resource] next_pass = SubResource("StandardMaterial3D_0gbf8") -albedo_color = Color(0.16497248, 0.49238974, 0.43831292, 1) +metallic = 1.0 +metallic_specular = 0.0 +roughness = 0.0 diff --git a/Textures/sky/DaySkyHDRI055B.png b/Textures/sky/DaySkyHDRI055B.png deleted file mode 100644 index a9caa9c..0000000 Binary files a/Textures/sky/DaySkyHDRI055B.png and /dev/null differ diff --git a/Textures/sky/DaySkyHDRI055B.png.import b/Textures/sky/DaySkyHDRI055B.png.import deleted file mode 100644 index d43e62d..0000000 --- a/Textures/sky/DaySkyHDRI055B.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bkybj43vsb8a8" -path="res://.godot/imported/DaySkyHDRI055B.png-c08c948c1cd92f9f6279c40d25a56f13.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Textures/sky/DaySkyHDRI055B.png" -dest_files=["res://.godot/imported/DaySkyHDRI055B.png-c08c948c1cd92f9f6279c40d25a56f13.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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 diff --git a/Textures/sky/DaySkyHDRI055B_16K.tres b/Textures/sky/DaySkyHDRI055B_16K.tres deleted file mode 100644 index 3fddff1..0000000 --- a/Textures/sky/DaySkyHDRI055B_16K.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="Sky" load_steps=3 format=3 uid="uid://acg_omgsazfy"] -[ext_resource type="Texture2D" uid="uid://acg_o5ei9d13" path="./DaySkyHDRI055B_16K_HDR.exr" id="acg_2cd05t89"] -[sub_resource type="PanoramaSkyMaterial" id="acg_y6m9krn2"] -panorama = ExtResource("acg_2cd05t89") -[resource] -sky_material = SubResource("acg_y6m9krn2") diff --git a/Textures/sky/DaySkyHDRI055B_16K_HDR.exr b/Textures/sky/DaySkyHDRI055B_16K_HDR.exr deleted file mode 100644 index f2bf138..0000000 Binary files a/Textures/sky/DaySkyHDRI055B_16K_HDR.exr and /dev/null differ diff --git a/Textures/sky/DaySkyHDRI055B_16K_HDR.exr.import b/Textures/sky/DaySkyHDRI055B_16K_HDR.exr.import deleted file mode 100644 index 7cf4bd9..0000000 --- a/Textures/sky/DaySkyHDRI055B_16K_HDR.exr.import +++ /dev/null @@ -1,41 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c6gfr7v6da0ku" -path.bptc="res://.godot/imported/DaySkyHDRI055B_16K_HDR.exr-a051741763bd70c547bfd0969bdc0ec5.bptc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://Textures/sky/DaySkyHDRI055B_16K_HDR.exr" -dest_files=["res://.godot/imported/DaySkyHDRI055B_16K_HDR.exr-a051741763bd70c547bfd0969bdc0ec5.bptc.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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 diff --git a/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg b/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg deleted file mode 100644 index 8919564..0000000 Binary files a/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg and /dev/null differ diff --git a/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg.import b/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg.import deleted file mode 100644 index 6062472..0000000 --- a/Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg.import +++ /dev/null @@ -1,41 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bd6c12infl67q" -path.s3tc="res://.godot/imported/DaySkyHDRI055B_16K_TONEMAPPED.jpg-650d4fd5fe07348b21db82dbb2b39a11.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://Textures/sky/DaySkyHDRI055B_16K_TONEMAPPED.jpg" -dest_files=["res://.godot/imported/DaySkyHDRI055B_16K_TONEMAPPED.jpg-650d4fd5fe07348b21db82dbb2b39a11.s3tc.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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 diff --git a/main.tscn b/main.tscn index a40ff20..6331e03 100644 --- a/main.tscn +++ b/main.tscn @@ -19,6 +19,7 @@ size = Vector3(5, 0.1, 5) background_mode = 2 sky = ExtResource("6_7mycd") reflected_light_source = 2 +tonemap_mode = 3 ssr_enabled = true ssao_enabled = true ssil_enabled = true @@ -56,3 +57,10 @@ transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6 [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] environment = SubResource("Environment_bvwq1") + +[node name="OmniLight3D" type="OmniLight3D" parent="." unique_id=812168256] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2856425, 1.4939771, -1.4959787) +visible = false +light_color = Color(1, 0.38431373, 0, 1) +light_energy = 1.784 +shadow_enabled = true diff --git a/project.godot b/project.godot index 22756f2..2262e43 100644 --- a/project.godot +++ b/project.godot @@ -55,7 +55,6 @@ import/blender/enabled=false [rendering] rendering_device/driver.windows="d3d12" -renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" [xr]