Merge branch 'fix/maps' into 'develop'

🔥 remove genesis

See merge request open-fpsz/open-fpsz!94

maps/genesis/assets/textures/ground037_alb_ht.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ddprscrpsofah"
-path.bptc="res://.godot/imported/ground037_alb_ht.png-b65037b7797c79d182d5e53b32e49a98.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/genesis/assets/textures/ground037_alb_ht.png"
-dest_files=["res://.godot/imported/ground037_alb_ht.png-b65037b7797c79d182d5e53b32e49a98.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=2
-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=1

maps/genesis/assets/textures/ground037_nrm_rgh.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c1ots7w6i0i1q"
-path.bptc="res://.godot/imported/ground037_nrm_rgh.png-9e25ec612e0ce15ff2c117ec4096a8f7.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/genesis/assets/textures/ground037_nrm_rgh.png"
-dest_files=["res://.godot/imported/ground037_nrm_rgh.png-9e25ec612e0ce15ff2c117ec4096a8f7.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=1
-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=1

maps/genesis/assets/textures/rock030_alb_ht.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://br7bfxcxh60df"
-path.bptc="res://.godot/imported/rock030_alb_ht.png-264f70712792662fedd23fe3bac9e221.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/genesis/assets/textures/rock030_alb_ht.png"
-dest_files=["res://.godot/imported/rock030_alb_ht.png-264f70712792662fedd23fe3bac9e221.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=2
-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=1

maps/genesis/assets/textures/rock030_nrm_rgh.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cr72kjil43vgj"
-path.bptc="res://.godot/imported/rock030_nrm_rgh.png-ca17d43269b25394f8e7aa1fa0631681.bptc.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/genesis/assets/textures/rock030_nrm_rgh.png"
-dest_files=["res://.godot/imported/rock030_nrm_rgh.png-ca17d43269b25394f8e7aa1fa0631681.bptc.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=true
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=1
-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=1

maps/genesis/genesis.tscn

@@ -1,39 +0,0 @@
-[gd_scene load_steps=6 format=3 uid="uid://chbno00ugl6te"]
-
-[ext_resource type="Terrain3DStorage" uid="uid://dyon4xda4k40d" path="res://maps/genesis/resources/storage.res" id="1_a88qe"]
-[ext_resource type="Terrain3DMaterial" uid="uid://bd4lr5sxu8xu" path="res://maps/genesis/resources/material.res" id="2_o2y3d"]
-[ext_resource type="Terrain3DTextureList" uid="uid://dnqa8kxgm3xuw" path="res://maps/genesis/resources/textures.res" id="3_1cww7"]
-[ext_resource type="Environment" uid="uid://d2ahijqqspw5f" path="res://maps/genesis/resources/env.tres" id="5_3klr3"]
-[ext_resource type="PackedScene" uid="uid://brux62vritay" path="res://entities/buildings/flag_stand.tscn" id="5_4kwtt"]
-
-[node name="Genesis" type="Terrain3D"]
-storage = ExtResource("1_a88qe")
-material = ExtResource("2_o2y3d")
-texture_list = ExtResource("3_1cww7")
-collision_layer = 2147483648
-collision_mask = 2147483648
-mesh_size = 24
-
-[node name="Sunlight" type="DirectionalLight3D" parent="."]
-transform = Transform3D(-0.866024, -0.433016, 0.25, 0, 0.499998, 0.866027, -0.500003, 0.75, -0.43301, 0, 100, 0)
-shadow_enabled = true
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = ExtResource("5_3klr3")
-
-[node name="PlayerSpawns" type="Node" parent="."]
-
-[node name="Spawn1" type="Marker3D" parent="PlayerSpawns"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 95.5378, -32.735)
-
-[node name="Spawn2" type="Marker3D" parent="PlayerSpawns"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 98.3078, 18.061)
-
-[node name="FlagStand" type="Marker3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.847419, 94.7914, -0.106026)
-
-[node name="FlagPillar" parent="." instance=ExtResource("5_4kwtt")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.849599, 92.7505, -0.104984)
-
-[node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 1440, 0)

maps/genesis/resources/env.tres

@@ -1,41 +0,0 @@
-[gd_resource type="Environment" load_steps=4 format=3 uid="uid://d2ahijqqspw5f"]
-
-[ext_resource type="Texture2D" uid="uid://btdbu0qbe1646" path="res://environments/skyboxes/kloppenheim_06_puresky_2k.exr" id="1_k44rf"]
-
-[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_7tawh"]
-panorama = ExtResource("1_k44rf")
-
-[sub_resource type="Sky" id="Sky_iloxd"]
-sky_material = SubResource("PanoramaSkyMaterial_7tawh")
-process_mode = 1
-radiance_size = 4
-
-[resource]
-background_mode = 2
-background_energy_multiplier = 0.2
-sky = SubResource("Sky_iloxd")
-ambient_light_source = 3
-tonemap_mode = 3
-tonemap_exposure = 0.6
-tonemap_white = 0.6
-ssao_intensity = 5.0
-ssil_intensity = 5.0
-ssil_sharpness = 0.7
-sdfgi_use_occlusion = true
-sdfgi_cascades = 6
-sdfgi_max_distance = 819.2
-sdfgi_y_scale = 0
-glow_normalized = true
-glow_intensity = 2.0
-glow_strength = 0.96
-fog_light_color = Color(1, 1, 1, 1)
-fog_light_energy = 0.5
-fog_density = 0.001
-fog_sky_affect = 0.3
-fog_height = 85.0
-fog_height_density = 0.01
-volumetric_fog_density = 0.003
-volumetric_fog_albedo = Color(1, 0.380392, 0.380392, 1)
-volumetric_fog_emission_energy = 192.23
-volumetric_fog_length = 551.32
-volumetric_fog_ambient_inject = 0.37

maps/maps.tres

@@ -1,9 +1,8 @@
-[gd_resource type="Resource" script_class="ArrayPackedSceneResource" load_steps=4 format=3 uid="uid://dut5f1sq0wfeb"]
+[gd_resource type="Resource" script_class="ArrayPackedSceneResource" load_steps=3 format=3 uid="uid://dut5f1sq0wfeb"]
 
-[ext_resource type="PackedScene" uid="uid://chbno00ugl6te" path="res://maps/genesis/genesis.tscn" id="1_7kpvp"]
 [ext_resource type="PackedScene" uid="uid://btlkog4b87p4x" path="res://maps/desert/desert.tscn" id="2_8vsif"]
 [ext_resource type="Script" path="res://types/resources/array_packed_scene.gd" id="3_by6r1"]
 
 [resource]
 script = ExtResource("3_by6r1")
-_packed_scenes = Array[PackedScene]([ExtResource("1_7kpvp"), ExtResource("2_8vsif")])
+_packed_scenes = Array[PackedScene]([ExtResource("2_8vsif")])