Merge pull request 'Update the Spyglass mesh, push textures and all lods' (#59) from feature/spyglass into dev

Reviewed-on: Athena/game-source#59

assets/props/spyglass/sm_spyglass_lod0.gltf.import

@@ -2,21 +2,21 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/spyglass.gltf-f88c2aed065225936fc295c1654b7c4b.scn"
+path="res://.import/sm_spyglass_lod0.gltf-610423e93fbec4adcf8888435957929a.scn"
 
 [deps]
 
-source_file="res://assets/props/spyglass/spyglass.gltf"
+source_file="res://assets/props/spyglass/sm_spyglass_lod0.gltf"
-dest_files=[ "res://.import/spyglass.gltf-f88c2aed065225936fc295c1654b7c4b.scn" ]
+dest_files=[ "res://.import/sm_spyglass_lod0.gltf-610423e93fbec4adcf8888435957929a.scn" ]
 
 [params]
 
-nodes/root_type="Spatial"
+nodes/root_type="ArrayMesh"
 nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
-nodes/use_legacy_names=true
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=0
 materials/keep_on_reimport=false
@@ -25,9 +25,9 @@ meshes/ensure_tangents=true
 meshes/storage=1
 meshes/light_baking=1
 meshes/lightmap_texel_size=0.1
-skins/use_named_skins=true
+skins/use_named_skins=false
 external_files/store_in_subdir=false
-animation/import=true
+animation/import=false
 animation/fps=15
 animation/filter_script=""
 animation/storage=false

assets/props/spyglass/textures/tx_spyglass_BC.tga.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.s3tc.stex"
+path.etc2="res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.etc2.stex"
+path.etc="res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/props/spyglass/textures/tx_spyglass_BC.tga"
+dest_files=[ "res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.s3tc.stex", "res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.etc2.stex", "res://.import/tx_spyglass_BC.tga-080121e58687a7d1d090161e35b03182.etc.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

assets/props/spyglass/textures/tx_spyglass_NM.tga.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tx_spyglass_NM.tga-90ff1b38b2851e46d25162deb04fe31f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/props/spyglass/textures/tx_spyglass_NM.tga"
+dest_files=[ "res://.import/tx_spyglass_NM.tga-90ff1b38b2851e46d25162deb04fe31f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/props/spyglass/textures/tx_spyglass_ORM.tga.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tx_spyglass_ORM.tga-297e7c41f5b16a8a3c3eac11cdd3e660.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/props/spyglass/textures/tx_spyglass_ORM.tga"
+dest_files=[ "res://.import/tx_spyglass_ORM.tga-297e7c41f5b16a8a3c3eac11cdd3e660.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

scenes/levels/warcraft/WarCraft.tscn

@@ -16,6 +16,7 @@
 [ext_resource path="res://assets/props/dagger/dagger.mesh" type="ArrayMesh" id=14]
 [ext_resource path="res://assets/sounds/ambient-sound-level-warcraft.ogg" type="AudioStream" id=15]
 [ext_resource path="res://scenes/levels/warcraft/WarCraft.lmbake" type="BakedLightmapData" id=16]
+[ext_resource path="res://assets/props/spyglass/sm_spyglass_lod1.mesh" type="ArrayMesh" id=17]
 [ext_resource path="res://assets/props/table/sm_table.tscn" type="PackedScene" id=18]
 [ext_resource path="res://assets/props/dagger/materials/MA_dagger.material" type="Material" id=19]
 [ext_resource path="res://assets/props/weapon gun/sm_weapon_gun.mesh" type="ArrayMesh" id=21]
@@ -39,7 +40,6 @@
 [ext_resource path="res://assets/props/fireplace/sm_fireplace.mesh" type="ArrayMesh" id=39]
 [ext_resource path="res://assets/props/column/sm_column.mesh" type="ArrayMesh" id=40]
 [ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=41]
-[ext_resource path="res://assets/props/spyglass/sm_spyglass.mesh" type="ArrayMesh" id=42]
 [ext_resource path="res://assets/props/spyglass/materials/MA_spyglass.material" type="Material" id=43]
 [ext_resource path="res://scenes/UI/list_ho/UI_list_ho.tscn" type="PackedScene" id=44]
 [ext_resource path="res://scenes/UI/UI_back.tscn" type="PackedScene" id=45]
@@ -501,9 +501,9 @@ transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.08
 shape = SubResource( 8 )
 
 [node name="spyglass" type="MeshInstance" parent="Hidden Objects Items"]
-transform = Transform( 0.665919, -0.0332091, 0.63579, 1.34429e-08, 0.920039, 0.0480562, -0.636656, -0.0347355, 0.665013, -2.88265, -0.329537, -0.428369 )
+transform = Transform( 0.652362, 0.137749, 0.63579, -0.234678, 0.889605, 0.0480562, -0.606736, -0.195981, 0.665013, -2.884, -0.292075, -0.429783 )
 use_in_baked_light = true
-mesh = ExtResource( 42 )
+mesh = ExtResource( 17 )
 material/0 = ExtResource( 43 )
 
 [node name="Area" type="Area" parent="Hidden Objects Items/spyglass"]