diff --git a/godot/lighting/foggy_morning.tres b/godot/lighting/foggy_morning.tres index c54c9c9..db66d63 100644 --- a/godot/lighting/foggy_morning.tres +++ b/godot/lighting/foggy_morning.tres @@ -1,9 +1,13 @@ -[gd_resource type="Environment" load_steps=3 format=3 uid="uid://c1vy5rxxddw78"] +[gd_resource type="Environment" load_steps=4 format=3 uid="uid://c1vy5rxxddw78"] + +[ext_resource type="Texture2D" uid="uid://cj7e22a3a6rnu" path="res://sky.jpg" id="1_56ix7"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_c8r8t"] -sky_top_color = Color(0.409629, 0.541103, 0.724026, 1) -sky_horizon_color = Color(0.622766, 0.681378, 0.717237, 1) -sky_curve = 0.26573 +sky_top_color = Color(0.249958, 0.286179, 0.336575, 1) +sky_horizon_color = Color(0.411904, 0.529696, 0.614089, 1) +sky_curve = 0.0557027 +sky_cover = ExtResource("1_56ix7") +sky_cover_modulate = Color(0.470588, 0.470588, 0.470588, 0.705882) ground_bottom_color = Color(0.289552, 0.273114, 0.264743, 1) ground_horizon_color = Color(0.167356, 0.099874, 0.0462569, 1) @@ -16,7 +20,12 @@ sky = SubResource("Sky_v6osu") ambient_light_sky_contribution = 0.67 ambient_light_energy = 0.5 reflected_light_source = 2 +fog_enabled = true fog_mode = 1 -fog_density = 0.835 +fog_light_color = Color(0.183737, 0.200005, 0.225569, 1) +fog_density = 0.2424 +fog_sky_affect = 0.509 +fog_depth_begin = 3.0 +fog_depth_end = 50.0 volumetric_fog_density = 0.1044 volumetric_fog_albedo = Color(0.75118, 0.640533, 0.588017, 1) diff --git a/godot/lighting/section_2.exr b/godot/lighting/section_2.exr index d4f1bcb..38847d4 100644 Binary files a/godot/lighting/section_2.exr and b/godot/lighting/section_2.exr differ diff --git a/godot/lighting/section_2.lmbake b/godot/lighting/section_2.lmbake index 71ed6ed..a2810ab 100644 Binary files a/godot/lighting/section_2.lmbake and b/godot/lighting/section_2.lmbake differ diff --git a/godot/objects/enemy.tscn b/godot/objects/enemy.tscn index 593b1f0..b96842a 100644 --- a/godot/objects/enemy.tscn +++ b/godot/objects/enemy.tscn @@ -14,9 +14,84 @@ collision_layer = 6 [node name="CharacterModel" parent="." instance=ExtResource("1_i7aop")] unique_name_in_owner = true +[node name="Skeleton3D" parent="CharacterModel/skeleton_character" index="0"] +bones/0/rotation = Quaternion(1.12928e-22, 1, 2.98023e-08, -1.94707e-07) +bones/1/position = Vector3(3.1225e-17, 0.826102, -2.26306e-09) +bones/1/rotation = Quaternion(-0.0189874, -6.30661e-09, -1.08732e-09, 0.99982) +bones/2/rotation = Quaternion(0.0262842, 8.66579e-09, 1.56723e-09, 0.999655) +bones/3/rotation = Quaternion(-0.013812, -0.124595, 8.42949e-05, 0.992112) +bones/4/rotation = Quaternion(0.0100466, -3.89644e-10, 6.78268e-10, 0.99995) +bones/5/rotation = Quaternion(-0.0233085, 0.0669743, -0.00156502, 0.997481) +bones/6/rotation = Quaternion(0.623077, 0.672557, 0.307599, -0.254607) +bones/7/rotation = Quaternion(-0.311931, -0.528262, 0.360764, 0.702487) +bones/8/rotation = Quaternion(0.385362, 0.19105, 0.552644, 0.713849) +bones/9/rotation = Quaternion(0.204715, 0.0914037, 0.275611, 0.93476) +bones/10/rotation = Quaternion(-0.160687, -0.0459478, -0.0475321, 0.984789) +bones/11/rotation = Quaternion(-0.030518, -0.0130498, -0.0216154, 0.999215) +bones/12/rotation = Quaternion(0.0087248, 0.00565774, 0.0013103, 0.999945) +bones/13/rotation = Quaternion(-0.617934, -0.0462445, 0.180663, 0.763793) +bones/14/rotation = Quaternion(-0.23045, 0.0743406, 0.160693, 0.956841) +bones/15/rotation = Quaternion(-0.541263, -0.00752765, 0.238029, 0.806424) +bones/16/rotation = Quaternion(-0.611024, -0.262913, 0.402215, 0.629087) +bones/17/rotation = Quaternion(0.0158022, 0.0368156, 0.177499, 0.983305) +bones/18/rotation = Quaternion(-0.115784, 0.0786986, 0.503797, 0.852402) +bones/19/rotation = Quaternion(-0.77808, 0.139756, 0.0140334, 0.612261) +bones/20/rotation = Quaternion(-0.0923591, 0.0238578, 0.0736642, 0.992711) +bones/21/rotation = Quaternion(-0.193467, 0.101022, 0.0447897, 0.974864) +bones/22/rotation = Quaternion(-0.293695, -0.10649, 0.259809, 0.91373) +bones/23/rotation = Quaternion(-0.0310475, -0.0162325, -0.00151601, 0.999385) +bones/24/rotation = Quaternion(0.140362, -0.0289769, -0.195164, 0.970242) +bones/25/rotation = Quaternion(0.585184, -0.476496, -0.473244, -0.454479) +bones/26/rotation = Quaternion(-0.449756, 0.301541, -0.311322, 0.780943) +bones/27/rotation = Quaternion(-0.122233, -0.135947, -0.565028, 0.804562) +bones/28/rotation = Quaternion(0.155388, -0.432411, -0.521703, 0.71882) +bones/29/rotation = Quaternion(-0.0486368, 0.0590466, -0.0759536, 0.994173) +bones/30/rotation = Quaternion(-0.0305179, 0.0130499, 0.0216153, 0.999215) +bones/31/rotation = Quaternion(-0.518356, -0.00412336, -0.00408935, 0.855145) +bones/32/rotation = Quaternion(-0.290993, 0.0788459, 0.0248015, 0.953148) +bones/33/rotation = Quaternion(-0.419789, -0.067382, -0.039477, 0.904256) +bones/34/rotation = Quaternion(-0.266884, 0.00530696, 0.000658852, 0.963714) +bones/35/rotation = Quaternion(-0.422483, 0.214372, -0.00100308, 0.880654) +bones/36/rotation = Quaternion(-0.345783, -0.0439312, -0.261553, 0.900052) +bones/37/rotation = Quaternion(-0.0107009, 0.0076969, 0.00365465, 0.999906) +bones/38/rotation = Quaternion(-0.389883, 0.108139, -0.120461, 0.906525) +bones/39/rotation = Quaternion(-0.399909, -0.0921328, -0.130163, 0.902575) +bones/40/rotation = Quaternion(-0.0125688, 0.0114118, 0.00134583, 0.999855) +bones/41/rotation = Quaternion(-0.0497163, 0.0839878, -0.166226, 0.981246) +bones/42/rotation = Quaternion(-0.0310475, 0.0162325, 0.00151601, 0.999385) +bones/43/rotation = Quaternion(-0.00109124, -0.0104143, 0.0283538, 0.999543) +bones/44/position = Vector3(0.16719, 0.195796, -0.0454406) +bones/44/rotation = Quaternion(-0.610992, 0.0971646, 0.14821, 0.771545) +bones/45/rotation = Quaternion(-0.82326, 4.1804e-09, -1.03579e-07, 0.567665) +bones/46/position = Vector3(8.07956e-09, 0.0363644, 0.0392254) +bones/46/rotation = Quaternion(-0.00112372, -6.23921e-08, 6.44731e-09, 0.999999) +bones/48/rotation = Quaternion(0.706312, -2.55434e-08, 6.24918e-08, 0.707901) +bones/49/position = Vector3(0.0228929, -0.0282939, -0.00824324) +bones/49/rotation = Quaternion(-0.112129, 0.585203, -0.155744, 0.78785) +bones/50/position = Vector3(-0.0246244, 0.246628, -0.0197923) +bones/50/rotation = Quaternion(0.31578, 0.920316, 0.115311, -0.200014) +bones/51/position = Vector3(0.0902225, 0.042579, 0.00142519) +bones/51/rotation = Quaternion(0.997309, -0.00549226, 0.0715033, -0.0152251) +bones/52/rotation = Quaternion(-0.00225666, 0.00306653, -0.000453776, 0.999993) +bones/53/rotation = Quaternion(0.665461, 0.000165138, -0.00238783, 0.746429) +bones/54/position = Vector3(-0.0902225, 0.042579, 0.00142518) +bones/54/rotation = Quaternion(0.997309, 0.00549227, -0.0715033, -0.0152251) +bones/55/rotation = Quaternion(-0.00225666, -0.0030665, 0.000453778, 0.999993) +bones/56/rotation = Quaternion(0.665461, -0.000165001, 0.00238774, 0.746429) +bones/57/position = Vector3(3.64125e-07, 0.0462301, -0.935059) +bones/58/rotation = Quaternion(-2.99921e-13, 0.707107, 0.707107, -2.99921e-13) +bones/59/rotation = Quaternion(2.01446e-13, 0.707107, 0.707107, 2.01446e-13) +bones/60/rotation = Quaternion(-0.707107, 1.25097e-07, 1.25097e-07, 0.707107) +bones/61/rotation = Quaternion(-0.707107, 1.25097e-07, 1.25097e-07, 0.707107) +bones/62/rotation = Quaternion(-0.707107, 1.5189e-07, 1.5189e-07, 0.707107) +bones/63/rotation = Quaternion(-0.707107, 1.5189e-07, 1.5189e-07, 0.707107) + [node name="mesh_helmet_a" parent="CharacterModel/skeleton_character/Skeleton3D" index="1"] visible = false +[node name="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"] +transform = Transform3D(-0.937186, 0.347435, 0.0311762, 0.0973187, 0.17459, 0.97982, 0.33498, 0.921308, -0.197435, -0.16719, 1.02003, 0.0528419) + [node name="AnimationTree" parent="CharacterModel" index="2"] parameters/Actions/Run/Speed/blend_amount = 0.0 "parameters/Actions/Walk [turn]/Speed/blend_amount" = 0.0 diff --git a/godot/objects/player.tscn b/godot/objects/player.tscn index 752d400..adcefa1 100644 --- a/godot/objects/player.tscn +++ b/godot/objects/player.tscn @@ -91,6 +91,9 @@ bones/63/rotation = Quaternion(-0.707107, 1.5189e-07, 1.5189e-07, 0.707107) [node name="mesh_helmet_a_001" parent="CharacterModel/skeleton_character/Skeleton3D" index="2"] visible = false +[node name="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"] +transform = Transform3D(-0.937186, 0.347435, 0.0311762, 0.0973187, 0.17459, 0.97982, 0.33498, 0.921308, -0.197435, -0.16719, 1.02003, 0.0528419) + [node name="HitscanMuzzle" parent="CharacterModel/skeleton_character/Skeleton3D/BoneAttachment3D" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00234e-08, 0.0436091, 0.0479187) diff --git a/godot/objects/section_2.tscn b/godot/objects/section_2.tscn index b1176f0..5308914 100644 --- a/godot/objects/section_2.tscn +++ b/godot/objects/section_2.tscn @@ -28,7 +28,7 @@ environment = ExtResource("1_5ixfb") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.205165, -0.649364, 0.73228, 0.0262249, 0.744279, 0.667353, -0.978376, 0.156122, -0.13567, -1.48634, 3.22867, -2.51018) -light_color = Color(0.95484, 0.837153, 0.722321, 1) +light_color = Color(0.928606, 0.900146, 0.850977, 1) shadow_enabled = true shadow_bias = 0.01 shadow_blur = 0.895 diff --git a/godot/sky.jpg b/godot/sky.jpg new file mode 100644 index 0000000..fd7bde6 --- /dev/null +++ b/godot/sky.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a9e5cadc0fd70a683a9062fd7279b42e6b9684be51ae7573b6b3c523e13ae0 +size 24685 diff --git a/godot/sky.jpg.import b/godot/sky.jpg.import new file mode 100644 index 0000000..1f62237 --- /dev/null +++ b/godot/sky.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cj7e22a3a6rnu" +path.s3tc="res://.godot/imported/sky.jpg-4edd319b4718930c5cb6979fecb9a4f3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://sky.jpg" +dest_files=["res://.godot/imported/sky.jpg-4edd319b4718930c5cb6979fecb9a4f3.s3tc.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=false +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/models/textures/attribution.txt b/models/textures/attribution.txt index 1cc0bc3..3c1fac7 100644 --- a/models/textures/attribution.txt +++ b/models/textures/attribution.txt @@ -3,3 +3,5 @@ rotten_planks : https://www.hongkiat.com/blog/28-high-resolution-wood-textures-f lee_enfield : https://galeri.uludagsozluk.com/r/arap-lawrence-in-kulland%C4%B1%C4%9F%C4%B1-t%C3%BCfek-1772961/ soil : https://wallpaperscraft.com/download/texture_soil_sand_dirt_dark_50620/1920x1080 + +sky : https://cg-source.com/images/3071-01/3071-01_sky_thumb.jpg diff --git a/models/textures/sky.jpg b/models/textures/sky.jpg new file mode 100644 index 0000000..fd7bde6 --- /dev/null +++ b/models/textures/sky.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a9e5cadc0fd70a683a9062fd7279b42e6b9684be51ae7573b6b3c523e13ae0 +size 24685