diff --git a/assets/props/book/sm_book.mesh b/assets/props/book/sm_book.mesh index 8409853..d40f0a5 100644 Binary files a/assets/props/book/sm_book.mesh and b/assets/props/book/sm_book.mesh differ diff --git a/assets/props/candle/sm_candle_b.mesh b/assets/props/candle/sm_candle_b.mesh index 64c8ef9..c3eb0fd 100644 Binary files a/assets/props/candle/sm_candle_b.mesh and b/assets/props/candle/sm_candle_b.mesh differ diff --git a/assets/props/candle/sm_candle_c.mesh b/assets/props/candle/sm_candle_c.mesh index 7aba054..50d0628 100644 Binary files a/assets/props/candle/sm_candle_c.mesh and b/assets/props/candle/sm_candle_c.mesh differ diff --git a/assets/props/candle/sm_candle_d.mesh b/assets/props/candle/sm_candle_d.mesh index 33a697f..3c21ef8 100644 Binary files a/assets/props/candle/sm_candle_d.mesh and b/assets/props/candle/sm_candle_d.mesh differ diff --git a/assets/props/candle/sm_candle_top.mesh b/assets/props/candle/sm_candle_top.mesh index 4da7a28..24fb583 100644 Binary files a/assets/props/candle/sm_candle_top.mesh and b/assets/props/candle/sm_candle_top.mesh differ diff --git a/assets/props/candle/sm_candlestick.mesh b/assets/props/candle/sm_candlestick.mesh index 3348482..24492af 100644 Binary files a/assets/props/candle/sm_candlestick.mesh and b/assets/props/candle/sm_candlestick.mesh differ diff --git a/assets/props/godet/sm_godet.mesh b/assets/props/godet/sm_godet.mesh index d3b78f8..610b310 100644 Binary files a/assets/props/godet/sm_godet.mesh and b/assets/props/godet/sm_godet.mesh differ diff --git a/assets/props/growler/sm_growler.mesh b/assets/props/growler/sm_growler.mesh index 2310d74..2e35b11 100644 Binary files a/assets/props/growler/sm_growler.mesh and b/assets/props/growler/sm_growler.mesh differ diff --git a/assets/props/parchment/sm_paper_parcment.mesh b/assets/props/parchment/sm_paper_parcment.mesh index ae3a799..ae33bfe 100644 Binary files a/assets/props/parchment/sm_paper_parcment.mesh and b/assets/props/parchment/sm_paper_parcment.mesh differ diff --git a/assets/props/parchment/sm_wood_parchment.mesh b/assets/props/parchment/sm_wood_parchment.mesh index 6422094..2ad8a7e 100644 Binary files a/assets/props/parchment/sm_wood_parchment.mesh and b/assets/props/parchment/sm_wood_parchment.mesh differ diff --git a/assets/props/rock floor/sm_floor.mesh b/assets/props/rock floor/sm_floor.mesh index e0feee1..ce0ab3a 100644 Binary files a/assets/props/rock floor/sm_floor.mesh and b/assets/props/rock floor/sm_floor.mesh differ diff --git a/assets/props/table/sm_table.mesh b/assets/props/table/sm_table.mesh index 591c154..001fe4c 100644 Binary files a/assets/props/table/sm_table.mesh and b/assets/props/table/sm_table.mesh differ diff --git a/developers/aurelien/CheckLightmap.tscn b/developers/aurelien/CheckLightmap.tscn index 2bbfae4..b6662cc 100644 --- a/developers/aurelien/CheckLightmap.tscn +++ b/developers/aurelien/CheckLightmap.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 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] @@ -17,8 +17,8 @@ [ext_resource path="res://assets/props/parchment/sm_paper_parcment.mesh" type="ArrayMesh" id=15] [ext_resource path="res://assets/props/parchment/sm_wood_parchment.mesh" type="ArrayMesh" id=16] [ext_resource path="res://assets/props/rock floor/sm_floor.mesh" type="ArrayMesh" id=17] - -[sub_resource type="ArrayMesh" id=1] +[ext_resource path="res://assets/props/stool b/sm_stool_b.mesh" type="ArrayMesh" id=18] +[ext_resource path="res://assets/props/table/sm_table.mesh" type="ArrayMesh" id=19] [node name="Spatial" type="Spatial"] script = ExtResource( 3 ) @@ -34,15 +34,11 @@ light_data = ExtResource( 2 ) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = ExtResource( 10 ) -[node name="MeshInstance" type="MeshInstance" parent="."] -use_in_baked_light = true -mesh = SubResource( 1 ) - [node name="Camera" type="Camera" parent="."] -transform = Transform( 0.089016, -0.715663, 0.692751, 0, 0.695512, 0.718515, -0.99603, -0.0639593, 0.0619117, 3.11871, 2.13639, -0.961164 ) +transform = Transform( 0.089016, -0.715663, 0.692751, 0, 0.695512, 0.718515, -0.99603, -0.0639593, 0.0619117, 1.67474, 2.13639, -1.14519 ) [node name="plane" type="MeshInstance" parent="."] -transform = Transform( 8.39917, 0, 0, 0, 1, 0, 0, 0, 11.9516, 1.32217, 0, -1.7752 ) +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 ) @@ -188,6 +184,145 @@ light_bake_mode = 2 shadow_enabled = true 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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_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 + +[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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +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_indirect_energy = 4.0 +light_bake_mode = 2 +shadow_enabled = true +spot_angle = 15.0 + [node name="Books" type="Spatial" parent="."] [node name="sm_book4" type="MeshInstance" parent="Books"] @@ -338,6 +473,7 @@ material/0 = null [node name="sm_godet" type="MeshInstance" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.496689, 0.0078643, -1.39236 ) +use_in_baked_light = true mesh = ExtResource( 13 ) material/0 = null @@ -367,16 +503,19 @@ material/0 = null [node name="sm_growler" type="MeshInstance" parent="."] transform = Transform( 0.605072, 0, 0.796171, 0, 1, 0, -0.796171, 0, 0.605072, 0.506431, 0, -1.78796 ) +use_in_baked_light = true 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 ) +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 ) +use_in_baked_light = true mesh = ExtResource( 13 ) material/0 = null @@ -385,3 +524,15 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.394688, 0.00836658, -4.30329 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 ) +use_in_baked_light = true +mesh = ExtResource( 19 ) +material/0 = null + +[node name="sm_stool_b" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.71977, -3.03984e-06, -2.63978 ) +use_in_baked_light = true +mesh = ExtResource( 18 ) +material/0 = null