Calculate lightmap on lightmap scene test

assets/props/candle/textures/tx_candle_BCS.tga.import

@@ -26,7 +26,7 @@ flags/repeat=true
 flags/filter=true
 flags/mipmaps=true
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false

developers/aurelien/CheckLightmap.exr.import

@@ -21,4 +21,4 @@ flags/filter=true
 flags/mipmaps=false
 flags/srgb=false
 slices/horizontal=1
-slices/vertical=1
+slices/vertical=2

developers/aurelien/CheckLightmap.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=19 format=2]
 
 [ext_resource path="res://assets/props/book/sm_book.mesh" type="ArrayMesh" id=1]
 [ext_resource path="res://developers/aurelien/CheckLightmap.lmbake" type="BakedLightmapData" id=2]
 [ext_resource path="res://developers/aurelien/CheckLightmap.gd" type="Script" id=3]
 [ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=4]
 [ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=5]
-[ext_resource path="res://assets/materials/gray.tres" type="Material" id=6]
 [ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=7]
 [ext_resource path="res://assets/props/candle/sm_candle_c.mesh" type="ArrayMesh" id=8]
 [ext_resource path="res://assets/props/candle/sm_candle_a.mesh" type="ArrayMesh" id=9]
@@ -24,8 +23,11 @@
 script = ExtResource( 3 )
 
 [node name="BakedLightmap" type="BakedLightmap" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01067, 1.3203, -0.22506 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01067, 1.3203, -1.6367 )
-extents = Vector3( 2.04435, 1.56454, 3.03432 )
+extents = Vector3( 3.82531, 1.56454, 4.38589 )
+quality = 3
+bounces = 5
+default_texels_per_unit = 24.0
 environment_mode = 1
 environment_min_light = Color( 0.12549, 0.12549, 0.286275, 1 )
 capture_quality = 2
@@ -41,15 +43,14 @@ transform = Transform( 0.089016, -0.715663, 0.692751, 0, 0.695512, 0.718515, -0.
 transform = Transform( 8.39917, 0, 0, 0, 1, 0, 0, 0, 11.9516, -0.796654, 0, -1.7752 )
 use_in_baked_light = true
 mesh = ExtResource( 4 )
-material/0 = ExtResource( 6 )
+material/0 = null
 
 [node name="Lighting" type="Spatial" parent="."]
 
 [node name="SpotLight2" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, 0.479468 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -57,16 +58,13 @@ spot_angle = 15.0
 [node name="SpotLight5" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.597942 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight4" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.234948 )
-light_energy = 10.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -74,8 +72,7 @@ spot_angle = 15.0
 [node name="SpotLight3" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, 0.149649 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -83,16 +80,14 @@ spot_angle = 15.0
 [node name="SpotLight6" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -1.7265 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight7" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -1.36351 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -100,8 +95,7 @@ spot_angle = 15.0
 [node name="SpotLight8" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.978908 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -109,16 +103,14 @@ spot_angle = 15.0
 [node name="SpotLight9" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.81604 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight10" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.45304 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -126,8 +118,7 @@ spot_angle = 15.0
 [node name="SpotLight11" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.06845 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -135,16 +126,14 @@ spot_angle = 15.0
 [node name="SpotLight12" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -3.94141 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight13" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -3.57842 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -152,8 +141,7 @@ spot_angle = 15.0
 [node name="SpotLight14" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -3.19382 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -161,16 +149,14 @@ spot_angle = 15.0
 [node name="SpotLight15" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -5.07697 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight16" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -4.71398 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -178,8 +164,7 @@ spot_angle = 15.0
 [node name="SpotLight17" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -4.32938 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -187,8 +172,7 @@ spot_angle = 15.0
 [node name="SpotLight18" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, 0.479468 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -196,16 +180,14 @@ spot_angle = 15.0
 [node name="SpotLight19" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -0.597942 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight20" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -0.234948 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -213,8 +195,7 @@ spot_angle = 15.0
 [node name="SpotLight21" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, 0.149649 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -222,16 +203,14 @@ spot_angle = 15.0
 [node name="SpotLight22" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -1.7265 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight23" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -1.36351 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -239,8 +218,7 @@ spot_angle = 15.0
 [node name="SpotLight24" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -0.978908 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -248,16 +226,14 @@ spot_angle = 15.0
 [node name="SpotLight25" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -2.81604 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight26" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -2.45304 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -265,8 +241,7 @@ spot_angle = 15.0
 [node name="SpotLight27" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -2.06845 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -274,16 +249,13 @@ spot_angle = 15.0
 [node name="SpotLight28" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -3.94141 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight29" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -3.57842 )
-light_energy = 10.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -291,8 +263,7 @@ spot_angle = 15.0
 [node name="SpotLight30" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -3.19382 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -300,16 +271,14 @@ spot_angle = 15.0
 [node name="SpotLight31" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -5.07697 )
 light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
 
 [node name="SpotLight32" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -4.71398 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -317,8 +286,7 @@ spot_angle = 15.0
 [node name="SpotLight33" type="SpotLight" parent="Lighting"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.92602, 1.57864, -4.32938 )
 light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
-light_energy = 10.0
+light_energy = 4.0
-light_indirect_energy = 4.0
 light_bake_mode = 2
 shadow_enabled = true
 spot_angle = 15.0
@@ -442,7 +410,7 @@ mesh = ExtResource( 11 )
 material/0 = null
 
 [node name="sm_candle_d2" type="MeshInstance" parent="Candle"]
-transform = Transform( 3.61366, 0, 0, 0, 3.61366, 0, 0, 0, 3.61366, 0.201699, 0.121002, -0.844206 )
+transform = Transform( 3.61366, 0, 0, 0, 3.61366, 0, 0, 0, 3.61366, 0.199182, 0.12495, -0.844578 )
 use_in_baked_light = true
 mesh = ExtResource( 11 )
 material/0 = null
@@ -508,25 +476,25 @@ mesh = ExtResource( 14 )
 material/0 = null
 
 [node name="sm_growler2" type="MeshInstance" parent="."]
-transform = Transform( -0.881676, 0, -1.078, 0, 1.39264, 0, 1.078, 0, -0.881676, 0.16313, -0.000296712, -1.78903 )
+transform = Transform( -0.881676, 0, -1.078, 0, 1.39264, 0, 1.078, 0, -0.881676, 0.162736, -0.000296712, -1.78636 )
 use_in_baked_light = true
 mesh = ExtResource( 14 )
 material/0 = null
 
 [node name="sm_godet2" type="MeshInstance" parent="."]
-transform = Transform( 1.74966, 0, 0, 0, 1.74966, 0, 0, 0, 1.74966, 0.277393, 0.0325534, -1.39236 )
+transform = Transform( 1.74966, 0, 0, 0, 1.74966, 0, 0, 0, 1.74966, 0.277748, 0.0325533, -1.39477 )
 use_in_baked_light = true
 mesh = ExtResource( 13 )
 material/0 = null
 
 [node name="sm_floor" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.394688, 0.00836658, -4.30329 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.39092, 0.0131278, -4.30235 )
 use_in_baked_light = true
 mesh = ExtResource( 17 )
 material/0 = null
 
 [node name="sm_table" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.606, 0.78806, -0.817294 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.60057, 0.781203, -0.818648 )
 use_in_baked_light = true
 mesh = ExtResource( 19 )
 material/0 = null