Merge pull request 'feature/lightmap-ho' (#52) from feature/lightmap-ho into dev

Reviewed-on: Athena/game-source#52

assets/props/spyglass/spyglass.gltf.import

@@ -11,12 +11,12 @@ dest_files=[ "res://.import/spyglass.gltf-f88c2aed065225936fc295c1654b7c4b.scn"
 
 [params]
 
-nodes/root_type="ArrayMesh"
+nodes/root_type="Spatial"
 nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
-nodes/use_legacy_names=false
+nodes/use_legacy_names=true
 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=false
+skins/use_named_skins=true
 external_files/store_in_subdir=false
-animation/import=false
+animation/import=true
 animation/fps=15
 animation/filter_script=""
 animation/storage=false

scenes/levels/warcraft/WarCraft.tscn

@@ -74,13 +74,9 @@ glow_enabled = true
 [sub_resource type="Environment" id=3]
 background_mode = 3
 background_sky = SubResource( 1 )
-background_color = Color( 0.188235, 0.133333, 0.133333, 1 )
-background_energy = 0.6
-ambient_light_color = Color( 0.694118, 0.168627, 0.67451, 1 )
-ambient_light_energy = 1.55
 ambient_light_sky_contribution = 0.5
 fog_enabled = true
-fog_color = Color( 0.562167, 0.29, 1, 0.941176 )
+fog_color = Color( 0.337255, 0.235294, 0.956863, 0.941176 )
 fog_depth_begin = 0.0
 fog_depth_end = 60.0
 fog_depth_curve = 1.10957
@@ -165,13 +161,17 @@ 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 )
 
+[node name="ReflectionProbe" type="ReflectionProbe" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.71675, 2.18642, 0 )
+extents = Vector3( 2.92656, 2.46071, 3.08519 )
+origin_offset = Vector3( -1.59863, 0, 0 )
+
 [node name="Main Camera" type="Camera" parent="."]
-transform = Transform( 0.160708, -0.300426, 0.940169, 0, 0.95255, 0.304383, -0.987002, -0.0489167, 0.153082, 1.67521, 1.63422, 0.663199 )
+transform = Transform( 0.160708, -0.25632, 0.953138, 0, 0.96569, 0.259696, -0.987002, -0.0417352, 0.155194, 1.84336, 1.66169, 0.663199 )
 environment = SubResource( 2 )
 fov = 38.5632
 __meta__ = {
@@ -181,54 +181,54 @@ __meta__ = {
 [node name="Lighting" type="Spatial" parent="."]
 
 [node name="Red Color Left" type="SpotLight" parent="Lighting"]
-transform = Transform( 0.982749, 0.0887646, -0.162253, 0, 0.877297, 0.479948, 0.184946, -0.471668, 0.862162, -1.78491, 2.45338, 4.0067 )
+transform = Transform( 0.949107, 0.151161, -0.276307, 0, 0.877297, 0.479948, 0.314953, -0.455522, 0.832649, -4.0515, 2.45338, 4.26157 )
 light_color = Color( 0.643137, 0.109804, 0.152941, 1 )
-light_energy = 3.0
+light_specular = 1.0
 light_bake_mode = 2
 shadow_enabled = true
 shadow_bias = 0.1
 shadow_contact = 1.0
+editor_only = true
+spot_range = 5.43268
+spot_attenuation = 1.41421
 
 [node name="Red Color Left2" type="SpotLight" parent="Lighting"]
-transform = Transform( 0.952502, -0.11644, 0.281391, -0.0799849, 0.795917, 0.600098, -0.293839, -0.594102, 0.7488, 1.75895, 2.3448, 4.15934 )
+transform = Transform( 0.80562, 0.042778, 0.590886, -0.18969, 0.963507, 0.18887, -0.561244, -0.264243, 0.784335, 0.631187, 2.3448, 4.15934 )
 light_color = Color( 0.643137, 0.109804, 0.152941, 1 )
-light_energy = 0.0
+light_energy = 0.7
 light_bake_mode = 2
 shadow_enabled = true
 shadow_bias = 0.1
 shadow_contact = 1.0
-
+editor_only = true
-[node name="Blue Color Right" type="SpotLight" parent="Lighting"]
+spot_range = 15.1
-transform = Transform( -0.901858, -0.131582, 0.411507, 0.143004, 0.807882, 0.571731, -0.407679, 0.574467, -0.709778, -1.33799, 2.78611, -3.65613 )
+spot_attenuation = 1.41
-light_color = Color( 0.14902, 0.247059, 0.756863, 1 )
-light_energy = 0.0
-light_bake_mode = 2
-spot_range = 9.5
-spot_angle = 53.3
-
-[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_energy = 0.0
-light_specular = 0.23
-light_bake_mode = 2
-spot_range = 8.1
-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_energy = 0.0
-light_specular = 0.64
-light_bake_mode = 2
-spot_range = 8.1
-spot_angle = 55.8
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"]
 environment = SubResource( 3 )
 
+[node name="Blue Color Right" type="SpotLight" parent="Lighting"]
+transform = Transform( -0.994228, 0.0863279, -0.0637094, 0.0626716, 0.949248, 0.308222, 0.0870842, 0.302451, -0.949179, -4.00108, 2.13555, -5.73587 )
+light_color = Color( 0.501961, 0.529412, 1, 1 )
+light_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+shadow_bias = 0.1
+editor_only = true
+spot_range = 7.07277
+spot_attenuation = 1.46409
+spot_angle = 29.7
+
+[node name="Blue Color Right2" type="SpotLight" parent="Lighting"]
+transform = Transform( -0.596615, 0.0976924, 0.79656, 0.0626716, 0.995204, -0.0751143, -0.800077, 0.00510741, -0.599875, -0.159195, 1.47445, -4.78163 )
+light_color = Color( 0.501961, 0.529412, 1, 1 )
+light_energy = 32.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_range = 7.07277
+spot_attenuation = 1.86607
+spot_angle = 28.7038
+
 [node name="Building" type="Spatial" parent="."]
 
 [node name="walls" type="Spatial" parent="Building"]
@@ -270,7 +270,7 @@ cell_center_y = false
 cell_center_z = false
 baked_meshes = [ SubResource( 4 ) ]
 data = {
-"cells": PoolIntArray( 0, 0, 3, 65531, 0, 3, 65532, 0, 3, 65533, 0, 536870915, 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, -1610612733, 65533, 65535, -1610612733, 65534, 65535, 536870915, 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, 3 )
 }
 __meta__ = {
 "_editor_clip_": 0,
@@ -307,6 +307,17 @@ use_in_baked_light = true
 mesh = ExtResource( 39 )
 material/0 = null
 
+[node name="FireplaceLight" type="OmniLight" parent="Building/sm_fireplace"]
+transform = Transform( 0.173304, -0.0109248, -0.984808, 0.0629123, 0.998019, -1.78701e-07, 0.982857, -0.0619565, 0.173648, 0.00967455, 0.654315, 0.510273 )
+light_color = Color( 0.960784, 0.611765, 0.00784314, 1 )
+light_energy = 1.4
+light_indirect_energy = 1.4
+light_bake_mode = 2
+shadow_enabled = true
+editor_only = true
+omni_range = 1.8
+omni_attenuation = 1.23114
+
 [node name="table right" type="MeshInstance" parent="."]
 transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -2.04193, 0.815994, -1.9022 )
 use_in_baked_light = true
@@ -396,20 +407,12 @@ material/0 = null
 [node name="OmniLight" type="OmniLight" parent="Main Scene Props/Book/Book/Book2/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 )
 light_color = Color( 0.960784, 0.611765, 0.00784314, 1 )
-light_energy = 6.0
+light_energy = 12.0
 light_indirect_energy = 1.4
 light_bake_mode = 2
-omni_range = 0.6
+editor_only = true
-
+omni_range = 1.6
-[node name="OmniLight2" type="OmniLight" parent="Main Scene Props/Book/Book/Book2/sm_candlestick2/sm_candle_top2"]
+omni_attenuation = 2.73208
-transform = Transform( 0.578774, -3.72536e-09, -3.47774e-07, -1.86265e-09, 0.413993, -3.75217e-08, -1.24345e-13, 0, 0.578773, -3.98341, -0.107076, -0.263852 )
-light_color = Color( 0.960784, 0.611765, 0.00784314, 1 )
-light_energy = 1.4
-light_indirect_energy = 1.4
-light_bake_mode = 2
-shadow_enabled = true
-omni_range = 1.8
-omni_attenuation = 1.23114
 
 [node name="sm_table2" type="MeshInstance" parent="Main Scene Props"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.26978, 0.829484, 0.290515 )
@@ -514,7 +517,7 @@ 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.000917614, 0.00177043, 0.999977, -0.00636284, -0.000906557, 0.00636445, 0.999979, -0.258801, -0.0540404, -0.00213048 )
+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("")
@@ -559,6 +562,7 @@ collide_with_bodies = false
 
 [node name="fiole1" type="MeshInstance" parent="Hidden Objects Items/fioles"]
 transform = Transform( -0.210773, -0.635682, 0.742619, 0.949185, -0.314721, 0, 0.233718, 0.704883, 0.669714, 0.0481223, 0, -0.094099 )
+use_in_baked_light = true
 mesh = ExtResource( 24 )
 material/0 = ExtResource( 26 )
 
@@ -571,6 +575,7 @@ shape = SubResource( 5 )
 
 [node name="fiole2" type="MeshInstance" parent="Hidden Objects Items/fioles"]
 transform = Transform( 0.655275, 0.636944, -0.4061, 0.670978, -0.243833, 0.700239, 0.346993, -0.731333, -0.587153, -4.19531, -0.894133, 2.66915 )
+use_in_baked_light = true
 mesh = ExtResource( 24 )
 material/0 = ExtResource( 27 )
 
@@ -584,11 +589,13 @@ shape = SubResource( 6 )
 
 [node name="fiole_socle" type="MeshInstance" parent="Hidden Objects Items/fioles"]
 transform = Transform( 0.6773, -1.86265e-09, 0.735707, -0.0293841, 0.999202, 0.0270513, -0.73512, -0.03994, 0.67676, -2.27881, -0.11528, -1.23929 )
+use_in_baked_light = true
 mesh = ExtResource( 25 )
 material/0 = null
 
 [node name="fiole3" type="MeshInstance" parent="Hidden Objects Items/fioles/fiole_socle"]
 transform = Transform( 0.919703, -0.349433, -0.179005, 0.316708, 0.929754, -0.187758, 0.232039, 0.115989, 0.965766, -1.19209e-07, 0.1147, 0.00100636 )
+use_in_baked_light = true
 mesh = ExtResource( 24 )
 material/0 = ExtResource( 28 )
 
@@ -600,7 +607,8 @@ transform = Transform( 1, 2.08616e-07, -7.45058e-08, -5.96046e-08, -1.49012e-07,
 shape = SubResource( 7 )
 
 [node name="dagger" type="MeshInstance" parent="Hidden Objects Items"]
-transform = Transform( -0.625025, -0.77987, 0.0338859, 0, 0.0434097, 0.999058, -0.780606, 0.624436, -0.0271321, 0.697412, -0.0996332, 0.822543 )
+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 )
+use_in_baked_light = true
 mesh = ExtResource( 14 )
 material/0 = ExtResource( 19 )
 
@@ -613,6 +621,7 @@ 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 )
+use_in_baked_light = true
 mesh = ExtResource( 42 )
 material/0 = ExtResource( 43 )
 
@@ -625,6 +634,7 @@ shape = SubResource( 9 )
 
 [node name="beer" type="MeshInstance" parent="Hidden Objects Items"]
 transform = Transform( 0.996658, -0.053142, 0.0620432, 0.0548108, 0.998171, -0.0255105, -0.060574, 0.0288258, 0.997748, -2.8842, 0.173697, 1.98168 )
+use_in_baked_light = true
 mesh = ExtResource( 23 )
 material/0 = ExtResource( 33 )
 
@@ -638,6 +648,7 @@ shape = SubResource( 10 )
 
 [node name="weapon" type="MeshInstance" parent="Hidden Objects Items"]
 transform = Transform( 0.540284, -0.813497, 0.215212, -0.009216, 0.250018, 0.968198, -0.841432, -0.525085, 0.127583, -2.7508, -0.359206, 1.19589 )
+use_in_baked_light = true
 mesh = ExtResource( 21 )
 material/0 = ExtResource( 34 )
 
@@ -652,6 +663,7 @@ shape = SubResource( 11 )
 
 [node name="apple1" type="MeshInstance" parent="Hidden Objects Items/apples"]
 transform = Transform( 0.849809, -0.0462348, 0.525058, 0.0744364, 0.996689, -0.0327109, -0.521807, 0.0668814, 0.850438, -2.20275, -0.0779731, 2.45146 )
+use_in_baked_light = true
 mesh = ExtResource( 22 )
 material/0 = ExtResource( 29 )
 
@@ -664,6 +676,7 @@ shape = SubResource( 12 )
 
 [node name="apple2" type="MeshInstance" parent="Hidden Objects Items/apples"]
 transform = Transform( -0.190449, 0, 0.981697, 0, 1, 0, -0.981697, 0, -0.190449, -1.71166, -0.0869397, -1.29534 )
+use_in_baked_light = true
 mesh = ExtResource( 22 )
 material/0 = ExtResource( 36 )
 
@@ -676,6 +689,7 @@ shape = SubResource( 13 )
 
 [node name="apple3" type="MeshInstance" parent="Hidden Objects Items/apples"]
 transform = Transform( 0.823731, 0.226496, -0.519776, -0.248954, 0.96813, 0.0273319, 0.509401, 0.106886, 0.853865, -0.718663, -0.36046, 1.92043 )
+use_in_baked_light = true
 mesh = ExtResource( 22 )
 material/0 = ExtResource( 31 )
 
@@ -688,6 +702,7 @@ shape = SubResource( 14 )
 
 [node name="apple4" type="MeshInstance" parent="Hidden Objects Items/apples"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.38775, -0.940515, 0.233058 )
+use_in_baked_light = true
 mesh = ExtResource( 22 )
 material/0 = ExtResource( 35 )
 
@@ -702,6 +717,7 @@ shape = SubResource( 15 )
 
 [node name="coin1" type="MeshInstance" parent="Hidden Objects Items/golds"]
 transform = Transform( -0.958704, -0.0851446, 0.271362, -0.0825332, 0.996367, 0.0210433, -0.272167, -0.00222202, -0.962248, 0.234182, -0.0596957, 0.546686 )
+use_in_baked_light = true
 mesh = ExtResource( 30 )
 material/0 = ExtResource( 38 )
 
@@ -715,6 +731,7 @@ shape = SubResource( 16 )
 [node name="coin2" type="MeshInstance" parent="Hidden Objects Items/golds"]
 transform = Transform( 0.250245, 2.79397e-09, -0.968183, 0.0456076, 0.99889, 0.0117882, 0.967108, -0.0471065, 0.249967, 0.752443, -0.0417374, 1.3694 )
 layers = 3
+use_in_baked_light = true
 mesh = ExtResource( 30 )
 material/0 = ExtResource( 37 )
 
@@ -727,6 +744,7 @@ shape = SubResource( 17 )
 
 [node name="coin3" type="MeshInstance" parent="Hidden Objects Items/golds"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.74641, -0.885448, -0.198129 )
+use_in_baked_light = true
 mesh = ExtResource( 30 )
 material/0 = ExtResource( 32 )