diff --git a/assets/textures/marble/marble_albedo.jpg.import b/assets/textures/marble/marble_albedo.jpg.import index 01130ef..bc7ca16 100644 --- a/assets/textures/marble/marble_albedo.jpg.import +++ b/assets/textures/marble/marble_albedo.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://8dp5yxgnqaqv" path.s3tc="res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex" +path.etc2="res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_albedo.jpg" -dest_files=["res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex", "res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.etc2.ctex"] [params] diff --git a/assets/textures/marble/marble_normal.jpg.import b/assets/textures/marble/marble_normal.jpg.import index 2e79a70..3eb7fa0 100644 --- a/assets/textures/marble/marble_normal.jpg.import +++ b/assets/textures/marble/marble_normal.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://60dl3bvlmlx" path.s3tc="res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex" +path.etc2="res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_normal.jpg" -dest_files=["res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex", "res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.etc2.ctex"] [params] diff --git a/assets/textures/marble/marble_oughness.jpg.import b/assets/textures/marble/marble_oughness.jpg.import index 5860382..8aa3f51 100644 --- a/assets/textures/marble/marble_oughness.jpg.import +++ b/assets/textures/marble/marble_oughness.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcwf8u32r3bwe" path.s3tc="res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex" +path.etc2="res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_oughness.jpg" -dest_files=["res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex", "res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.etc2.ctex"] [params] diff --git a/assets/textures/wood.jpg.import b/assets/textures/wood.jpg.import index 14ddb53..de52cfd 100644 --- a/assets/textures/wood.jpg.import +++ b/assets/textures/wood.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://7jjt3qf5qe5" path.s3tc="res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex" +path.etc2="res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/wood.jpg" -dest_files=["res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex"] +dest_files=["res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex", "res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.etc2.ctex"] [params] diff --git a/export_presets.cfg b/export_presets.cfg index 66becb4..dffa323 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -35,8 +35,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="1.6.1.20240225" -application/product_version="1.6.1.20240225" +application/file_version="1.6.1.20240817" +application/product_version="1.6.1.20240817" application/company_name="Mechanical Flower" application/product_name="Marble" application/file_description="" diff --git a/project.godot b/project.godot index 0c2f6b1..052151d 100644 --- a/project.godot +++ b/project.godot @@ -40,7 +40,7 @@ source/commit="41b766d42997fc9af1af4cb8680329bf02d0833f" [custom_options] -build_info/commit="17ae082e22d615b1f42ac1a9594707345437c931" +build_info/commit="f6ac6f48bcfb91ff85e6d23baeea918e00b66f44" build_info/date="2024/08/17" [display] @@ -89,6 +89,7 @@ common/enable_pause_aware_picking=true [rendering] occlusion_culling/bvh_build_quality=1 +textures/vram_compression/import_etc2_astc=true camera/depth_of_field/depth_of_field_bokeh_shape=0 environment/ssao/quality=0 environment/ssil/quality=0 diff --git a/scenes/marble.tscn b/scenes/marble.tscn index 215bdb5..2f45693 100644 --- a/scenes/marble.tscn +++ b/scenes/marble.tscn @@ -18,8 +18,8 @@ radius = 0.3 [node name="Marble" type="RigidBody3D" groups=["marbles"]] collision_layer = 4 -max_contacts_reported = 10000 contact_monitor = true +max_contacts_reported = 10000 script = ExtResource("1") [node name="Ball" type="MeshInstance3D" parent="."]