diff --git a/project/models/props/grass.blend b/project/models/props/grass.blend index c7d15cf8..87b04747 100644 Binary files a/project/models/props/grass.blend and b/project/models/props/grass.blend differ diff --git a/project/models/props/grass.blend.import b/project/models/props/grass.blend.import index 9de8fd63..ac7e05dc 100644 --- a/project/models/props/grass.blend.import +++ b/project/models/props/grass.blend.import @@ -32,7 +32,14 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +_subresources={ +"materials": { +"grass": { +"use_external/enabled": true, +"use_external/path": "res://models/props/materials/grass.tres" +} +} +} blender/nodes/visible=0 blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true diff --git a/project/models/props/grass.blend1 b/project/models/props/grass.blend1 index c5d2b42a..d4377e85 100644 Binary files a/project/models/props/grass.blend1 and b/project/models/props/grass.blend1 differ diff --git a/project/models/props/materials/grass.tres b/project/models/props/materials/grass.tres new file mode 100644 index 00000000..d109ffac --- /dev/null +++ b/project/models/props/materials/grass.tres @@ -0,0 +1,13 @@ +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://c3klmel717h85"] + +[ext_resource type="Texture2D" uid="uid://cjamwnt4hrwfv" path="res://materials/grass_albedo.png" id="1_ireae"] + +[resource] +resource_name = "grass" +transparency = 2 +alpha_scissor_threshold = 0.771 +alpha_antialiasing_mode = 1 +alpha_antialiasing_edge = 0.3 +shading_mode = 2 +albedo_texture = ExtResource("1_ireae") +roughness = 0.967914 diff --git a/project/models/terrains/level.blend b/project/models/terrains/level.blend index 30572bf2..9332c702 100644 Binary files a/project/models/terrains/level.blend and b/project/models/terrains/level.blend differ diff --git a/project/models/terrains/level.blend1 b/project/models/terrains/level.blend1 index 2656ec00..7010896a 100644 Binary files a/project/models/terrains/level.blend1 and b/project/models/terrains/level.blend1 differ diff --git a/project/rendering/kloppenheim_06_4k.exr b/project/rendering/kloppenheim_06_4k.exr new file mode 100644 index 00000000..94399cc8 Binary files /dev/null and b/project/rendering/kloppenheim_06_4k.exr differ diff --git a/project/rendering/kloppenheim_06_4k.exr.import b/project/rendering/kloppenheim_06_4k.exr.import new file mode 100644 index 00000000..62bd8180 --- /dev/null +++ b/project/rendering/kloppenheim_06_4k.exr.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://qxwsryrw0ny4" +path.bptc="res://.godot/imported/kloppenheim_06_4k.exr-f9ff167f70e9e40f7b0d6eb8d0ef512d.bptc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://rendering/kloppenheim_06_4k.exr" +dest_files=["res://.godot/imported/kloppenheim_06_4k.exr-f9ff167f70e9e40f7b0d6eb8d0ef512d.bptc.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=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/project/scenes/valley.tscn b/project/scenes/valley.tscn index a966ac1d..8ff35eae 100644 --- a/project/scenes/valley.tscn +++ b/project/scenes/valley.tscn @@ -1,20 +1,19 @@ -[gd_scene load_steps=12 format=3 uid="uid://sofv1apr4467"] +[gd_scene load_steps=13 format=3 uid="uid://sofv1apr4467"] [ext_resource type="PackedScene" uid="uid://5cfl3xu1861l" path="res://models/terrains/level.blend" id="1_ch7jd"] [ext_resource type="PackedScene" uid="uid://dcgsrdacswacl" path="res://objects/player.tscn" id="2_pvuhy"] +[ext_resource type="Texture2D" uid="uid://qxwsryrw0ny4" path="res://rendering/kloppenheim_06_4k.exr" id="2_xecee"] [ext_resource type="PackedScene" uid="uid://dqjurq1nq1fle" path="res://objects/tre.tscn" id="3_lj5yw"] -[ext_resource type="PackedScene" uid="uid://cdmksnsttot3j" path="res://objects/wall_enemy.tscn" id="4_kaqos"] [ext_resource type="PackedScene" uid="uid://dp48t6earfkm4" path="res://objects/evertre.tscn" id="5_81e57"] [ext_resource type="PackedScene" uid="uid://cdyr4yad84cp2" path="res://models/pickups/twirly.blend" id="6_a2vvy"] +[ext_resource type="PackedScene" uid="uid://8q5ql5fydib" path="res://models/props/grass.blend" id="7_xecee"] -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_pvuhy"] -sky_top_color = Color(0.0825, 0.277292, 0.55, 1) -sky_horizon_color = Color(0.4422, 0.529523, 0.67, 1) -ground_bottom_color = Color(0.132, 0.2, 0.134267, 1) -ground_horizon_color = Color(0.4087, 0.508865, 0.67, 1) +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_m3qr3"] +panorama = ExtResource("2_xecee") +energy_multiplier = 0.25 [sub_resource type="Sky" id="Sky_x4b8f"] -sky_material = SubResource("ProceduralSkyMaterial_pvuhy") +sky_material = SubResource("PanoramaSkyMaterial_m3qr3") [sub_resource type="Environment" id="Environment_lj5yw"] background_mode = 2 @@ -23,6 +22,14 @@ sky = SubResource("Sky_x4b8f") ambient_light_source = 3 ssao_radius = 16.0 glow_enabled = true +fog_enabled = true +fog_mode = 1 +fog_light_color = Color(0.272901, 0.471156, 0.543814, 1) +fog_light_energy = 2.98 +fog_sun_scatter = 0.28 +fog_density = 0.0343 +fog_sky_affect = 0.0 +fog_depth_curve = 1.07178 [sub_resource type="GDScript" id="GDScript_a2vvy"] script/source = "extends Area3D @@ -45,32 +52,6 @@ radius = 1.61546 [node name="Player" parent="." instance=ExtResource("2_pvuhy")] transform = Transform3D(0.999996, 0, -0.0030368, 0, 1, 0, 0.0030368, 0, 0.999996, 31.3342, 31.6645, -39.9581) -[node name="WallEnemy" parent="." instance=ExtResource("4_kaqos")] -transform = Transform3D(-0.38249, 0, -0.923959, 0, 1, 0, 0.923959, 0, -0.38249, 135.071, -6.37696, 263.993) - -[node name="WallEnemy3" parent="." instance=ExtResource("4_kaqos")] -transform = Transform3D(0.999926, 0, 0.0121468, 0, 1, 0, -0.0121468, 0, 0.999926, 168.538, -6.37696, 215.507) - -[node name="WallEnemy2" parent="." instance=ExtResource("4_kaqos")] -transform = Transform3D(-0.991635, 0, 0.129073, 0, 1, 0, -0.129073, 0, -0.991635, 229.483, -6.38962, 232.319) -speed = 4.0 - -[node name="Label3D" type="Label3D" parent="WallEnemy2"] -transform = Transform3D(0.994593, -0.103851, 0, -4.53949e-09, -4.3475e-08, 1, -0.103851, -0.994593, -4.37114e-08, 231.324, 6.54938, 243.387) -pixel_size = 0.08 -text = " [W] -A S D" - -[node name="Label3D2" type="Label3D" parent="WallEnemy2"] -transform = Transform3D(0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926, 228.424, 8.2929, 214.064) -pixel_size = 0.025 -text = "[Space] [D]" - -[node name="Label3D3" type="Label3D" parent="WallEnemy2"] -transform = Transform3D(-2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 260.364, 8.2929, 215.45) -pixel_size = 0.025 -text = "[Space] [A]" - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_lj5yw") @@ -395,7 +376,7 @@ transform = Transform3D(0.870053, 0.0218267, 0.492477, -0.094127, 0.987994, 0.12 transform = Transform3D(-0.68414, -1.27028e-08, 0.729351, -1.05998e-07, 1, -8.20107e-08, -0.729351, -1.33416e-07, -0.68414, 93.4373, 0.281845, 41.6502) [node name="Node3D42" parent="level" instance=ExtResource("3_lj5yw")] -transform = Transform3D(-0.962998, 3.82291e-08, 0.269508, 7.14332e-08, 1, 1.13395e-07, -0.269508, 1.28451e-07, -0.962998, 106.078, 0.120977, 30.4481) +transform = Transform3D(-0.962998, 3.82291e-08, 0.269508, 7.14332e-08, 1, 1.13395e-07, -0.269508, 1.28451e-07, -0.962998, 106.371, 0.120977, 32.0274) [node name="Node3D78" parent="level" instance=ExtResource("3_lj5yw")] transform = Transform3D(-0.942869, 1.05131e-07, -0.333165, 7.14332e-08, 1, 1.13395e-07, 0.333165, 8.31176e-08, -0.942869, 104.432, 0.0379796, 21.4267) @@ -1142,7 +1123,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -196.111, -15.4804, 355.695) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -185.995, -15.4804, 339.672) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.978053, -0.198111, 0.0645307, 0, 0.309714, 0.95083, -0.208356, 0.929962, -0.302917, 0, 0, 0) +transform = Transform3D(-0.978053, -0.155016, -0.13922, 0, -0.668183, 0.743997, -0.208356, 0.727668, 0.653519, 0, 2.39942, 0) shadow_enabled = true shadow_opacity = 0.74 shadow_blur = 0.973 @@ -1150,10 +1131,10 @@ directional_shadow_blend_splits = true directional_shadow_max_distance = 1063.4 [node name="Tree" parent="." instance=ExtResource("3_lj5yw")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 269.46, 0.341235, 236.781) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 316.587, 0.341239, 238.65) [node name="Area3D" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 259.242, 1.93115, 234.094) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 304.172, 1.93115, 239.87) script = SubResource("GDScript_a2vvy") [node name="twirly" parent="Area3D" instance=ExtResource("6_a2vvy")] @@ -1173,4 +1154,46 @@ omni_range = 3.15575 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] shape = SubResource("SphereShape3D_a2vvy") +[node name="grass" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.0697, 0.795121, 24.211) + +[node name="grass3" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.029, 0.795121, 20.7469) + +[node name="grass4" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.029, 0.795121, 15.7469) + +[node name="grass5" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.90056, 0.113405, 29.7154) + +[node name="grass6" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.99364, 0.0699855, 34.6612) + +[node name="grass7" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.86014, -0.00425339, 27.1964) + +[node name="grass8" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.19063, -0.00425434, 59.6851) + +[node name="grass9" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.0998, 0.400001, 58.8725) + +[node name="grass10" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.85007, 0.138822, 57.4068) + +[node name="grass11" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.60502, -0.00425243, 71.7486) + +[node name="grass12" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.82738, 0.285334, 71.3066) + +[node name="grass13" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.57393, 0.231234, 67.032) + +[node name="grass14" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.97373, -0.00425243, 67.3908) + +[node name="grass2" parent="." instance=ExtResource("7_xecee")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 107.867, -0.00597608, 31.8374) + [connection signal="body_entered" from="Area3D" to="Area3D" method="_on_body_entered"]