diff --git a/LICENSE.md b/LICENSE.md index e64fe96..63d4d4a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Kenney +Copyright (c) 2025 Kenney Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 93d9a10..4678ef1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This includes a basic scene and environment set-up for a pleasing and bright res MIT License -Copyright (c) 2024 Kenney +Copyright (c) 2025 Kenney Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -20,4 +20,4 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Assets included in this package (2D sprites, 3D models and sound effects) are [CC0 licensed](https://creativecommons.org/publicdomain/zero/1.0/) +Assets included in this package (2D sprites, 3D models and sound effects) are [CC0 licensed](https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file diff --git a/project.godot b/project.godot index b2570be..5fb7c51 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Starter Kit Basic Scene" config/tags=PackedStringArray("starterkit") run/main_scene="res://scenes/main.tscn" -config/features=PackedStringArray("4.3", "Forward Plus") +config/features=PackedStringArray("4.5", "Forward Plus") boot_splash/bg_color=Color(0.92549, 0.92549, 0.960784, 1) boot_splash/image="res://splash-screen.png" config/icon="res://icon.png" diff --git a/sample/Mini Arena/License.txt b/sample/Mini Arena/License.txt index 22e5f96..2341dc4 100644 --- a/sample/Mini Arena/License.txt +++ b/sample/Mini Arena/License.txt @@ -26,4 +26,4 @@ • Twitter: twitter.com/KenneyNL • Instagram: instagram.com/kenney_nl - • Mastodon: mastodon.gamedev.place/@kenney \ No newline at end of file + • Mastodon: mastodon.gamedev.place/@kenney diff --git a/sample/Mini Arena/Models/GLB format/Textures/colormap.png b/sample/Mini Arena/Models/GLB format/Textures/colormap.png index 06a680f..a939659 100644 Binary files a/sample/Mini Arena/Models/GLB format/Textures/colormap.png and b/sample/Mini Arena/Models/GLB format/Textures/colormap.png differ diff --git a/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import b/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import index 8e7e32e..080565e 100644 --- a/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import +++ b/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://oae7stnemsm" +uid="uid://baixwudg5xon8" path="res://.godot/imported/colormap.png-31b00553903a3328299ec0f15983bf9f.ctex" metadata={ "vram_texture": false @@ -15,16 +15,22 @@ dest_files=["res://.godot/imported/colormap.png-31b00553903a3328299ec0f15983bf9f [params] -compress/mode=1 +compress/mode=0 compress/high_quality=true 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/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 diff --git a/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import~RF8ea903a4.TMP b/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import~RF8ea903a4.TMP new file mode 100644 index 0000000..8e7e32e --- /dev/null +++ b/sample/Mini Arena/Models/GLB format/Textures/colormap.png.import~RF8ea903a4.TMP @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://oae7stnemsm" +path="res://.godot/imported/colormap.png-31b00553903a3328299ec0f15983bf9f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sample/Mini Arena/Models/GLB format/Textures/colormap.png" +dest_files=["res://.godot/imported/colormap.png-31b00553903a3328299ec0f15983bf9f.ctex"] + +[params] + +compress/mode=1 +compress/high_quality=true +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 diff --git a/sample/Mini Arena/Models/GLB format/banner.glb b/sample/Mini Arena/Models/GLB format/banner.glb index 91a9078..83c8a03 100644 Binary files a/sample/Mini Arena/Models/GLB format/banner.glb and b/sample/Mini Arena/Models/GLB format/banner.glb differ diff --git a/sample/Mini Arena/Models/GLB format/banner.glb.import b/sample/Mini Arena/Models/GLB format/banner.glb.import index fbff7ba..049d51f 100644 --- a/sample/Mini Arena/Models/GLB format/banner.glb.import +++ b/sample/Mini Arena/Models/GLB format/banner.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/banner.glb-3ddda78a0b6fd9a1f4e0a792f50eb3bc.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/block.glb b/sample/Mini Arena/Models/GLB format/block.glb index d8ecdb3..5a71c78 100644 Binary files a/sample/Mini Arena/Models/GLB format/block.glb and b/sample/Mini Arena/Models/GLB format/block.glb differ diff --git a/sample/Mini Arena/Models/GLB format/block.glb.import b/sample/Mini Arena/Models/GLB format/block.glb.import index 7647a46..abb74b5 100644 --- a/sample/Mini Arena/Models/GLB format/block.glb.import +++ b/sample/Mini Arena/Models/GLB format/block.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/block.glb-7233c98f847a0f11202c7cf6857478dc.sc nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/border-corner.glb b/sample/Mini Arena/Models/GLB format/border-corner.glb index a37cc91..a4f0b94 100644 Binary files a/sample/Mini Arena/Models/GLB format/border-corner.glb and b/sample/Mini Arena/Models/GLB format/border-corner.glb differ diff --git a/sample/Mini Arena/Models/GLB format/border-corner.glb.import b/sample/Mini Arena/Models/GLB format/border-corner.glb.import index f5af803..aa233c5 100644 --- a/sample/Mini Arena/Models/GLB format/border-corner.glb.import +++ b/sample/Mini Arena/Models/GLB format/border-corner.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/border-corner.glb-1176d6f2b852d110507992b0685 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/border-straight.glb b/sample/Mini Arena/Models/GLB format/border-straight.glb index 12fb217..d7c9241 100644 Binary files a/sample/Mini Arena/Models/GLB format/border-straight.glb and b/sample/Mini Arena/Models/GLB format/border-straight.glb differ diff --git a/sample/Mini Arena/Models/GLB format/border-straight.glb.import b/sample/Mini Arena/Models/GLB format/border-straight.glb.import index e465f02..b7d5799 100644 --- a/sample/Mini Arena/Models/GLB format/border-straight.glb.import +++ b/sample/Mini Arena/Models/GLB format/border-straight.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/border-straight.glb-dbaa4d9a0a89a8ccfd7804d45 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/bricks.glb b/sample/Mini Arena/Models/GLB format/bricks.glb index 8f76871..6856c2e 100644 Binary files a/sample/Mini Arena/Models/GLB format/bricks.glb and b/sample/Mini Arena/Models/GLB format/bricks.glb differ diff --git a/sample/Mini Arena/Models/GLB format/bricks.glb.import b/sample/Mini Arena/Models/GLB format/bricks.glb.import index b0db2a2..d0cb6ca 100644 --- a/sample/Mini Arena/Models/GLB format/bricks.glb.import +++ b/sample/Mini Arena/Models/GLB format/bricks.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/bricks.glb-b90bcbf6332c905d1383f385b6027b1a.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/character-soldier.glb b/sample/Mini Arena/Models/GLB format/character-soldier.glb index c6e8476..577db1a 100644 Binary files a/sample/Mini Arena/Models/GLB format/character-soldier.glb and b/sample/Mini Arena/Models/GLB format/character-soldier.glb differ diff --git a/sample/Mini Arena/Models/GLB format/character-soldier.glb.import b/sample/Mini Arena/Models/GLB format/character-soldier.glb.import index bd4299c..1663ed7 100644 --- a/sample/Mini Arena/Models/GLB format/character-soldier.glb.import +++ b/sample/Mini Arena/Models/GLB format/character-soldier.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/character-soldier.glb-1f7143842fccc16f28d278c nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/colormap.tres b/sample/Mini Arena/Models/GLB format/colormap.tres new file mode 100644 index 0000000..c990e19 --- /dev/null +++ b/sample/Mini Arena/Models/GLB format/colormap.tres @@ -0,0 +1,7 @@ +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://b26esyetp45oo"] + +[ext_resource type="Texture2D" uid="uid://baixwudg5xon8" path="res://sample/Mini Arena/Models/GLB format/Textures/colormap.png" id="1_rvrw5"] + +[resource] +resource_name = "colormap" +albedo_texture = ExtResource("1_rvrw5") diff --git a/sample/Mini Arena/Models/GLB format/column-damaged.glb b/sample/Mini Arena/Models/GLB format/column-damaged.glb index c0c65f6..8069736 100644 Binary files a/sample/Mini Arena/Models/GLB format/column-damaged.glb and b/sample/Mini Arena/Models/GLB format/column-damaged.glb differ diff --git a/sample/Mini Arena/Models/GLB format/column-damaged.glb.import b/sample/Mini Arena/Models/GLB format/column-damaged.glb.import index 97b4359..9673e46 100644 --- a/sample/Mini Arena/Models/GLB format/column-damaged.glb.import +++ b/sample/Mini Arena/Models/GLB format/column-damaged.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/column-damaged.glb-5e5da893d782fbbe7c7d3612bc nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/column.glb b/sample/Mini Arena/Models/GLB format/column.glb index 1a880e3..35994ba 100644 Binary files a/sample/Mini Arena/Models/GLB format/column.glb and b/sample/Mini Arena/Models/GLB format/column.glb differ diff --git a/sample/Mini Arena/Models/GLB format/column.glb.import b/sample/Mini Arena/Models/GLB format/column.glb.import index 4000651..58788d0 100644 --- a/sample/Mini Arena/Models/GLB format/column.glb.import +++ b/sample/Mini Arena/Models/GLB format/column.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/column.glb-c956725922efb49ac9375527293d06e4.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/floor-detail.glb b/sample/Mini Arena/Models/GLB format/floor-detail.glb index a82d1f6..9073c83 100644 Binary files a/sample/Mini Arena/Models/GLB format/floor-detail.glb and b/sample/Mini Arena/Models/GLB format/floor-detail.glb differ diff --git a/sample/Mini Arena/Models/GLB format/floor-detail.glb.import b/sample/Mini Arena/Models/GLB format/floor-detail.glb.import index 0ad48b3..efaa46b 100644 --- a/sample/Mini Arena/Models/GLB format/floor-detail.glb.import +++ b/sample/Mini Arena/Models/GLB format/floor-detail.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/floor-detail.glb-251c50208637e46c23d10bf7f2e9 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/floor.glb b/sample/Mini Arena/Models/GLB format/floor.glb index 5a5ce57..2a5987d 100644 Binary files a/sample/Mini Arena/Models/GLB format/floor.glb and b/sample/Mini Arena/Models/GLB format/floor.glb differ diff --git a/sample/Mini Arena/Models/GLB format/floor.glb.import b/sample/Mini Arena/Models/GLB format/floor.glb.import index aa4df8a..995994d 100644 --- a/sample/Mini Arena/Models/GLB format/floor.glb.import +++ b/sample/Mini Arena/Models/GLB format/floor.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/floor.glb-e7245680af5efa9412253e11cd009eba.sc nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb b/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb index f118d6c..bdac35b 100644 Binary files a/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb and b/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb differ diff --git a/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb.import b/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb.import index c64491f..0496dd6 100644 --- a/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb.import +++ b/sample/Mini Arena/Models/GLB format/stairs-corner-inner.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/stairs-corner-inner.glb-ac0ef996f5fbea2b1d001 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/stairs-corner.glb b/sample/Mini Arena/Models/GLB format/stairs-corner.glb index 71d8c08..b83aeab 100644 Binary files a/sample/Mini Arena/Models/GLB format/stairs-corner.glb and b/sample/Mini Arena/Models/GLB format/stairs-corner.glb differ diff --git a/sample/Mini Arena/Models/GLB format/stairs-corner.glb.import b/sample/Mini Arena/Models/GLB format/stairs-corner.glb.import index 6d5d0ad..2b34266 100644 --- a/sample/Mini Arena/Models/GLB format/stairs-corner.glb.import +++ b/sample/Mini Arena/Models/GLB format/stairs-corner.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/stairs-corner.glb-73ede80e4408446ad00c238127c nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/stairs.glb b/sample/Mini Arena/Models/GLB format/stairs.glb index 2556a93..6e9298e 100644 Binary files a/sample/Mini Arena/Models/GLB format/stairs.glb and b/sample/Mini Arena/Models/GLB format/stairs.glb differ diff --git a/sample/Mini Arena/Models/GLB format/stairs.glb.import b/sample/Mini Arena/Models/GLB format/stairs.glb.import index 2929d86..32dce75 100644 --- a/sample/Mini Arena/Models/GLB format/stairs.glb.import +++ b/sample/Mini Arena/Models/GLB format/stairs.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/stairs.glb-b836a3647b3ff273d03da9ac14d4cc58.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/statue.glb b/sample/Mini Arena/Models/GLB format/statue.glb index b47d735..595bad8 100644 Binary files a/sample/Mini Arena/Models/GLB format/statue.glb and b/sample/Mini Arena/Models/GLB format/statue.glb differ diff --git a/sample/Mini Arena/Models/GLB format/statue.glb.import b/sample/Mini Arena/Models/GLB format/statue.glb.import index 557d2d9..6e32058 100644 --- a/sample/Mini Arena/Models/GLB format/statue.glb.import +++ b/sample/Mini Arena/Models/GLB format/statue.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/statue.glb-7b25102e38c6873c893fc6f5caacf011.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/tree.glb b/sample/Mini Arena/Models/GLB format/tree.glb index 46d3aff..46dec81 100644 Binary files a/sample/Mini Arena/Models/GLB format/tree.glb and b/sample/Mini Arena/Models/GLB format/tree.glb differ diff --git a/sample/Mini Arena/Models/GLB format/tree.glb.import b/sample/Mini Arena/Models/GLB format/tree.glb.import index b218af2..b3c587f 100644 --- a/sample/Mini Arena/Models/GLB format/tree.glb.import +++ b/sample/Mini Arena/Models/GLB format/tree.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/tree.glb-61e7eade82b1315ecd925ca7e94fe2de.scn nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,17 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/fallback_path": "res://sample/Mini Arena/Models/GLB format/colormap.tres", +"use_external/path": "uid://b26esyetp45oo" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/trophy.glb b/sample/Mini Arena/Models/GLB format/trophy.glb index ca23350..a08bb27 100644 Binary files a/sample/Mini Arena/Models/GLB format/trophy.glb and b/sample/Mini Arena/Models/GLB format/trophy.glb differ diff --git a/sample/Mini Arena/Models/GLB format/trophy.glb.import b/sample/Mini Arena/Models/GLB format/trophy.glb.import index e3a2ae9..33a7f5a 100644 --- a/sample/Mini Arena/Models/GLB format/trophy.glb.import +++ b/sample/Mini Arena/Models/GLB format/trophy.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/trophy.glb-572ca120ae84430440365f2d690a3773.s nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/wall-corner.glb b/sample/Mini Arena/Models/GLB format/wall-corner.glb index 48ec635..10b9c1b 100644 Binary files a/sample/Mini Arena/Models/GLB format/wall-corner.glb and b/sample/Mini Arena/Models/GLB format/wall-corner.glb differ diff --git a/sample/Mini Arena/Models/GLB format/wall-corner.glb.import b/sample/Mini Arena/Models/GLB format/wall-corner.glb.import index 1e43a2e..ae56938 100644 --- a/sample/Mini Arena/Models/GLB format/wall-corner.glb.import +++ b/sample/Mini Arena/Models/GLB format/wall-corner.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/wall-corner.glb-e887c9dbc5a97d5f9f1d6187f56cd nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/wall-gate.glb b/sample/Mini Arena/Models/GLB format/wall-gate.glb index 50c38d3..aa6ea72 100644 Binary files a/sample/Mini Arena/Models/GLB format/wall-gate.glb and b/sample/Mini Arena/Models/GLB format/wall-gate.glb differ diff --git a/sample/Mini Arena/Models/GLB format/wall-gate.glb.import b/sample/Mini Arena/Models/GLB format/wall-gate.glb.import index 145c559..9008ebf 100644 --- a/sample/Mini Arena/Models/GLB format/wall-gate.glb.import +++ b/sample/Mini Arena/Models/GLB format/wall-gate.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/wall-gate.glb-76f25aadbbd273421c0d1aeff6e1720 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/wall.glb b/sample/Mini Arena/Models/GLB format/wall.glb index 9dfd848..c204eae 100644 Binary files a/sample/Mini Arena/Models/GLB format/wall.glb and b/sample/Mini Arena/Models/GLB format/wall.glb differ diff --git a/sample/Mini Arena/Models/GLB format/wall.glb.import b/sample/Mini Arena/Models/GLB format/wall.glb.import index 5270533..6b8c163 100644 --- a/sample/Mini Arena/Models/GLB format/wall.glb.import +++ b/sample/Mini Arena/Models/GLB format/wall.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/wall.glb-dbf7347d57f923987112f5fa91bca360.scn nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/weapon-rack.glb b/sample/Mini Arena/Models/GLB format/weapon-rack.glb index e1af5e6..961742f 100644 Binary files a/sample/Mini Arena/Models/GLB format/weapon-rack.glb and b/sample/Mini Arena/Models/GLB format/weapon-rack.glb differ diff --git a/sample/Mini Arena/Models/GLB format/weapon-rack.glb.import b/sample/Mini Arena/Models/GLB format/weapon-rack.glb.import index dc3c8be..645b8db 100644 --- a/sample/Mini Arena/Models/GLB format/weapon-rack.glb.import +++ b/sample/Mini Arena/Models/GLB format/weapon-rack.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/weapon-rack.glb-c6596bd2b7b32ad025ce4926812b9 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/weapon-spear.glb b/sample/Mini Arena/Models/GLB format/weapon-spear.glb index 9a4b4c1..c9f0990 100644 Binary files a/sample/Mini Arena/Models/GLB format/weapon-spear.glb and b/sample/Mini Arena/Models/GLB format/weapon-spear.glb differ diff --git a/sample/Mini Arena/Models/GLB format/weapon-spear.glb.import b/sample/Mini Arena/Models/GLB format/weapon-spear.glb.import index 70cc611..e0f12d8 100644 --- a/sample/Mini Arena/Models/GLB format/weapon-spear.glb.import +++ b/sample/Mini Arena/Models/GLB format/weapon-spear.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/weapon-spear.glb-f6470bec4642541df374c33f7dc4 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/sample/Mini Arena/Models/GLB format/weapon-sword.glb b/sample/Mini Arena/Models/GLB format/weapon-sword.glb index 0825a24..88a4075 100644 Binary files a/sample/Mini Arena/Models/GLB format/weapon-sword.glb and b/sample/Mini Arena/Models/GLB format/weapon-sword.glb differ diff --git a/sample/Mini Arena/Models/GLB format/weapon-sword.glb.import b/sample/Mini Arena/Models/GLB format/weapon-sword.glb.import index 25e5e07..32286a8 100644 --- a/sample/Mini Arena/Models/GLB format/weapon-sword.glb.import +++ b/sample/Mini Arena/Models/GLB format/weapon-sword.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/weapon-sword.glb-7f5f6c4fa282f36ee517a372ea71 nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=1 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/scenes/main-environment.tres b/scenes/main-environment.tres index 70bcfdf..ae54070 100644 --- a/scenes/main-environment.tres +++ b/scenes/main-environment.tres @@ -11,10 +11,10 @@ sky_material = SubResource("ProceduralSkyMaterial_lg8b7") [resource] background_mode = 1 -background_color = Color(0.752941, 0.776471, 0.827451, 1) +background_color = Color(0.6623997, 0.6923149, 0.7573566, 1) sky = SubResource("Sky_7bk1c") ambient_light_source = 2 -ambient_light_color = Color(0.662745, 0.694118, 0.772549, 1) +ambient_light_color = Color(0.49509078, 0.48156148, 0.564907, 1) ambient_light_energy = 1.15 tonemap_mode = 2 ssao_enabled = true @@ -25,3 +25,4 @@ glow_levels/2 = 0.6 glow_levels/3 = 0.6 glow_levels/5 = 0.0 glow_intensity = 2.0 +adjustment_enabled = true diff --git a/scenes/main.tscn b/scenes/main.tscn index b793d2b..1173a67 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -9,11 +9,14 @@ [node name="Main" type="Node3D"] +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = ExtResource("1_x8oc8") + [node name="Floor" type="CSGBox3D" parent="."] -size = Vector3(100, 0, 100) +size = Vector3(100, 0.001, 100) [node name="View" type="Node3D" parent="."] -transform = Transform3D(0.866025, -0.286788, 0.409576, 0, 0.819152, 0.573576, -0.5, -0.496732, 0.709406, 0, 0, 0) +transform = Transform3D(0.86602503, -0.21130913, 0.4531536, 0, 0.90630776, 0.42261803, -0.4999998, -0.36599815, 0.78488505, 0, 0.45, 0) [node name="Camera" type="Camera3D" parent="View"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6) @@ -21,9 +24,9 @@ environment = ExtResource("1_x8oc8") fov = 40.0 [node name="Sun" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.642788, -0.586824, 0.492404, 0, 0.642788, 0.766044, -0.766045, 0.492404, -0.413176, 0, 0, 0) +transform = Transform3D(-0.7660449, -0.492404, 0.41317585, 0, 0.6427878, 0.76604426, -0.642788, 0.5868242, -0.49240378, 0, 0, 0) shadow_enabled = true -shadow_blur = 0.5 +shadow_opacity = 0.95 [node name="Sample" type="Node3D" parent="."] diff --git a/screenshots/screenshot.png b/screenshots/screenshot.png index 1c3144d..cb5fc77 100644 Binary files a/screenshots/screenshot.png and b/screenshots/screenshot.png differ