diff --git a/assets/props/fireplace/sm_fireplace.mesh b/assets/props/fireplace/sm_fireplace.mesh index fd9395b..5230909 100644 Binary files a/assets/props/fireplace/sm_fireplace.mesh and b/assets/props/fireplace/sm_fireplace.mesh differ diff --git a/assets/props/parchment/sm_paper_parchment.mesh b/assets/props/parchment/sm_paper_parchment.mesh index 4b0edf1..ae36a61 100644 Binary files a/assets/props/parchment/sm_paper_parchment.mesh and b/assets/props/parchment/sm_paper_parchment.mesh differ diff --git a/scenes/levels/warcraft/WarCraft.exr b/scenes/levels/warcraft/WarCraft.exr index 546a498..2a27ba3 100644 Binary files a/scenes/levels/warcraft/WarCraft.exr and b/scenes/levels/warcraft/WarCraft.exr differ diff --git a/scenes/levels/warcraft/WarCraft.lmbake b/scenes/levels/warcraft/WarCraft.lmbake index 8d165f5..9a88ab9 100644 Binary files a/scenes/levels/warcraft/WarCraft.lmbake and b/scenes/levels/warcraft/WarCraft.lmbake differ diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index 5c4f184..0028a88 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=2] +[gd_scene load_steps=58 format=2] [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] @@ -38,8 +38,9 @@ [ext_resource path="res://assets/props/apple/materials/MA_apple2.material" type="Material" id=36] [ext_resource path="res://assets/props/stack gold/materials/MA_gold2.material" type="Material" id=37] [ext_resource path="res://assets/props/stack gold/materials/MA_gold1.material" type="Material" id=38] +[ext_resource path="res://assets/props/fireplace/sm_fireplace.mesh" type="ArrayMesh" id=39] -[sub_resource type="CubeMesh" id=1] +[sub_resource type="PlaneMesh" id=1] [sub_resource type="ArrayMesh" id=2] lightmap_size_hint = Vector2( 338, 334 ) @@ -151,7 +152,7 @@ far = 60.0 [node name="Building" type="Spatial" parent="."] [node name="MeshInstance" type="MeshInstance" parent="Building"] -transform = Transform( 5.45383, 0, 0, 0, 2.05553, 0, 0, 0, 0.347932, -3.43965, 1.54814, 5.1384 ) +transform = Transform( 5.45383, 0, 0, 0, -6.36082e-07, 2.46314, 0, -2.05553, -1.52086e-08, -3.48147, 2.21218, 4.82163 ) use_in_baked_light = true mesh = SubResource( 1 ) material/0 = ExtResource( 8 ) @@ -163,7 +164,7 @@ cell_center_y = false cell_center_z = false baked_meshes = [ SubResource( 2 ) ] data = { -"cells": PoolIntArray( 0, 0, 3, 65531, 0, 3, 65532, 0, 3, 65533, 0, 3, 65534, 0, 3, 65535, 0, 3, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, 3, 65535, 1, 3, 0, 2, 3, 65531, 2, 3, 65532, 2, 3, 65533, 2, 3, 65534, 2, 3, 65535, 2, 3, 0, 65533, 3, 65532, 65533, 3, 65533, 65533, 3, 65534, 65533, 3, 65535, 65533, 3, 0, 65534, 3, 65531, 65534, 3, 65532, 65534, 3, 65533, 65534, 3, 65534, 65534, 3, 65535, 65534, 3, 0, 65535, 3, 65531, 65535, 3, 65532, 65535, 3, 65533, 65535, 3, 65534, 65535, 3, 65535, 65535, 3 ) +"cells": PoolIntArray( 0, 0, 3, 65531, 0, 3, 65532, 0, 3, 65533, 0, 3, 65534, 0, 3, 65535, 0, 3, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, 3, 65535, 1, 3, 0, 2, 3, 65531, 2, 3, 65532, 2, 3, 65533, 2, 3, 65534, 2, 3, 65535, 2, 3, 0, 65533, 3, 65532, 65533, 3, 65533, 65533, 3, 65534, 65533, 3, 65535, 65533, 3, 0, 65534, 3, 65531, 65534, 3, 65532, 65534, 3, 65533, 65534, 3, 65534, 65534, 3, 65535, 65534, 3, 0, 65535, 3, 65531, 65535, 3, 65532, 65535, 3, 65533, 65535, 3, 65534, 65535, 3, 65535, 65535, 536870915 ) } __meta__ = { "_editor_clip_": 0, @@ -172,56 +173,19 @@ __meta__ = { [node name="sm_column" type="MeshInstance" parent="Building"] transform = Transform( 0.983163, 0, -0.182733, 0, 1, 0, 0.182733, 0, 0.983163, -6.41226, 0, -3.39909 ) -mesh = ExtResource( 37 ) -material/0 = null [node name="sm_column4" type="MeshInstance" parent="Building"] transform = Transform( -0.983163, 0, 0.182733, 0, 1, 0, -0.182733, 0, -0.983163, -5.90352, 0, -6.13626 ) -mesh = ExtResource( 37 ) -material/0 = null [node name="sm_column2" type="MeshInstance" parent="Building"] transform = Transform( 0.983163, 0, -0.182733, 0, 1, 0, 0.182733, 0, 0.983163, -7.23782, 0, 1.51736 ) -mesh = ExtResource( 37 ) -material/0 = null [node name="sm_column3" type="MeshInstance" parent="Building"] transform = Transform( 0.983163, 0, -0.182733, 0, 1, 0, 0.182733, 0, 0.983163, -7.73765, 0, 4.20657 ) -mesh = ExtResource( 37 ) -material/0 = null [node name="sm_fireplace" type="MeshInstance" parent="Building"] transform = Transform( 0.182733, 0, 0.983163, 0, 1, 0, -0.983163, 0, 0.182733, -7.17176, -2.38419e-07, -1.02066 ) -mesh = ExtResource( 36 ) -material/0 = ExtResource( 8 ) - -[node name="WallFireplace" type="CSGBox" parent="Building"] -transform = Transform( 0.182733, 0, 0.983163, 0, 1, 0, -0.983163, 0, 0.182733, -8.11075, 1.38701, -1.20075 ) -use_in_baked_light = true -width = 12.7715 -height = 4.43056 -material = ExtResource( 8 ) - -[node name="WallRoof" type="CSGBox" parent="Building/WallFireplace"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.78814e-07, 2.40547, 4.77074 ) -use_in_baked_light = true -width = 12.5776 -height = 0.450539 -depth = 8.77303 -material = ExtResource( 8 ) - -[node name="WallRight" type="CSGBox" parent="Building/WallFireplace"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.87099, 0.247711, 4.79306 ) -use_in_baked_light = true -width = 0.571039 -height = 4.00957 -depth = 8.90633 -material = ExtResource( 8 ) - -[node name="plane" type="MeshInstance" parent="Building"] -transform = Transform( 12.483, 0, 0, 0, 1, 0, 0, 0, 20.5058, -2.02793, 2.28555, -1.64667 ) -use_in_baked_light = true -mesh = ExtResource( 38 ) +mesh = ExtResource( 39 ) material/0 = null [node name="table right" type="MeshInstance" parent="."] @@ -453,6 +417,7 @@ material/0 = null [node name="Red Color Left" type="SpotLight" parent="Lighting"] transform = Transform( 0.885702, -0.222818, 0.407289, 0, 0.877297, 0.479948, -0.464255, -0.425091, 0.777023, 0.848516, 1.5034, 2.26553 ) +visible = false light_color = Color( 1, 0, 0.0862745, 1 ) light_energy = 8.0 light_bake_mode = 2 @@ -461,11 +426,13 @@ shadow_contact = 1.0 [node name="Blue Color Right" type="SpotLight" parent="Lighting"] transform = Transform( -0.728997, 0.597286, -0.334384, 0.0537007, 0.536893, 0.84194, 0.682407, 0.595815, -0.423468, -0.540161, 1.80711, -0.561909 ) +visible = false light_color = Color( 0.8, 0.835294, 1, 1 ) light_bake_mode = 2 [node name="Blue Color Right2" type="SpotLight" parent="Lighting"] transform = Transform( -0.721569, 0.418156, -0.5518, -0.680158, -0.577006, 0.452161, -0.129319, 0.701576, 0.700762, -6.73766, 1.80711, 4.06785 ) +visible = false light_color = Color( 0.905882, 0.862745, 0.72549, 1 ) light_specular = 0.23 light_bake_mode = 2 @@ -474,6 +441,7 @@ spot_angle = 55.8 [node name="Blue Color Right3" type="SpotLight" parent="Lighting"] transform = Transform( 0.0552331, -0.60583, -0.793675, -0.717326, -0.577006, 0.390522, -0.694545, 0.547754, -0.466447, -6.73826, 1.80435, -3.64354 ) +visible = false light_color = Color( 0.905882, 0.862745, 0.72549, 1 ) light_specular = 0.64 light_bake_mode = 2