From ba7e484e5fc0c939e1676142334bcca125df7ad3 Mon Sep 17 00:00:00 2001 From: karl Date: Wed, 29 Jan 2020 01:41:37 +0100 Subject: [PATCH] Improve factory lighting --- Level/Decoration/FactorySpotlight.tscn | 19 +++-- Level/InFactory.tscn | 102 ++++++++++++++++--------- 2 files changed, 77 insertions(+), 44 deletions(-) diff --git a/Level/Decoration/FactorySpotlight.tscn b/Level/Decoration/FactorySpotlight.tscn index d68cbda..d87f8e7 100644 --- a/Level/Decoration/FactorySpotlight.tscn +++ b/Level/Decoration/FactorySpotlight.tscn @@ -10,13 +10,20 @@ emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false -[node name="SpotLight" type="SpotLight"] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 7, 0 ) -light_color = Color( 0.698039, 0.815686, 1, 1 ) -spot_range = 11.94 -spot_angle = 52.146 +[node name="Spatial" type="Spatial"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, 0 ) [node name="MeshInstance" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 4.37114e-08, -1 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.340075, 0 ) mesh = SubResource( 1 ) material/0 = SubResource( 2 ) + +[node name="SpotLight" type="SpotLight" parent="."] +transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, -1, 0 ) +light_color = Color( 0.698039, 0.815686, 1, 1 ) +light_energy = 0.8 +light_bake_mode = 0 +shadow_bias = 1.0 +shadow_contact = 0.5 +spot_range = 19.6173 +spot_angle = 68.9515 diff --git a/Level/InFactory.tscn b/Level/InFactory.tscn index 2935727..ccbe5d7 100644 --- a/Level/InFactory.tscn +++ b/Level/InFactory.tscn @@ -100,7 +100,6 @@ key_id = 12 transform = Transform( -1.9413, 0, -0.480989, 0, 2, 0, 0.480989, 0, -1.9413, 69.3025, 1, -18.8655 ) [node name="MeldsWes" type="Spatial" parent="."] -editor/display_folded = true [node name="PathNavigatorForNPC3" parent="MeldsWes" instance=ExtResource( 3 )] curve = SubResource( 1 ) @@ -172,8 +171,7 @@ transform = Transform( 15.2, 0, 0, 0, 1, 0, 0, 0, 3, 4.8, 1, -36.8 ) shape = SubResource( 6 ) [node name="Floor" type="StaticBody" parent="Architecture"] -editor/display_folded = true -transform = Transform( 100, 0, 0, 0, 1, 0, 0, 0, 100, 0, -1, 0 ) +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -3.5, -1, -33 ) collision_layer = 3 [node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor"] @@ -181,6 +179,46 @@ shape = SubResource( 7 ) [node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor"] layers = 3 +cast_shadow = 0 +mesh = SubResource( 8 ) +material/0 = SubResource( 9 ) + +[node name="Floor2" type="StaticBody" parent="Architecture"] +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -3.5, -1, -3 ) +collision_layer = 3 + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor2"] +shape = SubResource( 7 ) + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor2"] +layers = 3 +cast_shadow = 0 +mesh = SubResource( 8 ) +material/0 = SubResource( 9 ) + +[node name="Floor3" type="StaticBody" parent="Architecture"] +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, 26.5, -1, -3 ) +collision_layer = 3 + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor3"] +shape = SubResource( 7 ) + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor3"] +layers = 3 +cast_shadow = 0 +mesh = SubResource( 8 ) +material/0 = SubResource( 9 ) + +[node name="Floor4" type="StaticBody" parent="Architecture"] +transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, 26.5, -1, -33 ) +collision_layer = 3 + +[node name="CollisionShape" type="CollisionShape" parent="Architecture/Floor4"] +shape = SubResource( 7 ) + +[node name="MeshInstance" type="MeshInstance" parent="Architecture/Floor4"] +layers = 3 +cast_shadow = 0 mesh = SubResource( 8 ) material/0 = SubResource( 9 ) @@ -2073,47 +2111,33 @@ environment = SubResource( 19 ) [node name="SpotLight" parent="Light" instance=ExtResource( 24 )] -[node name="SpotLight6" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -16.8823, 6, -70.7544 ) -spot_angle = 52.146 - -[node name="SpotLight7" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 3.11775, 6, -70.7544 ) -spot_angle = 52.146 - -[node name="SpotLight8" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 23.1177, 6, -70.7544 ) -spot_angle = 52.146 - -[node name="SpotLight9" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 43.1177, 6, -70.7544 ) -spot_angle = 52.146 - -[node name="SpotLight10" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 47.9017, 6, -67.7544 ) -spot_angle = 52.146 - -[node name="SpotLight11" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 47.9017, 6, -47.7544 ) -spot_angle = 52.146 - -[node name="SpotLight12" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 47.9017, 6, -27.7544 ) -spot_angle = 52.146 - [node name="SpotLight2" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 7, -10 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, -15 ) [node name="SpotLight3" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 7, -20 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, -30 ) -[node name="SpotLight4" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 7, -30 ) +[node name="SpotLight6" parent="Light" instance=ExtResource( 24 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16.8823, 5, -70.7544 ) + +[node name="SpotLight8" parent="Light" instance=ExtResource( 24 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14.1177, 5, -70.7544 ) + +[node name="SpotLight9" parent="Light" instance=ExtResource( 24 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 39.1177, 5, -70.7544 ) + +[node name="SpotLight10" parent="Light" instance=ExtResource( 24 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 47.9017, 5, -63.7544 ) + +[node name="SpotLight12" parent="Light" instance=ExtResource( 24 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 47.9017, 5, -27.7544 ) [node name="SpotLight5" parent="Light" instance=ExtResource( 24 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 13, -51 ) -spot_range = 40.9239 -spot_angle = 79.4476 +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12, -51 ) + +[node name="SpotLight" parent="Light/SpotLight5" index="1"] +spot_range = 54.5 +spot_angle = 76.9 [editable path="Architecture/EntryHall/DoubleDoorWall"] @@ -2158,3 +2182,5 @@ spot_angle = 79.4476 [editable path="Architecture/FactoryRoomInterior/KeyThing/Key/Sparkle"] [editable path="Architecture/FactoryRoomInterior/KeyThing/Pipe"] + +[editable path="Light/SpotLight5"]