diff --git a/maps/base_map.tscn b/maps/base_map.tscn index bf51209..399cec2 100644 --- a/maps/base_map.tscn +++ b/maps/base_map.tscn @@ -1,10 +1,20 @@ -[gd_scene load_steps=3 format=3 uid="uid://2qsccmko8yl8"] +[gd_scene load_steps=6 format=3 uid="uid://2qsccmko8yl8"] [ext_resource type="PackedScene" uid="uid://4mhcwvn365ki" path="res://objects/computer.tscn" id="2_28qhl"] [sub_resource type="BoxShape3D" id="BoxShape3D_34oyu"] size = Vector3(50, 1, 50) +[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_ttw18"] + +[sub_resource type="Sky" id="Sky_xg1t7"] +sky_material = SubResource("PhysicalSkyMaterial_ttw18") + +[sub_resource type="Environment" id="Environment_3mjgt"] +background_mode = 2 +sky = SubResource("Sky_xg1t7") +ambient_light_color = Color(1, 1, 1, 1) + [node name="map" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0) @@ -17,7 +27,9 @@ size = Vector3(50, 1, 50) shape = SubResource("BoxShape3D_34oyu") [node name="light" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.545371, 0.353189, 0.76015, 0, -0.90689, 0.421368, 0.838195, -0.229802, -0.494591, 0, 10.2747, 0) +transform = Transform3D(0.472305, 0.759315, 0.447625, 0.272686, -0.608795, 0.744991, 0.838195, -0.229802, -0.494591, 0, 10.2747, 0) +shadow_enabled = true +directional_shadow_mode = 1 [node name="computers" parent="." instance=ExtResource("2_28qhl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 1, 3) @@ -27,3 +39,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 3) [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, 0, 5, 29) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_3mjgt") diff --git a/objects/player.tscn b/objects/player.tscn index d04e86a..10f230f 100644 --- a/objects/player.tscn +++ b/objects/player.tscn @@ -62,5 +62,9 @@ radius = 0.375 wait_time = 30.0 one_shot = true +[node name="show_fps" type="Timer" parent="."] +autostart = true + [connection signal="body_entered" from="detect_hit" to="." method="_on_detect_hit_body_entered"] [connection signal="timeout" from="time_in_bag" to="." method="_on_time_in_bag_timeout"] +[connection signal="timeout" from="show_fps" to="." method="_on_show_fps_timeout"] diff --git a/project.godot b/project.godot index de0a75e..82b45d8 100644 --- a/project.godot +++ b/project.godot @@ -76,3 +76,4 @@ escape={ [rendering] textures/vram_compression/import_etc2_astc=true +occlusion_culling/use_occlusion_culling=true diff --git a/scripts/movement.gd b/scripts/movement.gd index 2ee76a4..86f5f0f 100644 --- a/scripts/movement.gd +++ b/scripts/movement.gd @@ -33,6 +33,12 @@ func _ready(): npc = true func _physics_process(delta): + if $cam_y/Camera3D.position.z == 0: + $cam_y.position.y = 1 + Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) + else: + Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + $cam_y.position.y = 0 if Input.is_action_just_pressed("escape"): get_tree().change_scene_to_file("res://menus/main_menu.tscn") Game.reset() @@ -130,3 +136,7 @@ func _on_time_in_bag_timeout(): captured_by.lost_one() position = position_pre $in_bag.visible = false + + +func _on_show_fps_timeout(): + print(Engine.get_frames_per_second())