diff --git a/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg b/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg new file mode 100644 index 0000000..9083a52 Binary files /dev/null and b/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg differ diff --git a/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg.import b/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg.import new file mode 100644 index 0000000..15ef16b --- /dev/null +++ b/assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bq8mglmluruk0" +path.s3tc="res://.godot/imported/39_asphalt roof texture seamless_hr.jpg-a88600fce1cfc6eada891c27f67b7fd3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg" +dest_files=["res://.godot/imported/39_asphalt roof texture seamless_hr.jpg-a88600fce1cfc6eada891c27f67b7fd3.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/Textures/Industrial/Marble1.zip b/assets/Textures/Industrial/Marble1.zip deleted file mode 100644 index 5e42d5d..0000000 Binary files a/assets/Textures/Industrial/Marble1.zip and /dev/null differ diff --git a/assets/Textures/Industrial/Tile1.zip b/assets/Textures/Industrial/Tile1.zip deleted file mode 100644 index c264086..0000000 Binary files a/assets/Textures/Industrial/Tile1.zip and /dev/null differ diff --git a/assets/fonts/NEON____.TTF b/assets/fonts/NEON____.TTF new file mode 100644 index 0000000..def4a3a Binary files /dev/null and b/assets/fonts/NEON____.TTF differ diff --git a/assets/fonts/NEON____.TTF.import b/assets/fonts/NEON____.TTF.import new file mode 100644 index 0000000..295b969 --- /dev/null +++ b/assets/fonts/NEON____.TTF.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://b1l83u88alvb0" +path="res://.godot/imported/NEON____.TTF-0e38569011dc52d013e5a59c5c12adda.fontdata" + +[deps] + +source_file="res://assets/fonts/NEON____.TTF" +dest_files=["res://.godot/imported/NEON____.TTF-0e38569011dc52d013e5a59c5c12adda.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/materials/NEONPINK.tres b/assets/materials/NEONPINK.tres new file mode 100644 index 0000000..5d96c29 --- /dev/null +++ b/assets/materials/NEONPINK.tres @@ -0,0 +1,9 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://c367gg3d5hbpk"] + +[resource] +albedo_color = Color(0.764706, 0.101961, 0.419608, 1) +metallic = 1.0 +roughness = 0.5 +emission_enabled = true +emission = Color(0.762831, 0.102312, 0.421329, 1) +emission_energy_multiplier = 5.0 diff --git a/assets/materials/NEONYELLOW.tres b/assets/materials/NEONYELLOW.tres new file mode 100644 index 0000000..aa38313 --- /dev/null +++ b/assets/materials/NEONYELLOW.tres @@ -0,0 +1,9 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://b7rm1ie4gytbk"] + +[resource] +albedo_color = Color(0.877007, 0.645295, 0.218137, 1) +metallic = 1.0 +roughness = 0.5 +emission_enabled = true +emission = Color(0.878431, 0.647059, 0.219608, 1) +emission_energy_multiplier = 5.0 diff --git a/assets/materials/prototype/asphaltRoof.tres b/assets/materials/prototype/asphaltRoof.tres new file mode 100644 index 0000000..8dd3965 --- /dev/null +++ b/assets/materials/prototype/asphaltRoof.tres @@ -0,0 +1,18 @@ +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://banax4x6uilxg"] + +[ext_resource type="Texture2D" uid="uid://bq8mglmluruk0" path="res://assets/Textures/Industrial/39_asphalt roof texture seamless_hr.jpg" id="1_xkx0e"] +[ext_resource type="Texture2D" uid="uid://ynttogfie4fn" path="res://assets/Textures/Industrial/Marble1/105_slab granite-AO.jpg" id="2_rps0l"] +[ext_resource type="Texture2D" uid="uid://ceclvxpreuax7" path="res://assets/materials/94_tadao ando concrete plates-seamless_hr/94_tadao ando concrete_DISPL (Custom).jpg" id="3_kutn1"] +[ext_resource type="Texture2D" uid="uid://d3lj4w73cmx6m" path="res://assets/Textures/Industrial/Marble1/105_slab granite_NORM.jpg" id="4_my7q3"] + +[resource] +albedo_texture = ExtResource("1_xkx0e") +normal_texture = ExtResource("4_my7q3") +ao_light_affect = 1.0 +ao_texture = ExtResource("2_rps0l") +heightmap_deep_parallax = true +heightmap_min_layers = 8 +heightmap_max_layers = 32 +heightmap_texture = ExtResource("3_kutn1") +uv1_scale = Vector3(6.22, 6.22, 6.22) +texture_filter = 4 diff --git a/assets/new_shader_material.tres b/assets/new_shader_material.tres new file mode 100644 index 0000000..8966cd2 --- /dev/null +++ b/assets/new_shader_material.tres @@ -0,0 +1,3 @@ +[gd_resource type="ShaderMaterial" format=3 uid="uid://bw7s1d3603y44"] + +[resource] diff --git a/levels/Restaurant.blend b/levels/Restaurant.blend index 1dc71ec..886712f 100644 Binary files a/levels/Restaurant.blend and b/levels/Restaurant.blend differ diff --git a/levels/Restaurant.blend.import b/levels/Restaurant.blend.import index 2f7177b..4e522ae 100644 --- a/levels/Restaurant.blend.import +++ b/levels/Restaurant.blend.import @@ -50,6 +50,22 @@ _subresources={ "use_external/enabled": true, "use_external/path": "uid://hg5phpsguoh5" }, +"METAL": { +"use_external/enabled": true, +"use_external/path": "uid://cts3y2vxb7osx" +}, +"NeonPink": { +"use_external/enabled": true, +"use_external/path": "uid://c367gg3d5hbpk" +}, +"NeonYellow": { +"use_external/enabled": true, +"use_external/path": "uid://b7rm1ie4gytbk" +}, +"Roof": { +"use_external/enabled": true, +"use_external/path": "uid://banax4x6uilxg" +}, "Walls1": { "use_external/enabled": true, "use_external/path": "uid://o5nsj4glt0wa" diff --git a/levels/Restaurant.blend.unwrap_cache b/levels/Restaurant.blend.unwrap_cache index 328c1a0..8a4a0f9 100644 Binary files a/levels/Restaurant.blend.unwrap_cache and b/levels/Restaurant.blend.unwrap_cache differ diff --git a/levels/Restaurant.blend1 b/levels/Restaurant.blend1 index 4378ee5..ac5a673 100644 Binary files a/levels/Restaurant.blend1 and b/levels/Restaurant.blend1 differ diff --git a/levels/restaurant1.exr b/levels/restaurant1.exr index 9e745e1..4964d53 100644 Binary files a/levels/restaurant1.exr and b/levels/restaurant1.exr differ diff --git a/levels/restaurant1.lmbake b/levels/restaurant1.lmbake index 92284d1..abd3d26 100644 Binary files a/levels/restaurant1.lmbake and b/levels/restaurant1.lmbake differ diff --git a/levels/restaurant1.tscn b/levels/restaurant1.tscn index 348d037..a4b3907 100644 --- a/levels/restaurant1.tscn +++ b/levels/restaurant1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://br5eo7d1ttenb"] +[gd_scene load_steps=18 format=3 uid="uid://br5eo7d1ttenb"] [ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_wjlww"] [ext_resource type="PackedScene" uid="uid://be3j4isp6stxj" path="res://levels/Restaurant.blend" id="2_wjlww"] @@ -8,6 +8,11 @@ [ext_resource type="LightmapGIData" uid="uid://d6mpqnw8qo47" path="res://levels/restaurant1.lmbake" id="6_2aaaf"] [ext_resource type="PackedScene" uid="uid://24slv0pyxcd5" path="res://assets/level_bounds.tscn" id="7_rh5fc"] [ext_resource type="PackedScene" uid="uid://b3cvkki82xhhl" path="res://restaurant_light.tscn" id="8_wic7t"] +[ext_resource type="PackedScene" uid="uid://ctdq7edxwbmhf" path="res://table_setup.tscn" id="9_2aaaf"] +[ext_resource type="PackedScene" uid="uid://co12h258tg1ud" path="res://assets/wet_floor_sign.tscn" id="10_aii4r"] +[ext_resource type="PackedScene" uid="uid://c0uv33kbndbvy" path="res://assets/trashcan.tscn" id="11_kjn31"] +[ext_resource type="PackedScene" uid="uid://cgo4qyul7ix5p" path="res://assets/ladder.tscn" id="12_vj1wv"] +[ext_resource type="PackedScene" uid="uid://cdpxctwwi12j" path="res://assets/ladder_collision_check.tscn" id="13_tcglg"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_rh5fc"] panorama = ExtResource("3_3b4a6") @@ -23,7 +28,6 @@ tonemap_mode = 4 ssr_enabled = true ssao_enabled = true ssil_enabled = true -sdfgi_read_sky_light = false glow_enabled = true glow_intensity = 0.5 glow_blend_mode = 1 @@ -31,7 +35,7 @@ volumetric_fog_enabled = true volumetric_fog_density = 0.0215 [sub_resource type="BoxShape3D" id="BoxShape3D_wic7t"] -size = Vector3(60.7705, 62.086, 70.7734) +size = Vector3(196.588, 86.2427, 220.99) [node name="Restaurant" type="Node3D"] script = ExtResource("1_wjlww") @@ -39,6 +43,7 @@ script = ExtResource("1_wjlww") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.504528, 0.495223, -0.707252, 0, 0.819152, 0.573576, 0.863396, -0.289385, 0.413285, 0, 0, 0) light_color = Color(0.720673, 0.686034, 0.73399, 1) +light_bake_mode = 1 shadow_enabled = true [node name="Restaurant" parent="." instance=ExtResource("2_wjlww")] @@ -261,14 +266,20 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.02282, 4.13854, -18.6843) [node name="LevelBounds" parent="." instance=ExtResource("7_rh5fc")] [node name="CollisionShape3D" type="CollisionShape3D" parent="LevelBounds"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -14.5233, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.44495, 0) shape = SubResource("BoxShape3D_wic7t") [node name="RestaurantLight" parent="." instance=ExtResource("8_wic7t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.429829, 6.37716, 14.4138) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.429829, 6.37716, 10.9897) [node name="RestaurantLight2" parent="." instance=ExtResource("8_wic7t")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.2482, 6.37716, 14.4138) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.2482, 6.37716, 10.7229) + +[node name="RestaurantLight11" parent="." instance=ExtResource("8_wic7t")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.429829, 6.37716, 19.704) + +[node name="RestaurantLight12" parent="." instance=ExtResource("8_wic7t")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.2482, 6.37716, 19.4373) [node name="RestaurantLight3" parent="." instance=ExtResource("8_wic7t")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0282, 6.37716, 14.4138) @@ -293,3 +304,81 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.2482, 6.37716, -7.11068) [node name="RestaurantLight9" parent="." instance=ExtResource("8_wic7t")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.0282, 6.37716, -7.11068) + +[node name="TableSetup" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3708, -0.274829, 1.75654) + +[node name="TableSetup2" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.6683, -0.27483, -0.545584) + +[node name="TableSetup3" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.774, -0.27483, -3.21804) + +[node name="TableSetup4" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.42388, -0.274829, 1.75654) + +[node name="TableSetup5" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.7214, -0.27483, -0.545584) + +[node name="TableSetup6" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.82707, -0.27483, -3.21804) + +[node name="TableSetup7" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.80634, -0.274829, 1.75654) + +[node name="TableSetup8" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.10387, -0.27483, -0.545584) + +[node name="TableSetup9" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.20954, -0.27483, -3.21804) + +[node name="TableSetup10" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.10842, -0.274829, 1.75654) + +[node name="TableSetup11" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.810897, -0.27483, -0.545584) + +[node name="TableSetup12" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.705233, -0.27483, -3.21804) + +[node name="TableSetup13" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.227, -0.274829, -0.783487) + +[node name="TableSetup14" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.5245, -0.274829, -3.08561) + +[node name="TableSetup15" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.6302, -0.274829, -5.75807) + +[node name="TableSetup16" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.7761, -0.274829, -4.96502) + +[node name="TableSetup17" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.0736, -0.274829, -7.26714) + +[node name="TableSetup18" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.1793, -0.274829, -9.9396) + +[node name="TableSetup19" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(0.150484, 0, 0.988612, 0, 1, 0, -0.988612, 0, 0.150484, 3.51849, -0.274829, -10.522) + +[node name="TableSetup20" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(0.150484, 0, 0.988612, 0, 1, 0, -0.988612, 0, 0.150484, 1.19781, -0.27483, -10.5743) + +[node name="TableSetup21" parent="." instance=ExtResource("9_2aaaf")] +transform = Transform3D(0.150484, 0, 0.988612, 0, 1, 0, -0.988612, 0, 0.150484, -1.46012, -0.27483, -10.872) + +[node name="RigidBody3D" parent="." instance=ExtResource("10_aii4r")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.6261, -0.275091, 6.10237) + +[node name="Trashcan" parent="." instance=ExtResource("11_kjn31")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.5875, -0.27509, 20.9447) + +[node name="Ladder" parent="." instance=ExtResource("12_vj1wv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.1232, 0.469022, -13.7524) + +[node name="Ladder2" parent="." instance=ExtResource("12_vj1wv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.1232, 4.3643, -13.7524) + +[node name="LadderCollisionCheck" parent="." instance=ExtResource("13_tcglg")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.6555, -0.495995, -14.0424) diff --git a/table_setup.tscn b/table_setup.tscn new file mode 100644 index 0000000..d308738 --- /dev/null +++ b/table_setup.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=3 format=3 uid="uid://ctdq7edxwbmhf"] + +[ext_resource type="PackedScene" uid="uid://c8tmxis8mboaw" path="res://assets/card_table_1.tscn" id="1_oxnq4"] +[ext_resource type="PackedScene" uid="uid://b0y5rqfeh1hb1" path="res://assets/chair_1.tscn" id="2_whvp1"] + +[node name="TableSetup" type="Node3D"] + +[node name="CardTable1" parent="." instance=ExtResource("1_oxnq4")] + +[node name="Chair1" parent="." instance=ExtResource("2_whvp1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.440416, 0.554842, -0.651336) + +[node name="Chair2" parent="." instance=ExtResource("2_whvp1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.455538, 0.554842, -0.651336) + +[node name="Chair3" parent="." instance=ExtResource("2_whvp1")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.455153, 0.554842, 0.516011) + +[node name="Chair4" parent="." instance=ExtResource("2_whvp1")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.440031, 0.554842, 0.553155)