diff --git a/assets/props/candle/candle.material b/assets/props/candle/candle.material index dfe8a03..1c99e8b 100644 Binary files a/assets/props/candle/candle.material and b/assets/props/candle/candle.material differ diff --git a/assets/props/candle/textures/tx_candle_BCS.tga.import b/assets/props/candle/textures/tx_candle_BCS.tga.import index fbf94a0..c5722b0 100644 --- a/assets/props/candle/textures/tx_candle_BCS.tga.import +++ b/assets/props/candle/textures/tx_candle_BCS.tga.import @@ -2,26 +2,29 @@ importer="texture" type="StreamTexture" -path="res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.stex" +path.s3tc="res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.s3tc.stex" +path.etc2="res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.etc2.stex" +path.etc="res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.etc.stex" metadata={ -"vram_texture": false +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true } [deps] source_file="res://assets/props/candle/textures/tx_candle_BCS.tga" -dest_files=[ "res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.stex" ] +dest_files=[ "res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.s3tc.stex", "res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.etc2.stex", "res://.import/tx_candle_BCS.tga-8a28bd77a964ef96f453c0c2c4de7ed9.etc.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 @@ -30,5 +33,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/assets/props/candle/textures/tx_candle_Bscatter.tga.import b/assets/props/candle/textures/tx_candle_Bscatter.tga.import new file mode 100644 index 0000000..38b64f4 --- /dev/null +++ b/assets/props/candle/textures/tx_candle_Bscatter.tga.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.s3tc.stex" +path.etc2="res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.etc2.stex" +path.etc="res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://assets/props/candle/textures/tx_candle_Bscatter.tga" +dest_files=[ "res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.s3tc.stex", "res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.etc2.stex", "res://.import/tx_candle_Bscatter.tga-bab49978d309dd8ee4ead06fb6b4cd6b.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=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=false +svg/scale=1.0 diff --git a/assets/props/candle/textures/tx_candle_scatter.tga b/assets/props/candle/textures/tx_candle_scatter.tga new file mode 100644 index 0000000..8c4244c Binary files /dev/null and b/assets/props/candle/textures/tx_candle_scatter.tga differ diff --git a/assets/props/candle/textures/tx_candle_scatter.tga.import b/assets/props/candle/textures/tx_candle_scatter.tga.import new file mode 100644 index 0000000..e4ef8fc --- /dev/null +++ b/assets/props/candle/textures/tx_candle_scatter.tga.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.s3tc.stex" +path.etc2="res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.etc2.stex" +path.etc="res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://assets/props/candle/textures/tx_candle_scatter.tga" +dest_files=[ "res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.s3tc.stex", "res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.etc2.stex", "res://.import/tx_candle_scatter.tga-bc0a35b3e6c5b6443faff3a90e4ee73d.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=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=false +svg/scale=1.0 diff --git a/scenes/levels/WarCraft.tscn b/scenes/levels/WarCraft.tscn index f9ddf06..f00fd15 100644 --- a/scenes/levels/WarCraft.tscn +++ b/scenes/levels/WarCraft.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1] [ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2] @@ -14,6 +14,8 @@ [ext_resource path="res://assets/materials/gray.tres" type="Material" id=12] [ext_resource path="res://assets/props/parchment/paper parchment.gltf" type="PackedScene" id=13] [ext_resource path="res://assets/props/candle/candle top.gltf" type="PackedScene" id=14] +[ext_resource path="res://assets/props/candle/candle d.gltf" type="PackedScene" id=15] +[ext_resource path="res://assets/props/candle/candle b.gltf" type="PackedScene" id=16] [sub_resource type="CubeMesh" id=1] @@ -138,8 +140,10 @@ transform = Transform( 1.0529, 0.0554018, 1.03432, -0.125744, 1.4708, 0.049222, transform = Transform( 1.16981, 0, 0, 0, 1.63542, 0, 0, 0, 1.16981, 0, 0.125719, 0 ) [node name="OmniLight" type="OmniLight" parent="Main Scene Props/book3/book4/book5/candlestick/candle top"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0731977, 0 ) +transform = Transform( 0.578774, 2.62765e-08, 7.00709e-08, -1.41016e-14, 0.413994, -1.0233e-07, -1.13687e-13, 1.06581e-14, 0.578773, 0, 0.0874847, 0 ) light_color = Color( 0.960784, 0.611765, 0.00784314, 1 ) +light_energy = 2.0 +omni_range = 0.6 [node name="table" parent="Main Scene Props" instance=ExtResource( 2 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.082685, 0.0325576, 0.290515 ) @@ -198,6 +202,15 @@ transform = Transform( 1, 6.51926e-09, -5.06639e-07, -4.65661e-09, 1, 9.31323e-0 [node name="wood parchment2" parent="Main Scene Props" instance=ExtResource( 11 )] transform = Transform( -0.596381, 0.0184557, 0.802489, 0.0225364, 0.999726, -0.00624354, -0.802385, 0.0143617, -0.596634, 0.281044, 0.958449, -0.253034 ) +[node name="candle d" parent="Main Scene Props" instance=ExtResource( 15 )] +transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.462657, 0.976621, -0.0446488 ) + +[node name="candle top" parent="Main Scene Props" instance=ExtResource( 14 )] +transform = Transform( 2.94906, 0, 0, 0, 2.85, 0, 0, 0, 2.94906, 0.347704, 0.927664, 1.16015 ) + +[node name="candle b" parent="Main Scene Props/candle top" instance=ExtResource( 16 )] +transform = Transform( 0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0.0300155, -0.00244898, 0.0152032 ) + [node name="Lighting" type="Spatial" parent="."] [node name="Red Color Left" type="SpotLight" parent="Lighting"]