diff --git a/Main.tscn b/Main.tscn index 3dc084b..d5adba1 100644 --- a/Main.tscn +++ b/Main.tscn @@ -3,14 +3,18 @@ [ext_resource type="PackedScene" uid="uid://c8ei5ikik30wn" path="res://landscape/Grid/grid_white.tscn" id="2_cm0pq"] [ext_resource type="AudioStream" uid="uid://dhc8mgjhhhpsy" path="res://Materials/tron_01.ogg" id="4_cm0pq"] [ext_resource type="PackedScene" uid="uid://c3efk6k8xnf57" path="res://Player/Player.tscn" id="5_03owx"] +[ext_resource type="PackedScene" uid="uid://db05x4f444mr2" path="res://models/tower_01/Tower_01.glb" id="5_fos0i"] [ext_resource type="PackedScene" uid="uid://dr2udwp3pu8g1" path="res://models/house_02/house_02-col.glb" id="6_lgr22"] [sub_resource type="Environment" id="Environment_bcw3a"] background_energy_multiplier = 1.2 -ambient_light_color = Color(0.94369775, 0.9436977, 0.94369763, 1) -ambient_light_energy = 1.2 +ambient_light_color = Color(0.17462614, 0.17462593, 0.17462596, 1) +ambient_light_energy = 2.82 +glow_enabled = true +glow_blend_mode = 0 +glow_hdr_threshold = 0.8 fog_enabled = true -fog_light_color = Color(0.3038171, 0.39836776, 0.42985135, 1) +fog_light_color = Color(0.30408522, 0.40256965, 0.43408683, 1) fog_light_energy = 0.1 fog_sun_scatter = 0.07 fog_density = 0.005 @@ -34,3 +38,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.4852746, 1.449548, 2.387526 [node name="house_02-col" parent="." unique_id=1283879441 instance=ExtResource("6_lgr22")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5781927, -0.54343367, 12.694141) metadata/_edit_lock_ = true + +[node name="Tower_01" parent="." unique_id=272196463 instance=ExtResource("5_fos0i")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 41.396, 0, 0) diff --git a/landscape/Grid/grid_white.tscn b/landscape/Grid/grid_white.tscn index 77b5345..8429090 100644 --- a/landscape/Grid/grid_white.tscn +++ b/landscape/Grid/grid_white.tscn @@ -41,7 +41,7 @@ albedo_texture = ExtResource("1_c7m2f") metallic = 0.22 roughness = 0.37 emission_enabled = true -emission_energy_multiplier = 2.45 +emission_energy_multiplier = 5.0 emission_texture = ExtResource("1_c7m2f") uv1_scale = Vector3(10, 10, 10) diff --git a/landscape/citrus_orchard_road_puresky_2k.hdr b/landscape/citrus_orchard_road_puresky_2k.hdr deleted file mode 100644 index 7df8e21..0000000 Binary files a/landscape/citrus_orchard_road_puresky_2k.hdr and /dev/null differ diff --git a/landscape/citrus_orchard_road_puresky_2k.hdr.import b/landscape/citrus_orchard_road_puresky_2k.hdr.import deleted file mode 100644 index d8c5c8f..0000000 --- a/landscape/citrus_orchard_road_puresky_2k.hdr.import +++ /dev/null @@ -1,41 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bbjv5hawxe2oy" -path.bptc="res://.godot/imported/citrus_orchard_road_puresky_2k.hdr-fa6286c7d13caecafc402f7c480d9128.bptc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://landscape/citrus_orchard_road_puresky_2k.hdr" -dest_files=["res://.godot/imported/citrus_orchard_road_puresky_2k.hdr-fa6286c7d13caecafc402f7c480d9128.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/landscape/qwantani_sunset_puresky_2k.exr b/landscape/qwantani_sunset_puresky_2k.exr deleted file mode 100644 index 71b54bc..0000000 Binary files a/landscape/qwantani_sunset_puresky_2k.exr and /dev/null differ diff --git a/landscape/qwantani_sunset_puresky_2k.exr.import b/landscape/qwantani_sunset_puresky_2k.exr.import deleted file mode 100644 index 3197e8e..0000000 --- a/landscape/qwantani_sunset_puresky_2k.exr.import +++ /dev/null @@ -1,41 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://doi0qks44xqti" -path.bptc="res://.godot/imported/qwantani_sunset_puresky_2k.exr-8a23884e8ef0c97f450d5c5d5d27207c.bptc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://landscape/qwantani_sunset_puresky_2k.exr" -dest_files=["res://.godot/imported/qwantani_sunset_puresky_2k.exr-8a23884e8ef0c97f450d5c5d5d27207c.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/landscape/qwantani_sunset_puresky_2k.hdr b/landscape/qwantani_sunset_puresky_2k.hdr deleted file mode 100644 index c19a47d..0000000 Binary files a/landscape/qwantani_sunset_puresky_2k.hdr and /dev/null differ diff --git a/landscape/qwantani_sunset_puresky_2k.hdr.import b/landscape/qwantani_sunset_puresky_2k.hdr.import deleted file mode 100644 index 90c15ca..0000000 --- a/landscape/qwantani_sunset_puresky_2k.hdr.import +++ /dev/null @@ -1,41 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cvd2qhpf3eyf0" -path.bptc="res://.godot/imported/qwantani_sunset_puresky_2k.hdr-fa10ea87c94b6e37960ef2d73cec46f6.bptc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://landscape/qwantani_sunset_puresky_2k.hdr" -dest_files=["res://.godot/imported/qwantani_sunset_puresky_2k.hdr-fa10ea87c94b6e37960ef2d73cec46f6.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/models/house_01/house_01-col.glb b/models/house_01/house_01-col.glb deleted file mode 100644 index 478be0a..0000000 Binary files a/models/house_01/house_01-col.glb and /dev/null differ diff --git a/models/house_01/house_01-col_бревно.webp b/models/house_01/house_01-col_бревно.webp deleted file mode 100644 index b808dbe..0000000 Binary files a/models/house_01/house_01-col_бревно.webp and /dev/null differ diff --git a/models/house_01/house_01-col_бревно.webp.import b/models/house_01/house_01-col_бревно.webp.import deleted file mode 100644 index 3fd41d7..0000000 --- a/models/house_01/house_01-col_бревно.webp.import +++ /dev/null @@ -1,44 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bneejpr43spr0" -path.s3tc="res://.godot/imported/house_01-col_бревно.webp-0b63ea218a5569b49a738296c2c81524.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} -generator_parameters={ -"md5": "0404fc78a37a73b82a32d7e096573c1d" -} - -[deps] - -source_file="res://models/house_01/house_01-col_бревно.webp" -dest_files=["res://.godot/imported/house_01-col_бревно.webp-0b63ea218a5569b49a738296c2c81524.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/models/house_01/house_01-col_булыжник.jpg b/models/house_01/house_01-col_булыжник.jpg deleted file mode 100644 index 6078142..0000000 Binary files a/models/house_01/house_01-col_булыжник.jpg and /dev/null differ diff --git a/models/house_01/house_01-col_булыжник.jpg.import b/models/house_01/house_01-col_булыжник.jpg.import deleted file mode 100644 index 3849c6a..0000000 --- a/models/house_01/house_01-col_булыжник.jpg.import +++ /dev/null @@ -1,44 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cw8fcobxd2sa8" -path.s3tc="res://.godot/imported/house_01-col_булыжник.jpg-48859f1a9154998d92734542322d6b67.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} -generator_parameters={ -"md5": "af0846b9aad4c40eeab5f735a92a1129" -} - -[deps] - -source_file="res://models/house_01/house_01-col_булыжник.jpg" -dest_files=["res://.godot/imported/house_01-col_булыжник.jpg-48859f1a9154998d92734542322d6b67.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/models/house_01/house_01-col_доски.png b/models/house_01/house_01-col_доски.png deleted file mode 100644 index 13e8f42..0000000 Binary files a/models/house_01/house_01-col_доски.png and /dev/null differ diff --git a/models/house_01/house_01-col_доски.png.import b/models/house_01/house_01-col_доски.png.import deleted file mode 100644 index 0de1a75..0000000 --- a/models/house_01/house_01-col_доски.png.import +++ /dev/null @@ -1,44 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bos05wa7q0fi7" -path.s3tc="res://.godot/imported/house_01-col_доски.png-c5a95266b0eea0064fc24c7014300341.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} -generator_parameters={ -"md5": "50c5a5ae6740cb2b091e5a15318d913b" -} - -[deps] - -source_file="res://models/house_01/house_01-col_доски.png" -dest_files=["res://.godot/imported/house_01-col_доски.png-c5a95266b0eea0064fc24c7014300341.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/models/tower_01/Tower_01.glb b/models/tower_01/Tower_01.glb new file mode 100644 index 0000000..c4a89dd Binary files /dev/null and b/models/tower_01/Tower_01.glb differ diff --git a/models/house_01/house_01-col.glb.import b/models/tower_01/Tower_01.glb.import similarity index 73% rename from models/house_01/house_01-col.glb.import rename to models/tower_01/Tower_01.glb.import index 0a0312d..18d0aab 100644 --- a/models/house_01/house_01-col.glb.import +++ b/models/tower_01/Tower_01.glb.import @@ -3,13 +3,13 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dk4rrilhx3wxo" -path="res://.godot/imported/house_01-col.glb-0c2919b47de514fc06875aa49a76deaf.scn" +uid="uid://db05x4f444mr2" +path="res://.godot/imported/Tower_01.glb-724f563bb4f1b3ed4316e8d1441f9c1c.scn" [deps] -source_file="res://models/house_01/house_01-col.glb" -dest_files=["res://.godot/imported/house_01-col.glb-0c2919b47de514fc06875aa49a76deaf.scn"] +source_file="res://models/tower_01/Tower_01.glb" +dest_files=["res://.godot/imported/Tower_01.glb-724f563bb4f1b3ed4316e8d1441f9c1c.scn"] [params] @@ -26,8 +26,8 @@ nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 +meshes/light_baking=2 +meshes/lightmap_texel_size=1.781 meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true diff --git a/models/tower_01/Tower_01.glb.unwrap_cache b/models/tower_01/Tower_01.glb.unwrap_cache new file mode 100644 index 0000000..1f73ab6 Binary files /dev/null and b/models/tower_01/Tower_01.glb.unwrap_cache differ