diff --git a/assets/BlenderDesignFiles/AerialLandscape1.blend b/assets/BlenderDesignFiles/AerialLandscape1.blend index 2207d18..7b75b74 100644 Binary files a/assets/BlenderDesignFiles/AerialLandscape1.blend and b/assets/BlenderDesignFiles/AerialLandscape1.blend differ diff --git a/assets/BlenderDesignFiles/AerialLandscape1.blend1 b/assets/BlenderDesignFiles/AerialLandscape1.blend1 index 6ffe8a0..2207d18 100644 Binary files a/assets/BlenderDesignFiles/AerialLandscape1.blend1 and b/assets/BlenderDesignFiles/AerialLandscape1.blend1 differ diff --git a/assets/LevelBlockouts/blockout4.blend b/assets/LevelBlockouts/blockout4.blend index 4051e01..8e2ec64 100644 Binary files a/assets/LevelBlockouts/blockout4.blend and b/assets/LevelBlockouts/blockout4.blend differ diff --git a/assets/LevelBlockouts/hub_1.tscn b/assets/LevelBlockouts/hub_1.tscn new file mode 100644 index 0000000..3777c42 --- /dev/null +++ b/assets/LevelBlockouts/hub_1.tscn @@ -0,0 +1,188 @@ +[gd_scene load_steps=15 format=3 uid="uid://otkecr0hcyon"] + +[ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="1_48lr2"] +[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="1_ibypk"] +[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_v17bv"] +[ext_resource type="PackedScene" uid="uid://dgvmwyhj43bol" path="res://levels/LevelModels/Hub1.blend" id="2_ibypk"] +[ext_resource type="Resource" uid="uid://bxcxqt7rmfvdw" path="res://GameModes/hubworld.tres" id="2_pxx7p"] +[ext_resource type="PackedScene" uid="uid://c1xw80jkg3reb" path="res://assets/target_1.tscn" id="6_sibpp"] +[ext_resource type="PackedScene" uid="uid://b0y5rqfeh1hb1" path="res://assets/chair_1.tscn" id="7_rgl24"] +[ext_resource type="PackedScene" uid="uid://c0uv33kbndbvy" path="res://assets/trashcan.tscn" id="8_7e18o"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_48lr2"] +sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) +ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) + +[sub_resource type="Sky" id="Sky_ibypk"] +sky_material = SubResource("ProceduralSkyMaterial_48lr2") + +[sub_resource type="Environment" id="Environment_v17bv"] +sky = SubResource("Sky_ibypk") +tonemap_mode = 2 +ssr_enabled = true +ssao_enabled = true +ssil_enabled = true +sdfgi_enabled = true +sdfgi_use_occlusion = true +glow_enabled = true + +[sub_resource type="Animation" id="Animation_sibpp"] +resource_name = "movetargets" +length = 2.0 +loop_mode = 1 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Targets/TARGET 1") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, -43.6355, 2.1683, -6.96668, 1, 1, -43.6355, 8.96575, -6.96668, 2, 1, -43.6355, 2.1683, -6.96668) +tracks/1/type = "position_3d" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Targets/TARGET 2") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = PackedFloat32Array(0, 1, -46.0255, 2.1683, -10.0773, 1, 1, -46.0255, 2.1683, -4.1148, 2, 1, -46.0255, 2.1683, -10.0773) + +[sub_resource type="Animation" id="Animation_v0ka4"] +length = 0.001 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Targets/TARGET 1") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, -43.6355, 2.1683, -6.96668) +tracks/1/type = "position_3d" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Targets/TARGET 2") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = PackedFloat32Array(0, 1, -46.0255, 2.1683, -10.0773) + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_rgl24"] +_data = { +&"RESET": SubResource("Animation_v0ka4"), +&"movetargets": SubResource("Animation_sibpp") +} + +[node name="Hub1" type="Node3D"] +script = ExtResource("1_v17bv") +gamemode = ExtResource("2_pxx7p") + +[node name="Player" parent="." instance=ExtResource("1_ibypk")] + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_v17bv") + +[node name="PostProcessing" parent="." instance=ExtResource("1_48lr2")] + +[node name="Hub1" parent="." instance=ExtResource("2_ibypk")] + +[node name="Lighting" type="Node3D" parent="."] + +[node name="Tubes" type="Node3D" parent="Lighting"] + +[node name="SpotLight3D" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(0.998309, -2.54058e-09, 0.0581216, -0.0581216, -4.36375e-08, 0.998309, 5.18954e-17, -1, -4.37114e-08, 10.1559, 11.3659, -12.0405) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D2" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(0.998309, -2.54058e-09, 0.0581216, -0.0581216, -4.36375e-08, 0.998309, 5.18954e-17, -1, -4.37114e-08, 10.1559, 11.3659, -19.3211) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D3" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(0.998309, -2.54058e-09, 0.0581216, -0.0581216, -4.36375e-08, 0.998309, 5.18954e-17, -1, -4.37114e-08, 10.1559, 11.3659, -27.111) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D4" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(0.998309, -2.54058e-09, 0.0581216, -0.0581216, -4.36375e-08, 0.998309, 5.18954e-17, -1, -4.37114e-08, 10.1559, 11.3659, -34.5115) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D5" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(0.998309, -2.54058e-09, 0.0581216, -0.0581216, -4.36375e-08, 0.998309, 5.18954e-17, -1, -4.37114e-08, 10.1559, 11.3659, -42.2115) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D6" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -10.0905, 11.105, -12.0405) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D7" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -10.0905, 11.105, -19.3211) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D8" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -10.0905, 11.105, -27.111) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D9" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -10.0905, 11.105, -34.5115) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="SpotLight3D10" type="SpotLight3D" parent="Lighting/Tubes"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -10.0905, 11.105, -42.2115) +light_energy = 50.0 +spot_range = 15.0 +spot_angle = 25.0 + +[node name="Targets" type="Node3D" parent="."] + +[node name="TARGET 1" parent="Targets" instance=ExtResource("6_sibpp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -43.6355, 2.1683, -6.96668) + +[node name="TARGET 2" parent="Targets" instance=ExtResource("6_sibpp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46.0255, 2.1683, -10.0773) + +[node name="TARGET 3" parent="Targets" instance=ExtResource("6_sibpp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -48.1931, 4.94289, -5.84218) + +[node name="TARGET 4" parent="Targets" instance=ExtResource("6_sibpp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -48.1931, 2.80981, -21.6811) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Targets"] +root_node = NodePath("../..") +libraries = { +&"": SubResource("AnimationLibrary_rgl24") +} +autoplay = "movetargets" + +[node name="Chair1" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(0.530023, 0, -0.847983, 0, 1, 0, 0.847983, 0, 0.530023, -20.7036, 0.483886, -14.4813) + +[node name="Chair2" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(-0.155193, 0, -0.987884, 0, 1, 0, 0.987884, 0, -0.155193, -21.7106, 0.483886, -8.24392) + +[node name="Chair3" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(-0.155193, 0, -0.987884, 0, 1, 0, 0.987884, 0, -0.155193, -21.2873, 0.483886, -18.0206) + +[node name="Chair4" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(-0.155193, 0, -0.987884, 0, 1, 0, 0.987884, 0, -0.155193, -19.3497, 0.483886, -18.8745) + +[node name="Chair5" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(-0.155193, 0, -0.987884, 0, 1, 0, 0.987884, 0, -0.155193, -21.7155, 0.483886, -22.5843) + +[node name="Chair6" parent="." instance=ExtResource("7_rgl24")] +transform = Transform3D(-0.155193, 0, -0.987884, 0, 1, 0, 0.987884, 0, -0.155193, -17.5182, 0.483886, -19.7189) + +[node name="Trashcan" parent="." instance=ExtResource("8_7e18o")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.3204, 4.76837e-07, -9.563) diff --git a/assets/materials/prototype/CeilingLight.tres b/assets/materials/prototype/CeilingLight.tres index a6dbef5..9122781 100644 --- a/assets/materials/prototype/CeilingLight.tres +++ b/assets/materials/prototype/CeilingLight.tres @@ -13,7 +13,7 @@ metallic = 1.0 roughness = 0.25 emission_enabled = true emission = Color(1, 1, 1, 1) -emission_energy_multiplier = 7.0 +emission_energy_multiplier = 15.0 emission_operator = 1 emission_texture = ExtResource("3_mytvb") normal_enabled = true diff --git a/assets/target_1.tscn b/assets/target_1.tscn index da9f50c..da61523 100644 --- a/assets/target_1.tscn +++ b/assets/target_1.tscn @@ -30,8 +30,4 @@ collision_mask = 128 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] shape = SubResource("BoxShape3D_polhc") -[node name="RayCast3D" type="RayCast3D" parent="."] -target_position = Vector3(0, 0, -1) -collision_mask = 128 - [connection signal="body_entered" from="Area3D" to="." method="_on_area_3d_body_entered"] diff --git a/assets/trashcan.tscn b/assets/trashcan.tscn index 069c560..250259c 100644 --- a/assets/trashcan.tscn +++ b/assets/trashcan.tscn @@ -52,8 +52,9 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_w5ukr") -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_cglky"] -points = PackedVector3Array(-0.537397, -0.103797, -0.0502889, 0.515246, -0.0674347, 0.0482163, 0.537393, -0.103797, 0.0502889, 0.0502871, -0.103797, -0.537397, -0.0706789, 0.0818977, 0.0282887, -0.0502904, -0.103797, 0.537397, 0.218302, 0.0305195, -0.386214, -0.318883, 0.0305195, -0.318987, 0.318985, 0.0305195, 0.318987, -0.318883, 0.0305195, 0.318987, 0.386106, 0.0305195, -0.218304, 0.402939, -0.103797, -0.369381, 0.369379, -0.103797, 0.403048, -0.369382, -0.103797, -0.403048, -0.402943, -0.103797, 0.369381, -0.491988, -0.0189037, 0.0793625, 0.0792479, -0.018901, 0.492005, -0.158646, -0.0189056, -0.476232, -0.38611, 0.0305195, -0.218304, -0.2182, 0.0305195, 0.386214, 0.0706762, 0.0818985, -0.028289, 0.476214, -0.0189084, 0.158772, 0.476213, -0.0189084, -0.158772, 0.218302, 0.0305195, 0.386214, -0.38611, 0.0305195, 0.218304, -0.460949, -0.0189273, -0.20667, -0.206559, -0.0189264, 0.461021, -0.2182, 0.0305195, -0.386214, 0.158643, -0.0189057, -0.476234, 0.386106, 0.0305195, 0.218304, -0.503731, -0.103797, 0.218304, 0.218302, -0.103797, 0.503731) +[sub_resource type="CylinderShape3D" id="CylinderShape3D_fui3e"] +height = 0.0869141 +radius = 0.365234 [sub_resource type="ArrayMesh" id="ArrayMesh_munsv"] _surfaces = [{ @@ -90,7 +91,8 @@ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_munsv") [sub_resource type="CylinderShape3D" id="CylinderShape3D_afykr"] -height = 1.37889 +height = 0.958984 +radius = 0.350586 [node name="Trashcan" type="Node3D" groups=["scene_rigidbody"]] @@ -101,11 +103,13 @@ collision_mask = 253 mass = 5.0 [node name="trashcan1_lid" type="MeshInstance3D" parent="RigidBody3D"] +transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0) mesh = SubResource("ArrayMesh_d6hx0") skeleton = NodePath("") [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] -shape = SubResource("ConvexPolygonShape3D_cglky") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0268555, 0) +shape = SubResource("CylinderShape3D_fui3e") [node name="RigidBody3D2" type="RigidBody3D" parent="." groups=["scene_rigidbody"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.697674, 0) @@ -114,7 +118,7 @@ collision_mask = 253 mass = 10.0 [node name="trashcan1" type="MeshInstance3D" parent="RigidBody3D2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.00291026, 0) +transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, -0.00291026, 0) mesh = SubResource("ArrayMesh_gfwtr") skeleton = NodePath("") diff --git a/levels/LevelModels/Hub1.blend b/levels/LevelModels/Hub1.blend new file mode 100644 index 0000000..00bc02f Binary files /dev/null and b/levels/LevelModels/Hub1.blend differ diff --git a/levels/LevelModels/Hub1.blend.import b/levels/LevelModels/Hub1.blend.import new file mode 100644 index 0000000..57a5ab7 --- /dev/null +++ b/levels/LevelModels/Hub1.blend.import @@ -0,0 +1,72 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dgvmwyhj43bol" +path="res://.godot/imported/Hub1.blend-8ae9e5c7da966ca56e8facab4e339387.scn" + +[deps] + +source_file="res://levels/LevelModels/Hub1.blend" +dest_files=["res://.godot/imported/Hub1.blend-8ae9e5c7da966ca56e8facab4e339387.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={ +"materials": { +"Ceiling": { +"use_external/enabled": true, +"use_external/path": "uid://b6hhomp4kcjvb" +}, +"LightCeiling": { +"use_external/enabled": true, +"use_external/path": "uid://isd7ca2ymvs8" +}, +"TUBE": { +"use_external/enabled": true, +"use_external/path": "uid://cts3y2vxb7osx" +}, +"WALL": { +"use_external/enabled": true, +"use_external/path": "uid://b6hhomp4kcjvb" +} +} +} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/levels/LevelModels/Hub1.blend1 b/levels/LevelModels/Hub1.blend1 new file mode 100644 index 0000000..3cdc9b1 Binary files /dev/null and b/levels/LevelModels/Hub1.blend1 differ diff --git a/project.godot b/project.godot index 9e99c68..9b8024e 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="First Person Test" config/tags=PackedStringArray("fps") -run/main_scene="uid://f7e0v1r6ra6c" +run/main_scene="uid://otkecr0hcyon" config/features=PackedStringArray("4.4", "Forward Plus") config/icon="uid://6svuq1l83al5" diff --git a/scripts/LevelManager.gd b/scripts/LevelManager.gd index 5c7b224..7ea8f51 100644 --- a/scripts/LevelManager.gd +++ b/scripts/LevelManager.gd @@ -2,7 +2,7 @@ extends Node3D class_name level @export var map_name : String = "Map Name" -@export var gamemode : gamemode +@export var gamemode : gamemode = preload("res://GameModes/standard.tres") @export var player : Node @export var MAX_PARTICLES = 100 @export var time_based_sun : DirectionalLight3D