Replace textures and delete old ones

11 files changed, 55 insertions, 143 deletions

diff --git a/ship/staircase_1/staircase.tres b/ship/staircase_1/staircase.tres
index 66f7596..87f6ef3 100644
--- a/ship/staircase_1/staircase.tres
+++ b/ship/staircase_1/staircase.tres
@@ -1,13 +1,21 @@
 [gd_resource type="SpatialMaterial" load_steps=4 format=2]
 
-[ext_resource path="res://ship/staircase_1/staircase_roughness.png" type="Texture" id=1]
-[ext_resource path="res://ship/staircase_1/staircase_albedo.png" type="Texture" id=2]
-[ext_resource path="res://ship/staircase_1/staircase_normal.png" type="Texture" id=3]
+[sub_resource type="StreamTexture" id=1]
+flags = 23
+load_path = "res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.s3tc.stex"
+
+[sub_resource type="StreamTexture" id=2]
+flags = 7
+load_path = "res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.s3tc.stex"
+
+[sub_resource type="StreamTexture" id=3]
+flags = 7
+load_path = "res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.s3tc.stex"
 
 [resource]
-albedo_texture = ExtResource( 2 )
+albedo_texture = SubResource( 1 )
 metallic = 1.0
-roughness_texture = ExtResource( 1 )
+roughness_texture = SubResource( 3 )
 normal_enabled = true
 normal_scale = 1.0
-normal_texture = ExtResource( 3 )
+normal_texture = SubResource( 2 )
diff --git a/ship/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn
index adc5a52..2ad5704 100644
--- a/ship/staircase_1/staircase_1.tscn
+++ b/ship/staircase_1/staircase_1.tscn
@@ -1,7 +1,16 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://ship/staircase_1/staircase_1.gltf" type="PackedScene" id=1]
-[ext_resource path="res://ship/staircase_1/staircase.tres" type="Material" id=2]
+[ext_resource path="res://ship/staircase_1/textures/staircase_1_staircase_BaseColor.png" type="Texture" id=2]
+[ext_resource path="res://ship/staircase_1/textures/staircase_1_staircase_Roughness.png" type="Texture" id=3]
+[ext_resource path="res://ship/staircase_1/textures/staircase_1_staircase_Normal.png" type="Texture" id=4]
+
+[sub_resource type="SpatialMaterial" id=2]
+albedo_texture = ExtResource( 2 )
+roughness_texture = ExtResource( 3 )
+normal_enabled = true
+normal_scale = -1.0
+normal_texture = ExtResource( 4 )
 
 [sub_resource type="ConvexPolygonShape" id=1]
 points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2.32941, 1.80455, -1.87224, -2.97945, -1.80455, -1.87224, 2.32838, 1.80455, -1.33747, -2.32941, -1.80455, 1.87224, 1.66328, 1.80455, -1.87224, 2.32838, -1.80455, 1.87224, 2.32838, 1.80455, 1.87224, 1.66328, 1.80455, 1.87224, 2.32838 )
@@ -9,7 +18,7 @@ points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2.
 [node name="staircase_1" instance=ExtResource( 1 )]
 
 [node name="stairs" parent="." index="0"]
-material/0 = ExtResource( 2 )
+material/0 = SubResource( 2 )
 
 [node name="StaticBody" type="StaticBody" parent="stairs" index="0"]
 collision_layer = 4
diff --git a/ship/staircase_1/staircase_albedo.png b/ship/staircase_1/staircase_albedo.png
deleted file mode 100644
index a9307b5..0000000
--- a/ship/staircase_1/staircase_albedo.png
+++ /dev/null
diff --git a/ship/staircase_1/staircase_albedo.png.import b/ship/staircase_1/staircase_albedo.png.import
deleted file mode 100644
index 64dce04..0000000
--- a/ship/staircase_1/staircase_albedo.png.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.s3tc.stex"
-path.etc2="res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://ship/staircase_1/staircase_albedo.png"
-dest_files=[ "res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.s3tc.stex", "res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.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
diff --git a/ship/staircase_1/staircase_normal.png b/ship/staircase_1/staircase_normal.png
deleted file mode 100644
index 8528ad2..0000000
--- a/ship/staircase_1/staircase_normal.png
+++ /dev/null
diff --git a/ship/staircase_1/staircase_normal.png.import b/ship/staircase_1/staircase_normal.png.import
deleted file mode 100644
index 1fe6cb0..0000000
--- a/ship/staircase_1/staircase_normal.png.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.s3tc.stex"
-path.etc2="res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://ship/staircase_1/staircase_normal.png"
-dest_files=[ "res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.s3tc.stex", "res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.etc2.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=1
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
-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
diff --git a/ship/staircase_1/staircase_roughness.png b/ship/staircase_1/staircase_roughness.png
deleted file mode 100644
index f80e5d9..0000000
--- a/ship/staircase_1/staircase_roughness.png
+++ /dev/null
diff --git a/ship/staircase_1/staircase_roughness.png.import b/ship/staircase_1/staircase_roughness.png.import
deleted file mode 100644
index 5752474..0000000
--- a/ship/staircase_1/staircase_roughness.png.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.s3tc.stex"
-path.etc2="res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://ship/staircase_1/staircase_roughness.png"
-dest_files=[ "res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.s3tc.stex", "res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.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=2
-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
diff --git a/ship/staircase_1/textures/staircase_1_staircase_BaseColor.png.import b/ship/staircase_1/textures/staircase_1_staircase_BaseColor.png.import
index 0db7004..710e984 100644
--- a/ship/staircase_1/textures/staircase_1_staircase_BaseColor.png.import
+++ b/ship/staircase_1/textures/staircase_1_staircase_BaseColor.png.import
@@ -2,28 +2,30 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.stex"
+path.s3tc="res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.s3tc.stex"
+path.etc2="res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://ship/staircase_1/textures/staircase_1_staircase_BaseColor.png"
-dest_files=[ "res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.stex" ]
+dest_files=[ "res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.s3tc.stex", "res://.import/staircase_1_staircase_BaseColor.png-3d42c11e23e980a18756ce1acd303b41.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
diff --git a/ship/staircase_1/textures/staircase_1_staircase_Normal.png.import b/ship/staircase_1/textures/staircase_1_staircase_Normal.png.import
index 0d1de93..12e1b3b 100644
--- a/ship/staircase_1/textures/staircase_1_staircase_Normal.png.import
+++ b/ship/staircase_1/textures/staircase_1_staircase_Normal.png.import
@@ -2,26 +2,28 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.stex"
+path.s3tc="res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.s3tc.stex"
+path.etc2="res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://ship/staircase_1/textures/staircase_1_staircase_Normal.png"
-dest_files=[ "res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.stex" ]
+dest_files=[ "res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.s3tc.stex", "res://.import/staircase_1_staircase_Normal.png-2ac835b072124c5425c7fc17d4c94623.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
+compress/normal_map=1
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
 flags/srgb=2
 process/fix_alpha_border=true
@@ -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
diff --git a/ship/staircase_1/textures/staircase_1_staircase_Roughness.png.import b/ship/staircase_1/textures/staircase_1_staircase_Roughness.png.import
index ec91528..65b8124 100644
--- a/ship/staircase_1/textures/staircase_1_staircase_Roughness.png.import
+++ b/ship/staircase_1/textures/staircase_1_staircase_Roughness.png.import
@@ -2,26 +2,28 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.stex"
+path.s3tc="res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.s3tc.stex"
+path.etc2="res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://ship/staircase_1/textures/staircase_1_staircase_Roughness.png"
-dest_files=[ "res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.stex" ]
+dest_files=[ "res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.s3tc.stex", "res://.import/staircase_1_staircase_Roughness.png-c9e58f442ec7dcdae4fbb231dfcb00c5.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
 process/fix_alpha_border=true
@@ -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