diff --git a/meshes/interior/Chandelier.gltf.import b/meshes/interior/Chandelier.gltf.import index 2aaf22f..2a71547 100644 --- a/meshes/interior/Chandelier.gltf.import +++ b/meshes/interior/Chandelier.gltf.import @@ -32,6 +32,12 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +_subresources={ +"nodes": { +"PATH:Chandelier": { +"mesh_instance/cast_shadow": 0 +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/scenes/house_big.tscn b/scenes/house_big.tscn index 393e66f..24323ca 100644 --- a/scenes/house_big.tscn +++ b/scenes/house_big.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=72 format=3 uid="uid://clxuoprslq8em"] +[gd_scene load_steps=73 format=3 uid="uid://clxuoprslq8em"] [ext_resource type="Script" uid="uid://4nvvgle511m4" path="res://scripts/house_big.gd" id="1_158ph"] [ext_resource type="PackedScene" uid="uid://wsu3b5udqtdu" path="res://meshes/village/Wall_UnevenBrick_Straight.gltf" id="1_p6qno"] @@ -53,6 +53,7 @@ [ext_resource type="PackedScene" uid="uid://ghgretojabc1" path="res://meshes/interior/Vase_4.gltf" id="40_4hat2"] [ext_resource type="PackedScene" uid="uid://co7ijbeyonv5" path="res://meshes/interior/Book_5.gltf" id="41_u6m7x"] [ext_resource type="PackedScene" uid="uid://d1imd6qqtgy2e" path="res://meshes/village/Stair_Interior_Rails.gltf" id="42_isn6p"] +[ext_resource type="PackedScene" uid="uid://c3myqiuhgghyo" path="res://meshes/interior/Lantern_Wall.gltf" id="54_nrbqc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dss4m"] albedo_color = Color(0.448364, 0.428649, 0.0977373, 1) @@ -60,7 +61,7 @@ albedo_color = Color(0.448364, 0.428649, 0.0977373, 1) [sub_resource type="BoxMesh" id="BoxMesh_kpybi"] size = Vector3(1000, 0.5, 1000) -[sub_resource type="Resource" id="Resource_u6m7x"] +[sub_resource type="Resource" id="Resource_nrbqc"] script = ExtResource("7_4hat2") amount = 1500 enabled = true @@ -69,7 +70,7 @@ custom_seed = 0 restrict_height = true reference_frame = 1 -[sub_resource type="Resource" id="Resource_nrbqc"] +[sub_resource type="Resource" id="Resource_1c0ay"] script = ExtResource("8_u6m7x") position = Vector3(0.15, 0.15, 0.15) rotation = Vector3(20, 360, 20) @@ -80,7 +81,7 @@ custom_seed = 0 restrict_height = false reference_frame = 2 -[sub_resource type="Resource" id="Resource_1c0ay"] +[sub_resource type="Resource" id="Resource_purgm"] script = ExtResource("9_nrbqc") iterations = 3 offset_step = 0.2 @@ -92,7 +93,7 @@ custom_seed = 0 restrict_height = true reference_frame = 0 -[sub_resource type="Resource" id="Resource_purgm"] +[sub_resource type="Resource" id="Resource_615iq"] script = ExtResource("10_1c0ay") ray_direction = Vector3(0, -1, 0) ray_length = 5.0 @@ -108,9 +109,9 @@ custom_seed = 0 restrict_height = false reference_frame = 0 -[sub_resource type="Resource" id="Resource_615iq"] +[sub_resource type="Resource" id="Resource_31h7w"] script = ExtResource("5_3bxb3") -stack = Array[ExtResource("6_53v87")]([SubResource("Resource_u6m7x"), SubResource("Resource_nrbqc"), SubResource("Resource_1c0ay"), SubResource("Resource_purgm")]) +stack = Array[ExtResource("6_53v87")]([SubResource("Resource_nrbqc"), SubResource("Resource_1c0ay"), SubResource("Resource_purgm"), SubResource("Resource_615iq")]) [sub_resource type="Resource" id="Resource_37qwj"] script = ExtResource("13_1c0ay") @@ -127,7 +128,7 @@ script = ExtResource("12_615iq") size = Vector3(15.4096, 1, 9.6442) metadata/_custom_type_script = "uid://d011g8ga6gea7" -[sub_resource type="Resource" id="Resource_31h7w"] +[sub_resource type="Resource" id="Resource_ob3ci"] script = ExtResource("7_4hat2") amount = 1200 enabled = true @@ -136,7 +137,7 @@ custom_seed = 0 restrict_height = true reference_frame = 1 -[sub_resource type="Resource" id="Resource_ob3ci"] +[sub_resource type="Resource" id="Resource_61s38"] script = ExtResource("8_u6m7x") position = Vector3(0.1, 0.15, 0.1) rotation = Vector3(10, 360, 10) @@ -147,7 +148,7 @@ custom_seed = 0 restrict_height = false reference_frame = 2 -[sub_resource type="Resource" id="Resource_61s38"] +[sub_resource type="Resource" id="Resource_p6hgd"] script = ExtResource("9_nrbqc") iterations = 3 offset_step = 0.2 @@ -159,7 +160,7 @@ custom_seed = 0 restrict_height = true reference_frame = 0 -[sub_resource type="Resource" id="Resource_p6hgd"] +[sub_resource type="Resource" id="Resource_o0mww"] script = ExtResource("10_1c0ay") ray_direction = Vector3(0, -1, 0) ray_length = 5.0 @@ -175,9 +176,9 @@ custom_seed = 0 restrict_height = false reference_frame = 0 -[sub_resource type="Resource" id="Resource_o0mww"] +[sub_resource type="Resource" id="Resource_ckunl"] script = ExtResource("5_3bxb3") -stack = Array[ExtResource("6_53v87")]([SubResource("Resource_31h7w"), SubResource("Resource_ob3ci"), SubResource("Resource_61s38"), SubResource("Resource_p6hgd")]) +stack = Array[ExtResource("6_53v87")]([SubResource("Resource_ob3ci"), SubResource("Resource_61s38"), SubResource("Resource_p6hgd"), SubResource("Resource_o0mww")]) [sub_resource type="Resource" id="Resource_f17e3"] script = ExtResource("12_615iq") @@ -209,7 +210,7 @@ metadata/_edit_lock_ = true [node name="ScatterGrass" type="Node3D" parent="Meadow"] script = ExtResource("4_u6m7x") force_rebuild_on_load = false -modifier_stack = SubResource("Resource_615iq") +modifier_stack = SubResource("Resource_31h7w") Performance/use_chunks = true Performance/chunk_dimensions = Vector3(15, 15, 15) metadata/_custom_type_script = "uid://mlpya7qid02x" @@ -252,7 +253,7 @@ metadata/_custom_type_script = "uid://bsl3en0gdt8ka" [node name="ScatterTrees" type="Node3D" parent="Meadow"] script = ExtResource("4_u6m7x") force_rebuild_on_load = false -modifier_stack = SubResource("Resource_o0mww") +modifier_stack = SubResource("Resource_ckunl") Performance/use_chunks = true Performance/chunk_dimensions = Vector3(15, 15, 15) metadata/_custom_type_script = "uid://mlpya7qid02x" @@ -549,26 +550,30 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.9, 6, -3.5) [node name="OmniLight3D" type="OmniLight3D" parent="WallsAndShit/Chandelier2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0676376, -0.834157, 0.600262) light_color = Color(0.860136, 0.848595, 0.752131, 1) -light_energy = 0.961 -omni_range = 5.751 +light_energy = 0.576 +shadow_enabled = true +omni_range = 6.338 [node name="OmniLight3D2" type="OmniLight3D" parent="WallsAndShit/Chandelier2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0676376, -0.834157, -0.548677) light_color = Color(0.860136, 0.848595, 0.752131, 1) -light_energy = 0.961 -omni_range = 5.751 +light_energy = 0.576 +shadow_enabled = true +omni_range = 6.338 [node name="OmniLight3D3" type="OmniLight3D" parent="WallsAndShit/Chandelier2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.632596, -0.834157, -0.00643849) light_color = Color(0.860136, 0.848595, 0.752131, 1) -light_energy = 0.961 -omni_range = 5.751 +light_energy = 0.576 +shadow_enabled = true +omni_range = 6.338 [node name="OmniLight3D4" type="OmniLight3D" parent="WallsAndShit/Chandelier2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.572049, -0.834157, 0.00770402) light_color = Color(0.860136, 0.848595, 0.752131, 1) -light_energy = 0.961 -omni_range = 5.751 +light_energy = 0.576 +shadow_enabled = true +omni_range = 6.338 [node name="Bed_Twin12" parent="WallsAndShit" instance=ExtResource("21_77p6n")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.6, 0.3, -0.7) @@ -765,6 +770,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.60376, 0.0895298, -6.71063) [node name="Stair_Interior_Rails2" parent="WallsAndShit" instance=ExtResource("42_isn6p")] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.185164, 0.0756873, -6.01873) +[node name="Lantern_Wall2" parent="WallsAndShit" instance=ExtResource("54_nrbqc")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6.2387, 6.11833, -3.1478) + +[node name="OmniLight3D" type="OmniLight3D" parent="WallsAndShit/Lantern_Wall2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.310703, 0.836766) +light_color = Color(0.873324, 0.836156, 0.57236, 1) +light_energy = 0.346 +light_size = 0.031 +light_bake_mode = 1 +shadow_blur = 2.971 +omni_range = 6.692 +omni_attenuation = 0.486 + [node name="NecessaryColliders" type="StaticBody3D" parent="."] [node name="BalconyGround" type="CollisionShape3D" parent="NecessaryColliders"] diff --git a/scenes/world.tscn b/scenes/world.tscn index 358edc4..c837eac 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -34,9 +34,11 @@ ambient_light_color = Color(0.939669, 0.875855, 0.802177, 1) ambient_light_energy = 0.2 tonemap_mode = 3 ssao_enabled = true -ssao_intensity = 5.0 +ssao_power = 0.75 +ssil_enabled = true fog_density = 0.0051 fog_sky_affect = 0.23 +adjustment_enabled = true [sub_resource type="BoxShape3D" id="BoxShape3D_q5onr"] size = Vector3(1.83496, 2.19373, 1.46497) @@ -84,7 +86,7 @@ radius = 0.2 height = 1.75 [node name="World" type="Node3D"] -metadata/movie_file = "captures/e_.avi" +metadata/movie_file = "captures/f_.avi" [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_o8fc1")