diff --git a/project.godot b/project.godot index f13a85c..31b0b17 100644 --- a/project.godot +++ b/project.godot @@ -99,7 +99,7 @@ _global_script_class_icons={ [application] config/name="project-dung" -run/main_scene="res://scenes/dev-daniel.tscn" +run/main_scene="res://scenes/main.tscn" config/icon="res://icon.png" [display] diff --git a/scenes/dev-akshay.tscn b/scenes/dev-akshay.tscn index bbe8297..ca65e8b 100644 --- a/scenes/dev-akshay.tscn +++ b/scenes/dev-akshay.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1] -[ext_resource path="res://assets/moonbase_whitebox/Moonbase_Whitebox.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/dof_focus.gd" type="Script" id=2] [ext_resource path="res://scenes/power_station.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/crafting_station.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/item_generator.tscn" type="PackedScene" id=5] @@ -18,10 +18,11 @@ [ext_resource path="res://scenes/cheat_menu.tscn" type="PackedScene" id=16] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=17] [ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=18] +[ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=19] [sub_resource type="CylinderShape" id=8] height = 5.22615 -radius = 8.72145 +radius = 12.052 [sub_resource type="BoxShape" id=9] extents = Vector3( 1.78436, 2.33105, 6.04815 ) @@ -42,7 +43,6 @@ tracks/0/keys = { } [sub_resource type="Animation" id=11] -resource_name = "switch_camera" length = 0.3 tracks/0/type = "value" tracks/0/path = NodePath(".:camera_lerp") @@ -62,20 +62,24 @@ sky_top_color = Color( 0.486275, 0.486275, 0.486275, 1 ) sky_horizon_color = Color( 0.180392, 0.180392, 0.180392, 1 ) ground_bottom_color = Color( 0.545098, 0.545098, 0.545098, 1 ) ground_horizon_color = Color( 0.8, 0.8, 0.8, 1 ) -sun_color = Color( 0, 0, 0, 1 ) [sub_resource type="Environment" id=12] background_mode = 2 background_sky = SubResource( 7 ) -ss_reflections_enabled = true +ambient_light_sky_contribution = 0.5 +tonemap_mode = 4 ssao_enabled = true +ssao_radius = 3.86 +ssao_intensity = 0.69 +dof_blur_far_enabled = true +dof_blur_far_amount = 0.15 +dof_blur_near_enabled = true +dof_blur_near_amount = 0.15 +adjustment_contrast = 1.97 [node name="dev_akshay" type="Spatial"] -[node name="Moonbase_Whitebox" parent="." instance=ExtResource( 2 )] - -[node name="Player" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 5.27448 ) +[node name="Level" parent="." instance=ExtResource( 19 )] [node name="cameras" type="Spatial" parent="."] script = ExtResource( 10 ) @@ -89,7 +93,7 @@ current = true script = ExtResource( 11 ) [node name="camera" type="Camera" parent="cameras/camera_room_center"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12, 0 ) +transform = Transform( -1, 7.57103e-08, -4.37114e-08, 0, 0.5, 0.866025, 8.74228e-08, 0.866025, -0.5, 0, 12, 0 ) script = ExtResource( 9 ) target = NodePath("../../../Player") @@ -101,8 +105,20 @@ collision_mask = 2 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.52689, 0 ) shape = SubResource( 8 ) +[node name="camera_galley" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -16.3 ) + +[node name="camera_ore_conveyor" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 11.526, 0, -11.526 ) + +[node name="camera_storage" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 16.3, 0, 0 ) + +[node name="camera_crafting" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( -0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 11.526, 0, 11.526 ) + [node name="camera_room_hallway" type="Spatial" parent="cameras"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0726166, 0, 17.4284 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 16.3 ) script = ExtResource( 11 ) [node name="camera" type="Camera" parent="cameras/camera_room_hallway"] @@ -116,94 +132,87 @@ collision_mask = 2 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.52689, -1.44831 ) shape = SubResource( 9 ) -[node name="camera_room0" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.408, 0, 0 ) +[node name="camera_rover" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, -11.526, 0, 11.526 ) -[node name="camera_room1" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( 0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 10.653, 0, -10.485 ) +[node name="camera_comms" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -16.3, 0, 0 ) -[node name="camera_room2" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( -0.0170336, 0, 0.999855, 0, 1, 0, -0.999855, 0, -0.0170336, -0.079, 0, -15.007 ) - -[node name="camera_room3" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( -0.70219, 0, 0.711989, 0, 1, 0, -0.711989, 0, -0.70219, -10.6346, 0, -10.3156 ) - -[node name="camera_room4" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( -0.999986, 0, 0.00521851, 0, 1, 0, -0.00521851, 0, -0.999986, -15.0328, 0, 0.198143 ) - -[node name="camera_room5" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( -0.661796, 0, -0.749684, 0, 1, 0, 0.749684, 0, -0.661796, -10.4671, 0, 10.8794 ) - -[node name="camera_room6" parent="cameras" instance=ExtResource( 8 )] -transform = Transform( 0.696427, 0, -0.717628, 0, 1, 0, 0.717628, 0, 0.696427, 10.8827, 0, 10.7342 ) +[node name="camera_hydroponics" parent="cameras" instance=ExtResource( 8 )] +transform = Transform( 0.707106, 0, 0.707106, 0, 1, 0, -0.707106, 0, 0.707106, -11.526, 0, -11.526 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="cameras"] anims/RESET = SubResource( 10 ) anims/switch_camera = SubResource( 11 ) [node name="lights" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.14791, 0, 6.48126 ) [node name="Hub1" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.11319, 4.20288, -1.73099 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0224032, 4.20288, 4.77208 ) shadow_enabled = true omni_range = 10.7698 [node name="Hub2" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.059, 4.20288, -11.3228 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0765934, 4.20288, -4.81973 ) shadow_enabled = true omni_range = 10.7698 -[node name="OmniLight20" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9024, 3.329, -6.67066 ) +[node name="light_galley" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.329, -16.3 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight21" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.06107, 3.329, -17.2136 ) +[node name="light_ore_conveyor" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.526, 3.329, -11.526 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight22" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.23606, 3.329, -21.2439 ) +[node name="light_storage" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 16.3, 3.329, 0 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight23" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.8527, 3.329, -16.8695 ) +[node name="light_crafting" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.526, 3.329, 11.526 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight24" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -19.2271, 3.329, -6.05627 ) +[node name="light_hallway" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.329, 16.3 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight25" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.2271, 3.329, 4.94373 ) +[node name="light_rover" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.526, 3.329, 11.526 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight26" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.64507, 3.329, 3.88698 ) +[node name="light_comms" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -16.3, 3.329, 0 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 -[node name="OmniLight27" type="OmniLight" parent="lights"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.20031, 3.329, 9.61307 ) +[node name="light_hydroponics" type="OmniLight" parent="lights"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.526, 3.329, -11.526 ) shadow_enabled = true omni_range = 5.893 omni_attenuation = 2.0 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource( 12 ) +script = ExtResource( 2 ) +target = NodePath("../Player") +size = 4.0 + +[node name="Player" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 5.27448 ) [node name="power_station" parent="." instance=ExtResource( 3 )] transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0 ) @@ -315,21 +324,21 @@ transform = Transform( 1, 3.49246e-10, -2.23517e-08, -3.49246e-10, 1, 1.60071e-1 [connection signal="player_exited" from="cameras/camera_room_center" to="cameras" method="_on_camera_room_player_exited"] [connection signal="area_entered" from="cameras/camera_room_center/hitbox" to="cameras/camera_room_center" method="_on_hitbox_area_entered"] [connection signal="area_exited" from="cameras/camera_room_center/hitbox" to="cameras/camera_room_center" method="_on_hitbox_area_exited"] +[connection signal="player_entered" from="cameras/camera_galley" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_galley" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_ore_conveyor" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_ore_conveyor" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_storage" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_storage" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_crafting" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_crafting" to="cameras" method="_on_camera_room_player_exited"] [connection signal="player_entered" from="cameras/camera_room_hallway" to="cameras" method="_on_camera_room_player_entered"] [connection signal="player_exited" from="cameras/camera_room_hallway" to="cameras" method="_on_camera_room_player_exited"] [connection signal="area_entered" from="cameras/camera_room_hallway/hitbox" to="cameras/camera_room_hallway" method="_on_hitbox_area_entered"] [connection signal="area_exited" from="cameras/camera_room_hallway/hitbox" to="cameras/camera_room_hallway" method="_on_hitbox_area_exited"] -[connection signal="player_entered" from="cameras/camera_room0" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room0" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room1" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room1" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room2" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room2" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room3" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room3" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room4" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room4" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room5" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room5" to="cameras" method="_on_camera_room_player_exited"] -[connection signal="player_entered" from="cameras/camera_room6" to="cameras" method="_on_camera_room_player_entered"] -[connection signal="player_exited" from="cameras/camera_room6" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_rover" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_rover" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_comms" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_comms" to="cameras" method="_on_camera_room_player_exited"] +[connection signal="player_entered" from="cameras/camera_hydroponics" to="cameras" method="_on_camera_room_player_entered"] +[connection signal="player_exited" from="cameras/camera_hydroponics" to="cameras" method="_on_camera_room_player_exited"]