Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper

Levels/Level02.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://Textures/kenney_prototype_textures/red/texture_01.png" type="Texture" id=1]
 [ext_resource path="res://Textures/kenney_prototype_textures/orange/texture_01.png" type="Texture" id=2]
@@ -10,6 +10,8 @@
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8]
 [ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=9]
 [ext_resource path="res://Scenes/InfoScreen.tscn" type="PackedScene" id=10]
+[ext_resource path="res://Textures/ARA.png" type="Texture" id=11]
+[ext_resource path="res://Materials/Metal_Mat.tres" type="Material" id=12]
 
 [sub_resource type="SpatialMaterial" id=1]
 albedo_texture = ExtResource( 2 )
@@ -27,9 +29,23 @@ uv1_triplanar = true
 albedo_texture = ExtResource( 1 )
 uv1_triplanar = true
 
-[sub_resource type="SpatialMaterial" id=5]
-albedo_texture = ExtResource( 1 )
-uv1_triplanar = true
+[sub_resource type="CylinderMesh" id=12]
+top_radius = 0.25
+bottom_radius = 0.25
+height = 10.257
+radial_segments = 6
+rings = 1
+
+[sub_resource type="QuadMesh" id=13]
+size = Vector2( 3, 3 )
+
+[sub_resource type="SpatialMaterial" id=14]
+flags_transparent = true
+params_diffuse_mode = 4
+params_specular_mode = 3
+albedo_texture = ExtResource( 11 )
+metallic = 0.2
+roughness = 0.95
 
 [sub_resource type="DynamicFont" id=8]
 size = 64
@@ -103,13 +119,18 @@ width = 20.8555
 height = 10.0608
 material = SubResource( 4 )
 
-[node name="CSGBox5" type="CSGBox" parent="CSGCombiner"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.3921, -0.351473, -0.361702 )
-height = 15.2222
-material = SubResource( 5 )
+[node name="poto" type="CSGMesh" parent="CSGCombiner"]
+transform = Transform( 0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, -0.57024, 2.77988, -0.000139336 )
+mesh = SubResource( 12 )
+material = ExtResource( 12 )
+
+[node name="pancarte" type="MeshInstance" parent="CSGCombiner"]
+transform = Transform( -0.997261, 0, -0.0739519, 0, 1, 0, 0.0739519, 0, -0.997261, -0.538365, 5.81842, -0.311056 )
+mesh = SubResource( 13 )
+material/0 = SubResource( 14 )
 
 [node name="Player" parent="." instance=ExtResource( 5 )]
-transform = Transform( -0.656112, 0, -0.754664, 0, 1, 0, 0.754664, 0, -0.656112, 0.792524, 4.26204, -33.907 )
+transform = Transform( -0.774503, 0, -0.63257, 0, 1, 0, 0.63257, 0, -0.774503, 2.806, 4.235, -33.907 )
 
 [node name="Enemy" parent="." instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.311301, 5.60897, -25.7954 )
@@ -140,7 +161,8 @@ volume_db = -3.0
 bus = "Music"
 
 [node name="Sun" type="DirectionalLight" parent="."]
-transform = Transform( -0.897916, 0.257019, -0.357335, 0.170954, 0.951718, 0.254964, 0.405613, 0.167849, -0.898502, -33.0059, 16.9772, -31.8496 )
+transform = Transform( -0.950672, 0.228075, -0.210247, 0.170753, 0.950626, 0.259139, 0.25897, 0.210456, -0.942679, -33.0059, 16.9772, -31.8496 )
+directional_shadow_mode = 1
 
 [node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
 environment = SubResource( 10 )

Materials/Metal_Mat.tres

@@ -0,0 +1,10 @@
+[gd_resource type="SpatialMaterial" load_steps=2 format=2]
+
+[ext_resource path="res://Textures/Custom/Metal_Albedo.png" type="Texture" id=1]
+
+[resource]
+params_diffuse_mode = 4
+params_specular_mode = 3
+albedo_texture = ExtResource( 1 )
+metallic = 0.58
+roughness = 0.75

Textures/ARA.png.import

@@ -2,28 +2,30 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.stex"
+path.s3tc="res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.s3tc.stex"
+path.etc2="res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Textures/ARA.png"
-dest_files=[ "res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.stex" ]
+dest_files=[ "res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.s3tc.stex", "res://.import/ARA.png-75f03cc33639c95bb83956471f5fc184.etc2.stex" ]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
@@ -31,5 +33,5 @@ process/invert_color=false
 process/normal_map_invert_y=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0

Textures/Custom/Metal_Albedo.png.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Metal_Albedo.png-e5516d50e8a3f21a16035764fc8d6966.s3tc.stex"
+path.etc2="res://.import/Metal_Albedo.png-e5516d50e8a3f21a16035764fc8d6966.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Custom/Metal_Albedo.png"
+dest_files=[ "res://.import/Metal_Albedo.png-e5516d50e8a3f21a16035764fc8d6966.s3tc.stex", "res://.import/Metal_Albedo.png-e5516d50e8a3f21a16035764fc8d6966.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0