diff --git a/godot/boot.tscn b/godot/boot.tscn index de79a00..2d8c11a 100644 --- a/godot/boot.tscn +++ b/godot/boot.tscn @@ -12,7 +12,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.321304, 0.548716, -10.4406) [node name="Enemy2" parent="." instance=ExtResource("3_ppe0x")] -transform = Transform3D(0.47095, 0, -0.88216, 0, 1, 0, 0.88216, 0, 0.47095, 8.63104, 0.487608, -15.5861) +transform = Transform3D(0.139795, 0, -0.990181, 0, 1, 0, 0.990181, 0, 0.139795, 8.69408, 0.536154, -15.4052) [node name="Player" parent="." instance=ExtResource("1_7kr4i")] -transform = Transform3D(0.0816776, 0, 0.996659, 0, 1, 0, -0.996659, 0, 0.0816776, -2.58966, 1.45175, -2.77265) +transform = Transform3D(0.0816776, 0, 0.996659, 0, 1, 0, -0.996659, 0, 0.0816776, -2.58966, 0.891191, -2.77265) diff --git a/godot/lighting/section_2.exr b/godot/lighting/section_2.exr index b501ae0..abb1de6 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 e950497..53777f0 100644 Binary files a/godot/lighting/section_2.lmbake and b/godot/lighting/section_2.lmbake differ diff --git a/godot/models/animations/Stab.res b/godot/models/animations/Stab.res index e996d13..3912588 100644 Binary files a/godot/models/animations/Stab.res and b/godot/models/animations/Stab.res differ diff --git a/godot/models/animations/character_tree.tres b/godot/models/animations/character_tree.tres index 21eb451..550a46f 100644 --- a/godot/models/animations/character_tree.tres +++ b/godot/models/animations/character_tree.tres @@ -193,7 +193,7 @@ advance_mode = 2 advance_expression = "!get_is_running()" [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_g5qf0"] -xfade_time = 0.1 +xfade_time = 0.5 advance_mode = 2 advance_expression = "get_stab()" @@ -244,7 +244,7 @@ states/Start/position = Vector2(572.26, 14.954) "states/Walk [turn]/node" = SubResource("AnimationNodeBlendTree_2mbyh") "states/Walk [turn]/position" = Vector2(572.26, 258.767) transitions = ["Aim [aim] [turn]", "Aim Down [aim]", SubResource("AnimationNodeStateMachineTransition_4lybd"), "Aim Down [aim]", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_5aafd"), "Aim [aim] [turn]", "Fire [aim]", SubResource("AnimationNodeStateMachineTransition_8f4gl"), "Fire [aim]", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_xnat3"), "Walk [turn]", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_12bos"), "Aim Down [aim]", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_n0ndr"), "Walk [turn]", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_0wc5e"), "Stationary [turn]", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_4hisb"), "Start", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_bmty6"), "Stationary [turn]", "RESET To Aim", SubResource("AnimationNodeStateMachineTransition_kyd6p"), "RESET To Aim", "Aim [aim] [turn]", SubResource("AnimationNodeStateMachineTransition_w5kob"), "Stationary [turn]", "Run", SubResource("AnimationNodeStateMachineTransition_g0i3x"), "Walk [turn]", "Run", SubResource("AnimationNodeStateMachineTransition_ocffv"), "Run", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_h0my5"), "Run", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_nymcr"), "Run", "Stab", SubResource("AnimationNodeStateMachineTransition_g5qf0"), "Stab", "Run", SubResource("AnimationNodeStateMachineTransition_27kmb"), "Stationary [turn]", "Stab", SubResource("AnimationNodeStateMachineTransition_4q0ot"), "Stab", "Stationary [turn]", SubResource("AnimationNodeStateMachineTransition_h6ujc"), "Walk [turn]", "Stab", SubResource("AnimationNodeStateMachineTransition_3bu8l"), "Stab", "Walk [turn]", SubResource("AnimationNodeStateMachineTransition_cpibo")] -graph_offset = Vector2(-160.578, -16.655) +graph_offset = Vector2(-172.078, -8.655) [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_au62i"] animation = &"Fall_die" @@ -254,7 +254,6 @@ animation = &"Fall_die" [sub_resource type="AnimationNodeTimeSeek" id="AnimationNodeTimeSeek_p56ym"] [resource] -graph_offset = Vector2(-237, 34.5) nodes/Actions/node = SubResource("AnimationNodeStateMachine_7smdg") nodes/Actions/position = Vector2(0, 140) nodes/Death/node = SubResource("AnimationNodeAnimation_au62i") diff --git a/godot/models/character.glb b/godot/models/character.glb index 9269b5e..500ce86 100644 --- a/godot/models/character.glb +++ b/godot/models/character.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4adf953423b4b4ac09eff573bcd826ffb8048d41cdcd8c926843b0949a0505a2 -size 15774076 +oid sha256:e3554003c7ddce3c2ff46409d1d9b1b36da3274559dd5eb1911eb0702ce5b3dd +size 17339728 diff --git a/godot/models/character_british_uniform.png b/godot/models/character_british_uniform.png index d1c51a3..e2b4b62 100644 --- a/godot/models/character_british_uniform.png +++ b/godot/models/character_british_uniform.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d3393b7d44d1da4a81e632dbe73d36e8e1acb496e91024b25372152f30846c8 -size 13276926 +oid sha256:f4402ae95af82888910804ebf9484fc0b509fba46b30bda4bba88aa9000aaa01 +size 13936319 diff --git a/godot/models/character_british_uniform.png.import b/godot/models/character_british_uniform.png.import index e106993..33ce9dc 100644 --- a/godot/models/character_british_uniform.png.import +++ b/godot/models/character_british_uniform.png.import @@ -9,7 +9,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "e27cfed25748c45b5346c4ba92fb0dad" +"md5": "50c3c0b4b4b2e65fd3a1c88242b5fedf" } [deps] diff --git a/godot/models/character_british_uniform_normal.png b/godot/models/character_british_uniform_normal.png new file mode 100644 index 0000000..f9975ea --- /dev/null +++ b/godot/models/character_british_uniform_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6399bd33218a159fb0fb6cf5d9e81e6fc487cd17577295bffcc4062d609bc658 +size 725950 diff --git a/godot/models/character_british_uniform_normal.png.import b/godot/models/character_british_uniform_normal.png.import new file mode 100644 index 0000000..e5f6f25 --- /dev/null +++ b/godot/models/character_british_uniform_normal.png.import @@ -0,0 +1,38 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b26dioascygf5" +path.s3tc="res://.godot/imported/character_british_uniform_normal.png-d14bd857ee3461c02650548bb37908dc.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "d0467ebe79598bc929ee7b657be2020e" +} + +[deps] + +source_file="res://models/character_british_uniform_normal.png" +dest_files=["res://.godot/imported/character_british_uniform_normal.png-d14bd857ee3461c02650548bb37908dc.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://models/character_british_uniform_normal.png" +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/godot/models/materials/Primary.tres b/godot/models/materials/Primary.tres index 1b41f53..18bdc53 100644 --- a/godot/models/materials/Primary.tres +++ b/godot/models/materials/Primary.tres @@ -1,6 +1,7 @@ -[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://c2ic02ndhqkod"] +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://c2ic02ndhqkod"] [ext_resource type="Texture2D" uid="uid://x14a0xbv4vwt" path="res://models/character_british_uniform.png" id="1_k4ift"] +[ext_resource type="Texture2D" uid="uid://b26dioascygf5" path="res://models/character_british_uniform_normal.png" id="2_efm68"] [resource] resource_name = "Primary" @@ -8,6 +9,8 @@ transparency = 4 cull_mode = 2 specular_mode = 1 albedo_texture = ExtResource("1_k4ift") +normal_enabled = true +normal_texture = ExtResource("2_efm68") distance_fade_mode = 2 distance_fade_min_distance = 0.2 distance_fade_max_distance = 0.3 diff --git a/godot/objects/character_model_base.tscn b/godot/objects/character_model_base.tscn index 0653534..bb6c4cd 100644 --- a/godot/objects/character_model_base.tscn +++ b/godot/objects/character_model_base.tscn @@ -117,7 +117,7 @@ collision_mask = 3 [node name="BayonetHitscan" type="HitscanMuzzle" parent="skeleton_character/Skeleton3D/BoneAttachment3D" index="1"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.91257e-05, -0.0191353, -0.00675189) enabled = false -target_position = Vector3(0, 1.685, 0) +target_position = Vector3(0, 2.468, 0) collision_mask = 3 debug_shape_thickness = 3 diff --git a/godot/objects/enemy.tscn b/godot/objects/enemy.tscn index 84f7e41..2728d44 100644 --- a/godot/objects/enemy.tscn +++ b/godot/objects/enemy.tscn @@ -84,6 +84,12 @@ 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="BoneAttachment3D" parent="CharacterModel/skeleton_character/Skeleton3D" index="3"] +transform = Transform3D(-0.999748, -0.00611106, 0.0216074, 0.0216358, -0.00461901, 0.999755, -0.00600976, 0.999971, 0.00475004, -0.156654, 1.50959, 0.292832) + +[node name="AnimationTree" parent="CharacterModel" index="2"] +aim_weapon = true + [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) shape = SubResource("CapsuleShape3D_3tduq") diff --git a/godot/objects/section_2.tscn b/godot/objects/section_2.tscn index 62b6e90..9d9b116 100644 --- a/godot/objects/section_2.tscn +++ b/godot/objects/section_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://dm3355tbkvx24"] +[gd_scene load_steps=15 format=3 uid="uid://dm3355tbkvx24"] [ext_resource type="Environment" uid="uid://c1vy5rxxddw78" path="res://lighting/foggy_morning.tres" id="1_5ixfb"] [ext_resource type="ArrayOccluder3D" uid="uid://br22mqb65v0hg" path="res://occlusion/boot.occ" id="2_07v50"] @@ -16,16 +16,13 @@ [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ikuna"] [sub_resource type="NavigationMesh" id="NavigationMesh_e0njj"] -vertices = PackedVector3Array(8.61543, 0.535281, -18.2397, 9.36543, 0.535281, -18.2397, 9.36543, 0.535281, -19.4897, 8.36543, 0.785281, -19.4897, 7.86543, 3.03528, -18.4897, 10.3654, 3.03528, -18.2397, 10.3654, 3.03528, -18.9897, 7.61543, 3.03528, -19.2397, 9.61543, 1.28528, -16.9897, 8.36543, 1.28528, -17.2397, 8.61543, 1.03528, -16.2397, -0.384566, 1.03528, -2.73967, -1.63457, 1.53528, -2.98967, -1.63457, 1.53528, -1.98967, 1.11543, 1.28528, -2.23967, -0.259566, 1.03528, -2.11467, 0.115434, 1.03528, -3.23967, 0.865434, 1.03528, -13.7397, 0.365434, 1.28528, -14.4897, 0.990434, 0.785281, -7.98967, 13.6154, 0.285281, 3.76033, 12.3654, 0.535281, 3.01033, 11.8654, 0.535281, 3.26033, 10.3654, 0.785281, 3.76033, 11.6154, 0.785281, 2.76033, 9.86543, 0.285281, 2.51033, 8.86543, 0.535281, 2.51033, 15.6154, 0.535281, 5.26033, 15.6154, 0.535281, 4.01033, 8.61543, 0.785281, -13.7397, 7.86543, 1.28528, -14.9897, 7.86543, 1.03528, -14.2397, 1.61543, 1.03528, -14.2397, 1.36543, 1.53528, -14.9897, 8.36543, 0.785281, -2.23967, 9.36543, 0.285281, 1.76033, 9.51928, 0.285281, -9.77813, 9.57697, 1.03528, -14.1051, 10.3654, 3.03528, 5.01033, 10.6154, 3.03528, 4.51033, 9.86543, 3.03528, 4.76033, 11.8654, 3.03528, 6.76033, 11.8654, 3.03528, 5.76033, 6.61543, 3.03528, 4.26033, 8.36543, 3.03528, 4.01033, 6.36543, 3.03528, -6.98967, 7.61543, 3.03528, 3.01033, 7.61543, 3.03528, -7.23967, -4.13457, 2.28528, -1.98967, -2.63457, 2.03528, -1.98967, -2.88457, 2.53528, -3.23967, -4.13457, 2.53528, -3.23967) -polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 7), PackedInt32Array(9, 8, 10), PackedInt32Array(14, 15, 11), PackedInt32Array(11, 15, 13), PackedInt32Array(11, 13, 12), PackedInt32Array(14, 16, 19), PackedInt32Array(19, 16, 17), PackedInt32Array(17, 16, 18), PackedInt32Array(14, 11, 16), PackedInt32Array(20, 22, 21), PackedInt32Array(22, 23, 24), PackedInt32Array(24, 23, 25), PackedInt32Array(25, 23, 26), PackedInt32Array(20, 28, 27), PackedInt32Array(31, 30, 29), PackedInt32Array(29, 30, 10), PackedInt32Array(29, 10, 8), PackedInt32Array(22, 20, 23), PackedInt32Array(23, 20, 27), PackedInt32Array(32, 17, 18), PackedInt32Array(18, 33, 32), PackedInt32Array(32, 33, 31), PackedInt32Array(31, 33, 30), PackedInt32Array(8, 37, 29), PackedInt32Array(29, 37, 36), PackedInt32Array(29, 36, 34), PackedInt32Array(34, 36, 35), PackedInt32Array(34, 35, 26), PackedInt32Array(35, 25, 26), PackedInt32Array(40, 39, 38), PackedInt32Array(38, 42, 41), PackedInt32Array(40, 38, 41), PackedInt32Array(44, 40, 43), PackedInt32Array(43, 40, 41), PackedInt32Array(47, 46, 45), PackedInt32Array(45, 46, 43), PackedInt32Array(46, 44, 43), PackedInt32Array(51, 50, 48), PackedInt32Array(48, 50, 49)] +vertices = PackedVector3Array(8.61544, 0.535281, -18.2397, 9.36544, 0.535281, -18.2397, 9.36544, 0.535281, -19.4897, 8.36544, 0.785281, -19.4897, 10.1154, 3.03528, -18.2397, 10.3654, 3.03528, -18.7397, 10.3654, 3.03528, -19.2397, 7.61544, 3.03528, -19.2397, 7.61544, 3.03528, -18.4897, 0.115438, 1.03528, -3.23967, -0.384562, 0.785281, -2.98967, -0.134562, 1.28528, -1.98967, 1.11544, 1.28528, -2.23967, 8.36544, 0.785281, -2.23967, 8.86544, 0.535281, 2.51033, 9.36544, 0.285281, 1.76033, 9.61544, 1.28528, -17.2397, 8.36544, 1.03528, -13.9897, 9.51929, 0.285281, -9.93197, 9.57698, 1.03528, -14.3166, 13.6154, 0.285281, 3.76033, 12.3654, 0.535281, 3.01033, 11.8654, 0.535281, 3.26033, 10.3654, 0.785281, 3.76033, 11.6154, 0.785281, 2.76033, 9.86544, 0.285281, 2.51033, 15.6154, 0.535281, 5.26033, 15.6154, 0.535281, 4.01033, 8.61544, 1.28528, -17.2397, 7.86544, 1.28528, -14.9897, 0.365438, 1.28528, -14.4897, 0.865438, 1.03528, -13.7397, 1.61544, 1.03528, -14.2397, 0.365438, 1.03528, -5.48967, 0.865438, 0.785281, -3.323, 0.990438, 0.785281, -7.98967, 1.36544, 1.53528, -14.9897, 10.3654, 3.03528, 5.01033, 10.6154, 3.03528, 4.51033, 9.86544, 3.03528, 4.76033, 11.8654, 3.03528, 6.76033, 11.8654, 3.03528, 5.76033, 6.61544, 3.03528, 4.26033, 8.36544, 3.03528, 4.01033, 6.36544, 3.03528, -6.98967, 7.61544, 3.03528, 3.01033, 7.61544, 3.03528, -7.23967, -6.13456, 3.28528, -1.48967, -5.63456, 3.03528, -0.989666, -4.88456, 3.03528, -1.23967, -4.88456, 3.28528, -3.73967, -6.13456, 3.03528, -3.73967, -3.38456, 0.535281, -2.23967, -1.13456, 0.535281, -2.23967, -0.884562, 0.785281, -2.73967, -3.63456, 0.785281, -2.98967) +polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 8), PackedInt32Array(6, 8, 7), PackedInt32Array(10, 9, 11), PackedInt32Array(11, 9, 12), PackedInt32Array(16, 19, 17), PackedInt32Array(17, 19, 18), PackedInt32Array(17, 18, 13), PackedInt32Array(13, 18, 15), PackedInt32Array(13, 15, 14), PackedInt32Array(20, 22, 21), PackedInt32Array(22, 23, 24), PackedInt32Array(24, 23, 25), PackedInt32Array(25, 23, 14), PackedInt32Array(20, 27, 26), PackedInt32Array(28, 16, 29), PackedInt32Array(29, 16, 17), PackedInt32Array(22, 20, 23), PackedInt32Array(23, 20, 26), PackedInt32Array(32, 31, 30), PackedInt32Array(12, 34, 35), PackedInt32Array(35, 34, 33), PackedInt32Array(35, 33, 31), PackedInt32Array(31, 33, 30), PackedInt32Array(30, 36, 32), PackedInt32Array(32, 36, 29), PackedInt32Array(32, 29, 17), PackedInt32Array(15, 25, 14), PackedInt32Array(12, 9, 34), PackedInt32Array(34, 9, 33), PackedInt32Array(39, 38, 37), PackedInt32Array(37, 41, 40), PackedInt32Array(39, 37, 40), PackedInt32Array(43, 39, 42), PackedInt32Array(42, 39, 40), PackedInt32Array(46, 45, 44), PackedInt32Array(44, 45, 42), PackedInt32Array(45, 43, 42), PackedInt32Array(48, 47, 49), PackedInt32Array(49, 47, 51), PackedInt32Array(49, 51, 50), PackedInt32Array(53, 52, 54), PackedInt32Array(54, 52, 55)] sample_partition_type = 1 agent_height = 1.75 agent_radius = 0.25 agent_max_slope = 24.58 -[sub_resource type="QuadOccluder3D" id="QuadOccluder3D_tn23v"] -size = Vector2(20, 10) - [node name="Environment" type="WorldEnvironment"] environment = ExtResource("1_5ixfb") @@ -47,14 +44,16 @@ light_data = ExtResource("3_h3v2c") transform = Transform3D(-0.282662, -0.609093, 0.741018, 0.11918, 0.744235, 0.657198, -0.951787, 0.27408, -0.137775, -1.48634, 3.22867, -2.51018) light_color = Color(0.95484, 0.837153, 0.722321, 1) shadow_enabled = true -shadow_blur = 0.132 +shadow_bias = 0.0 +shadow_blur = 0.895 +directional_shadow_split_1 = 0.317 +directional_shadow_split_2 = 0.408 +directional_shadow_split_3 = 0.646 +directional_shadow_blend_splits = true [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] navigation_mesh = SubResource("NavigationMesh_e0njj") -[node name="dirt_ramp" parent="NavigationRegion3D" instance=ExtResource("3_2vit1")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.88223, 0.502552, -2.51509) - [node name="dirt_ramp2" parent="NavigationRegion3D" instance=ExtResource("3_2vit1")] transform = Transform3D(-1, 0, 8.74228e-08, -1.9032e-08, 0.976016, -0.2177, -8.5326e-08, -0.2177, -0.976016, 8.92731, -0.455602, -11.143) @@ -167,10 +166,10 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.296 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.58818, 0, -13.6769) [node name="trenchfloor2" parent="NavigationRegion3D" instance=ExtResource("8_14rhs")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3.39895, -2.38419e-07, -2.43765) +transform = Transform3D(-4.32117e-08, 0.150778, -0.988568, 6.59071e-09, 0.988568, 0.150778, 1, 0, -4.37114e-08, -3.38752, 1.01918, -2.43765) [node name="trenchfloor3" parent="NavigationRegion3D" instance=ExtResource("8_14rhs")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.39895, -2.38419e-07, -2.43765) +transform = Transform3D(-4.32117e-08, 0.150778, -0.988568, 6.59071e-09, 0.988568, 0.150778, 1, 0, -4.37114e-08, -1.41038, 0.717624, -2.43765) [node name="trenchfloor4" parent="NavigationRegion3D" instance=ExtResource("8_14rhs")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6897, 0.502504, -4.77713) @@ -293,7 +292,7 @@ transform = Transform3D(-0.99452, -0.0848907, 0.0610269, -0.077975, 0.991095, 0. transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.16158, -2.38419e-07, -18.7331) [node name="dirtpile_wall_large" parent="NavigationRegion3D" instance=ExtResource("9_y6ebv")] -transform = Transform3D(-0.984341, 0, 0.176277, 0, 1, 0, -0.176277, 0, -0.984341, 8.02298, 0.109982, -15.8338) +transform = Transform3D(-0.985639, 0, -0.168868, 0, 1, 0, 0.168868, 0, -0.985639, 8.33217, 0.109982, -16.5982) [node name="wooden_bar_large" parent="NavigationRegion3D" instance=ExtResource("10_r53rh")] transform = Transform3D(0.57707, 0.0101483, -0.816632, -0.00080363, 0.999929, 0.0118582, 0.816694, -0.00618675, 0.577037, 10.1047, -0.256461, 1.7068) @@ -314,7 +313,10 @@ transform = Transform3D(0.748527, -0.0242061, 0.662662, 0, 0.999334, 0.0365042, transform = Transform3D(-0.665803, 0.0843217, -0.741347, 0, 0.993594, 0.113012, 0.746127, 0.0752441, -0.661538, 1.14559, -0.265861, -1.98283) [node name="trenchwall_2m_dirt" parent="NavigationRegion3D" instance=ExtResource("11_kca0e")] -transform = Transform3D(0.18685, 0, 0.982388, 0, 1, 0, -0.982388, 0, 0.18685, 8.72598, -0.119269, -17.2231) +transform = Transform3D(-0.997274, 0, -0.0737775, 0, 1, 0, 0.0737775, 0, -0.997274, -3.9281, -0.119269, -2.51586) + +[node name="trenchwall_2m_dirt3" parent="NavigationRegion3D" instance=ExtResource("11_kca0e")] +transform = Transform3D(-0.0737775, 0, 0.997274, 0, 1, 0, -0.997274, 0, -0.0737775, 9.06163, -0.119269, -17.3266) [node name="trenchwall_5m_dirt" parent="NavigationRegion3D" instance=ExtResource("12_t2jcw")] transform = Transform3D(-0.981195, 0.186002, -0.0515864, 0.18625, 0.982503, 2.32831e-10, 0.0506838, -0.00960795, -0.998668, 7.92201, -0.290734, -4.4115) @@ -333,11 +335,3 @@ transform = Transform3D(0.146791, 0, -0.989167, 0, 1, 0, 0.989167, 0, 0.146791, [node name="walkover4" parent="." instance=ExtResource("13_bq7v3")] transform = Transform3D(-0.996345, -0.0854169, 8.7263e-08, -0.0854169, 0.996345, 3.73369e-09, -8.7263e-08, -3.73369e-09, -1, 9.09391, 0.20791, -10.4648) - -[node name="OccluderInstance3D2" type="OccluderInstance3D" parent="."] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.39433, 1.00168, -2.28504) -occluder = SubResource("QuadOccluder3D_tn23v") - -[node name="OccluderInstance3D3" type="OccluderInstance3D" parent="."] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 6.26402, 1.00168, -2.28504) -occluder = SubResource("QuadOccluder3D_tn23v") diff --git a/godot/occlusion/boot.occ b/godot/occlusion/boot.occ index a8ec9d6..63047a7 100644 Binary files a/godot/occlusion/boot.occ and b/godot/occlusion/boot.occ differ diff --git a/godot/project.godot b/godot/project.godot index 9ea768f..31624eb 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -18,8 +18,8 @@ config/icon="res://icon.svg" [display] -window/size/viewport_width=1920 -window/size/viewport_height=1080 +window/size/viewport_width=2400 +window/size/viewport_height=1350 window/size/mode=3 window/stretch/mode="viewport" window/stretch/aspect="keep_width" @@ -96,6 +96,7 @@ common/physics_interpolation=true [rendering] -anti_aliasing/quality/msaa_3d=2 -anti_aliasing/quality/screen_space_aa=1 +lights_and_shadows/directional_shadow/size=8192 +lights_and_shadows/directional_shadow/soft_shadow_filter_quality=3 +anti_aliasing/quality/msaa_3d=1 occlusion_culling/use_occlusion_culling=true diff --git a/models/character.blend b/models/character.blend index 1af6993..8eeef3d 100644 --- a/models/character.blend +++ b/models/character.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6cffb68fe33a0bd720f818f84669f1bd26688ca02f8f7027d9f7cc1c8b9c487 -size 3184792 +oid sha256:86c23abd972d9225205d9f353543c421afe753c1b6439a558c0ed9609dbc82e4 +size 3236156 diff --git a/models/character.blend1 b/models/character.blend1 index 49c1b9d..ead0d16 100644 Binary files a/models/character.blend1 and b/models/character.blend1 differ diff --git a/models/textures/british_uniform.kra b/models/textures/british_uniform.kra index 2ba3c3c..0c475f6 100644 --- a/models/textures/british_uniform.kra +++ b/models/textures/british_uniform.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60632aea5aced7ce43159512547674a9b034b72609e4f624dd3a289783cd1347 -size 20110211 +oid sha256:924595789d96e4bb9fb12f441f001e2ab706f33e7880b0b5126f4fe25bd59150 +size 18803521 diff --git a/models/textures/british_uniform.kra~ b/models/textures/british_uniform.kra~ index 55a0a6a..a15bcc2 100644 Binary files a/models/textures/british_uniform.kra~ and b/models/textures/british_uniform.kra~ differ diff --git a/models/textures/british_uniform.png b/models/textures/british_uniform.png index d1c51a3..e2b4b62 100644 --- a/models/textures/british_uniform.png +++ b/models/textures/british_uniform.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d3393b7d44d1da4a81e632dbe73d36e8e1acb496e91024b25372152f30846c8 -size 13276926 +oid sha256:f4402ae95af82888910804ebf9484fc0b509fba46b30bda4bba88aa9000aaa01 +size 13936319 diff --git a/models/textures/british_uniform.png~ b/models/textures/british_uniform.png~ index 7897821..73ef586 100644 Binary files a/models/textures/british_uniform.png~ and b/models/textures/british_uniform.png~ differ diff --git a/models/textures/british_uniform_height.png b/models/textures/british_uniform_height.png new file mode 100644 index 0000000..19c68f5 --- /dev/null +++ b/models/textures/british_uniform_height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d43bd757257b40f56a948c3dda22b0b20c92003896cde7da55979c8c3381d3a3 +size 2391472 diff --git a/models/textures/british_uniform_height.png~ b/models/textures/british_uniform_height.png~ new file mode 100644 index 0000000..20fd382 Binary files /dev/null and b/models/textures/british_uniform_height.png~ differ diff --git a/models/textures/british_uniform_normal.png b/models/textures/british_uniform_normal.png new file mode 100644 index 0000000..f9975ea --- /dev/null +++ b/models/textures/british_uniform_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6399bd33218a159fb0fb6cf5d9e81e6fc487cd17577295bffcc4062d609bc658 +size 725950 diff --git a/models/textures/mesh_character_uv.png b/models/textures/mesh_character_uv.png index 58d27c3..ebe1ea1 100644 --- a/models/textures/mesh_character_uv.png +++ b/models/textures/mesh_character_uv.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25e1e7a180721bbd639f5667eba32c0a11769c66eccd34998b5438b2ca530c8 -size 770154 +oid sha256:87065b5328497f2eb5f183a649560b46b648d182a45647ee17b7f1773ac63fe7 +size 749029