Housekeeping for all the new stuff that diverged from the reorganization

15 files changed, 86 insertions, 12 deletions

diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png b/ship/steering_wheel/steering_wheel Base Color.png
index 44c9ecc..44c9ecc 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png
+++ b/ship/steering_wheel/steering_wheel Base Color.png
diff --git a/ship/steering_wheel/steering_wheel Base Color.png.import b/ship/steering_wheel/steering_wheel Base Color.png.import
new file mode 100644
index 0000000..93e7b65
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel Base Color.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.s3tc.stex"
+path.etc2="res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://ship/steering_wheel/steering_wheel Base Color.png"
+dest_files=[ "res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.s3tc.stex", "res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.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/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
index 49fd7e7..49fd7e7 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
+++ b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
index 56d470e..7f99b36 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
+++ b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.s3tc.stex"
-path.etc2="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.etc2.stex"
+path.s3tc="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.s3tc.stex"
+path.etc2="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png"
-dest_files=[ "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.s3tc.stex", "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.etc2.stex" ]
+source_file="res://ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png"
+dest_files=[ "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.s3tc.stex", "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.bin b/ship/steering_wheel/steering_wheel.bin
index f272eb9..f272eb9 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.bin
+++ b/ship/steering_wheel/steering_wheel.bin
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.blend b/ship/steering_wheel/steering_wheel.blend
index bce19f4..bce19f4 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.blend
+++ b/ship/steering_wheel/steering_wheel.blend
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf b/ship/steering_wheel/steering_wheel.gltf
index 3d10611..3d10611 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf
+++ b/ship/steering_wheel/steering_wheel.gltf
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf.import b/ship/steering_wheel/steering_wheel.gltf.import
index d48c4db..2ab9597 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf.import
+++ b/ship/steering_wheel/steering_wheel.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/steering_wheel.gltf-ae6a572489edba296e4f41e4b6ace54c.scn"
+path="res://.import/steering_wheel.gltf-b473a10cd0a382f35f1b44a743f53c9e.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel.gltf"
-dest_files=[ "res://.import/steering_wheel.gltf-ae6a572489edba296e4f41e4b6ace54c.scn" ]
+source_file="res://ship/steering_wheel/steering_wheel.gltf"
+dest_files=[ "res://.import/steering_wheel.gltf-b473a10cd0a382f35f1b44a743f53c9e.scn" ]
 
 [params]
 
diff --git a/ship/steering_wheel/steering_wheel.material b/ship/steering_wheel/steering_wheel.material
new file mode 100644
index 0000000..c8d8689
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel.material
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.tscn b/ship/steering_wheel/steering_wheel.tscn
index 40665f8..3daae1a 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.tscn
+++ b/ship/steering_wheel/steering_wheel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/steering_wheel/steering_wheel.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/steering_wheel/steering_wheel.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.307949, 0.17495, 0.136091 )
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png b/ship/steering_wheel/steering_wheel_normal.png
index 2db7484..2db7484 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png
+++ b/ship/steering_wheel/steering_wheel_normal.png
diff --git a/ship/steering_wheel/steering_wheel_normal.png.import b/ship/steering_wheel/steering_wheel_normal.png.import
new file mode 100644
index 0000000..26a746a
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel_normal.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.s3tc.stex"
+path.etc2="res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://ship/steering_wheel/steering_wheel_normal.png"
+dest_files=[ "res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.s3tc.stex", "res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.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/steering_wheel/wheel_base.material b/ship/steering_wheel/wheel_base.material
new file mode 100644
index 0000000..af3f0b8
--- /dev/null
+++ b/ship/steering_wheel/wheel_base.material
diff --git a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png b/ship/steering_wheel/wheel_base_normal.png
index 465fb33..465fb33 100644
--- a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png
+++ b/ship/steering_wheel/wheel_base_normal.png
diff --git a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png.import b/ship/steering_wheel/wheel_base_normal.png.import
index 4b6041a..ca99859 100644
--- a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png.import
+++ b/ship/steering_wheel/wheel_base_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.s3tc.stex"
-path.etc2="res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.etc2.stex"
+path.s3tc="res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.s3tc.stex"
+path.etc2="res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/wheel_base_normal.png"
-dest_files=[ "res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.s3tc.stex", "res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.etc2.stex" ]
+source_file="res://ship/steering_wheel/wheel_base_normal.png"
+dest_files=[ "res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.s3tc.stex", "res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.etc2.stex" ]
 
 [params]