diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index 6c44343..a698407 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -1,21 +1,22 @@ [gd_scene load_steps=64 format=2] -[gd_scene load_steps=62 format=2] -[ext_resource path="res://assets/props/candle/sm_candlestick.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1] [ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2] -[ext_resource path="res://assets/props/growler/sm_growler.tscn" type="PackedScene" id=3] -[ext_resource path="res://assets/props/stool b/sm_stool_b.tscn" type="PackedScene" id=4] +[ext_resource path="res://assets/props/godet/sm_godet.mesh" type="ArrayMesh" id=3] +[ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=4] [ext_resource path="res://assets/props/rock floor/materials/MA_rock_floor.material" type="Material" id=5] -[ext_resource path="res://assets/props/godet/sm_godet.tscn" type="PackedScene" id=7] +[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=6] +[ext_resource path="res://assets/props/parchment/sm_paper_parchment.mesh" type="ArrayMesh" id=7] [ext_resource path="res://assets/materials/gray.tres" type="Material" id=8] -[ext_resource path="res://assets/props/candle/sm_candle_b_lod1.mesh" type="ArrayMesh" id=9] -[ext_resource path="res://assets/props/candle/sm_candle_d_lod1.mesh" type="ArrayMesh" id=10] +[ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=9] +[ext_resource path="res://assets/props/growler/sm_growler.mesh" type="ArrayMesh" id=10] [ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=11] [ext_resource path="res://assets/props/rock floor/floor_lib.meshlib" type="MeshLibrary" id=12] -[ext_resource path="res://assets/props/candle/sm_candle_top_lod1.mesh" type="ArrayMesh" id=13] +[ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=13] [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/candle/sm_candle_d.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] @@ -160,7 +161,6 @@ script = ExtResource( 2 ) [node name="BakedLightmap" type="BakedLightmap" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.06928, 2.35676, -0.183365 ) extents = Vector3( 6.50885, 3.63237, 10 ) -quality = 2 bounces = 5 environment_mode = 1 light_data = ExtResource( 16 ) @@ -323,29 +323,50 @@ omni_attenuation = 1.23114 [node name="sm_table_right" parent="." instance=ExtResource( 18 )] transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.1664, 0.0295653, -2.02667 ) -[node name="sm_growler" parent="sm_table_right" instance=ExtResource( 3 )] +[node name="sm_growler2" type="MeshInstance" parent="sm_table_right"] transform = Transform( 0.428226, 0, -0.903672, 0, 1, 0, 0.903672, 0, 0.428226, 0.260903, 0.870654, 0.24329 ) +use_in_baked_light = true +mesh = ExtResource( 10 ) +material/0 = null -[node name="sm_godet" parent="sm_table_right" instance=ExtResource( 7 )] +[node name="sm_godet3" type="MeshInstance" parent="sm_table_right"] transform = Transform( 0.869771, 0, 0.493456, 0, 1, 0, -0.493456, 0, 0.869771, 0.124432, 0.85553, -0.0287701 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet3" parent="sm_table_right" instance=ExtResource( 7 )] +[node name="sm_godet4" type="MeshInstance" parent="sm_table_right"] transform = Transform( 0.979508, 0.200153, 0.0224678, -0.0198889, -0.0148863, 0.999692, 0.200426, -0.979652, -0.0106004, 0.511135, 0.919194, 0.249402 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet4" parent="sm_table_right" instance=ExtResource( 7 )] +[node name="sm_godet2" type="MeshInstance" parent="sm_table_right"] transform = Transform( -0.236782, -0.0445638, 0.970541, -0.0267146, 0.998868, 0.039347, -0.971196, -0.0166109, -0.237705, 0.291596, 0.864092, -0.00375021 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null [node name="sm_table_left" parent="." instance=ExtResource( 18 )] transform = Transform( -0.958482, 0, -0.285153, 0, 1, 0, 0.285153, 0, -0.958482, -2.60247, 0.0491341, 2.15903 ) -[node name="sm_growler" parent="sm_table_left" instance=ExtResource( 3 )] +[node name="sm_growler2" type="MeshInstance" parent="sm_table_left"] transform = Transform( -0.958482, 0, 0.285153, 0, 1, 0, -0.285153, 0, -0.958482, 0.179069, 0.843493, 2.38419e-07 ) +use_in_baked_light = true +mesh = ExtResource( 10 ) +material/0 = null -[node name="sm_godet" parent="sm_table_left" instance=ExtResource( 7 )] -transform = Transform( -0.958482, 0.0116327, 0.284916, 0, 0.999168, -0.0407945, -0.285153, -0.0391008, -0.957684, 0.00593543, 0.863228, 0.188563 ) +[node name="sm_godet2" type="MeshInstance" parent="sm_table_left"] +transform = Transform( -0.958482, 0.0116327, 0.284916, 0, 0.999168, -0.0407945, -0.285153, -0.0391008, -0.957684, 0.0057888, 0.850618, 0.189056 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet2" parent="sm_table_left" instance=ExtResource( 7 )] -transform = Transform( -0.958482, -0.0136413, 0.284827, 0, 0.998855, 0.0478387, -0.285153, 0.0458525, -0.957385, 0.101907, 0.853583, -0.253049 ) +[node name="sm_godet3" type="MeshInstance" parent="sm_table_left"] +transform = Transform( -0.958482, -0.0136413, 0.284827, 0, 0.998855, 0.0478387, -0.285153, 0.0458525, -0.957385, 0.102124, 0.837641, -0.25378 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null [node name="Main Scene Props" type="Spatial" parent="."] @@ -358,29 +379,67 @@ transform = Transform( 0.0229641, -0.00339183, -0.999731, 0.0393653, 0.999223, - [node name="sm_book3" parent="Main Scene Props/sm_book/sm_book2" instance=ExtResource( 46 )] transform = Transform( 0.86032, -0.0497817, -0.507318, 0.0471006, 0.998725, -0.0181282, 0.507573, -0.00829895, 0.861568, 0.00110056, 0.070618, -0.00503528 ) -[node name="sm_candlestick" parent="Main Scene Props/sm_book/sm_book2/sm_book3" instance=ExtResource( 1 )] +[node name="sm_candlestick2" type="MeshInstance" parent="Main Scene Props/sm_book/sm_book2/sm_book3"] transform = Transform( 1.0543, -0.0109484, 1.03432, -0.0329634, 1.4758, 0.0492217, -1.03385, -0.0582193, 1.05321, 0.0299356, 0.0326169, -0.0690778 ) +use_in_baked_light = true +mesh = ExtResource( 4 ) +material/0 = null + +[node name="sm_candle_top2" type="MeshInstance" parent="Main Scene Props/sm_book/sm_book2/sm_book3/sm_candlestick2"] +transform = Transform( 1.16981, 7.45037e-09, -2.27374e-13, 7.45058e-09, 1.63542, -1.42109e-14, 3.55271e-15, -2.84217e-14, 1.16981, 0.00268283, 0.168278, -5.96046e-08 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = null + +[node name="OmniLight" type="OmniLight" parent="Main Scene Props/sm_book/sm_book2/sm_book3/sm_candlestick2/sm_candle_top2"] +transform = Transform( 0.578774, -3.72536e-09, -3.47774e-07, -3.72529e-09, 0.413993, -3.75217e-08, -1.15463e-13, 7.10543e-15, 0.578773, -0.00229338, 0.0614615, 2.98023e-08 ) +visible = false +light_color = Color( 0.960784, 0.611765, 0.00784314, 1 ) +light_energy = 12.0 +light_indirect_energy = 1.4 +light_bake_mode = 2 +editor_only = true +omni_range = 1.6 +omni_attenuation = 2.73208 [node name="sm_table" parent="Main Scene Props" instance=ExtResource( 18 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0926853, 0.0400838, 0.290515 ) -[node name="sm_stool_b3" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b2" type="MeshInstance" parent="Main Scene Props"] transform = Transform( -0.232037, 0, -0.972707, 0, 1, 0, 0.972707, 0, -0.232037, -2.91873, 0.0130518, 0.702275 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null -[node name="sm_stool_b7" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b3" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.769693, -0.034908, -0.637459, 0.0288114, 0.999386, -0.0199395, 0.637764, -0.00301879, 0.770226, -4.33166, 0.0231258, 1.08363 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null -[node name="sm_stool_b4" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b7" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.98104, 0, 0.193806, 0, 1, 0, -0.193806, 0, 0.98104, -3.04076, 0.0372323, -0.817556 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null -[node name="sm_stool_b5" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b4" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.656257, 0, 0.754538, 0, 1, 0, -0.754538, 0, 0.656257, -0.888955, 0.0130518, 1.64328 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null -[node name="sm_stool_b6" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b5" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.892389, 0, -0.451267, 0, 1, 0, 0.451267, 0, 0.892389, 1.35966, 0.013052, 1.23435 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null -[node name="sm_stool_b" parent="Main Scene Props" instance=ExtResource( 4 )] +[node name="sm_stool_b6" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.839193, 0, 0.543834, 0, 1, 0, -0.543834, 0, 0.839193, 0.474083, 0.013052, -1.39025 ) +use_in_baked_light = true +mesh = ExtResource( 6 ) +material/0 = null [node name="sm_book2" parent="Main Scene Props" instance=ExtResource( 46 )] transform = Transform( 0.122577, 0.0288089, -0.992041, -0.0361233, 0.999045, 0.0245489, 0.991801, 0.0328267, 0.1235, 0.493202, 0.942654, -0.0854386 ) @@ -391,38 +450,75 @@ transform = Transform( 0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, 0.5, 0.0106606, [node name="sm_book" parent="Main Scene Props/sm_book3" instance=ExtResource( 46 )] transform = Transform( 0.992026, 0, 0.592682, 0, 1.15559, 0, -0.592682, 0, 0.992026, -0.000832617, 0.0791223, -0.012241 ) -[node name="sm_godet" parent="Main Scene Props" instance=ExtResource( 7 )] +[node name="sm_godet2" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.875311, 0.480987, 0.0498184, 0.0206958, 0.0656668, -0.997627, -0.483117, 0.874265, 0.0475244, -0.191043, 0.95253, 0.11484 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet2" parent="Main Scene Props" instance=ExtResource( 7 )] +[node name="sm_godet6" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.706057, 0, -0.708155, 0, 1, 0, 0.708155, 0, 0.706057, -0.112722, 0.901657, 0.00149509 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet6" parent="Main Scene Props" instance=ExtResource( 7 )] +[node name="sm_godet5" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.757895, 0, 0.652376, 0, 1, 0, -0.652376, 0, 0.757895, -0.28474, 0.905096, 0.78228 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet5" parent="Main Scene Props" instance=ExtResource( 7 )] +[node name="sm_godet4" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.886172, -0.463214, 0.0114893, -0.0309068, -0.0343508, 0.998932, -0.462324, -0.885581, -0.0447572, -0.0861932, 0.982616, 0.742759 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_godet4" parent="Main Scene Props" instance=ExtResource( 7 )] +[node name="sm_godet3" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.690251, 0, 0.72357, 0, 1, 0, -0.72357, 0, 0.690251, -0.333186, 0.901657, 0.177792 ) +use_in_baked_light = true +mesh = ExtResource( 3 ) +material/0 = null -[node name="sm_growler" parent="Main Scene Props" instance=ExtResource( 3 )] +[node name="sm_growler2" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 0.0876426, 0, -0.996152, 0, 1, 0, 0.996152, 0, 0.0876426, -0.316595, 0.905106, -0.0726386 ) - -[node name="sm_candle_d2" type="MeshInstance" parent="Main Scene Props"] -transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.457262, 0.978314, -0.058084 ) use_in_baked_light = true mesh = ExtResource( 10 ) material/0 = null +[node name="sm_wood_parchment2" type="MeshInstance" parent="Main Scene Props"] +transform = Transform( 0.796076, 0.00917861, -0.605127, 0, 0.999885, 0.0151663, 0.605197, -0.0120736, 0.795984, 0.543303, 0.962739, 0.755265 ) +use_in_baked_light = true +mesh = ExtResource( 13 ) +material/0 = null + +[node name="sm_paper_parcment" type="MeshInstance" parent="Main Scene Props/sm_wood_parchment2"] +transform = Transform( 0.999998, -0.00176462, 0.000917584, 0.00177043, 0.999977, -0.00636284, -0.000906646, 0.00636445, 0.999979, -0.258801, -0.0540404, -0.00213048 ) +use_in_baked_light = true +mesh = ExtResource( 7 ) +skeleton = NodePath("") +material/0 = null + +[node name="sm_wood_parchment3" type="MeshInstance" parent="Main Scene Props"] +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 ) +use_in_baked_light = true +mesh = ExtResource( 13 ) +material/0 = null + +[node name="sm_candle_d2" type="MeshInstance" parent="Main Scene Props"] +transform = Transform( -0.927966, 1.10978e-07, -0.372664, 6.91459e-08, 1, 1.25617e-07, 0.372664, 9.08001e-08, -0.927966, 0.457262, 1.00485, -0.058084 ) +use_in_baked_light = true +mesh = ExtResource( 17 ) +material/0 = null + [node name="sm_candle_top2" type="MeshInstance" parent="Main Scene Props"] transform = Transform( 2.94906, 0, 0, 0, 2.85, 0, 0, 0, 2.94906, 0.347704, 1.00342, 1.16015 ) use_in_baked_light = true -mesh = ExtResource( 13 ) +mesh = ExtResource( 1 ) material/0 = null [node name="sm_candle_b" type="MeshInstance" parent="Main Scene Props/sm_candle_top2"] -transform = Transform( 0.553417, 0, 0, 0, 0.553417, 0, 0, 0, 0.553417, 0.0504003, -0.0223866, 0.00162041 ) +transform = Transform( 0.553417, 0, 0, 0, 0.553417, 0, 0, 0, 0.553417, 0.0504003, -0.0129334, 0.00162044 ) use_in_baked_light = true mesh = ExtResource( 9 ) material/0 = null @@ -483,7 +579,6 @@ shape = SubResource( 7 ) [node name="dagger" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( -0.625025, -0.777847, 0.0655765, 0, 0.0840072, 0.996466, -0.780606, 0.622816, -0.0525065, 0.69073, -0.117415, 0.830941 ) -cast_shadow = 0 use_in_baked_light = true mesh = ExtResource( 14 ) material/0 = ExtResource( 19 )