diff --git a/assets/materials/gray.tres b/assets/materials/gray.tres index 8f0b982..9783a54 100644 --- a/assets/materials/gray.tres +++ b/assets/materials/gray.tres @@ -30,6 +30,7 @@ void light() { } " +graph_offset = Vector2( -24.488, 110 ) nodes/fragment/3/node = SubResource( 1 ) nodes/fragment/3/position = Vector2( 0, 140 ) nodes/fragment/connections = PoolIntArray( 3, 0, 0, 0 ) diff --git a/assets/props/book/materials/MAT_book.material b/assets/props/book/materials/MAT_book.material index 4018b97..58cc6cb 100644 Binary files a/assets/props/book/materials/MAT_book.material and b/assets/props/book/materials/MAT_book.material differ diff --git a/developers/aurelien/CheckLightmap.exr b/developers/aurelien/CheckLightmap.exr index 6f7b247..a4029ed 100644 Binary files a/developers/aurelien/CheckLightmap.exr and b/developers/aurelien/CheckLightmap.exr differ diff --git a/developers/aurelien/CheckLightmap.lmbake b/developers/aurelien/CheckLightmap.lmbake index 898ec40..028546a 100644 Binary files a/developers/aurelien/CheckLightmap.lmbake and b/developers/aurelien/CheckLightmap.lmbake differ diff --git a/developers/aurelien/CheckLightmap.tscn b/developers/aurelien/CheckLightmap.tscn index edb4b50..9381af0 100644 --- a/developers/aurelien/CheckLightmap.tscn +++ b/developers/aurelien/CheckLightmap.tscn @@ -6,30 +6,28 @@ [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/book/materials/MA_book.tres" type="Shader" id=7] +[ext_resource path="res://assets/props/dagger/materials/MA_Dissolve.material" type="Material" id=7] +[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=8] +[ext_resource path="res://assets/props/candle/sm_candle_a.mesh" type="ArrayMesh" id=9] -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 7 ) - -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 7 ) - -[sub_resource type="ArrayMesh" id=3] +[sub_resource type="ArrayMesh" id=1] [node name="Spatial" type="Spatial"] script = ExtResource( 3 ) [node name="BakedLightmap" type="BakedLightmap" parent="."] -extents = Vector3( 4, 4, 4 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01067, 1.3203, -0.22506 ) +extents = Vector3( 2.04435, 1.56454, 3.03432 ) quality = 3 bounces = 6 +default_texels_per_unit = 4.0 environment_mode = 1 +environment_min_light = Color( 0.12549, 0.12549, 0.286275, 1 ) capture_quality = 2 light_data = ExtResource( 2 ) [node name="SpotLight" type="SpotLight" parent="."] -transform = Transform( 1, 0, 0, 0, 0.145807, 0.989313, 0, -0.989313, 0.145807, 0.563775, 2.12757, 0.864609 ) -visible = false +transform = Transform( 1, 0, 0, 0, 0.145807, 0.989313, 0, -0.989313, 0.145807, 0.479118, 2.12757, 0.558079 ) light_energy = 10.0 light_indirect_energy = 4.0 light_bake_mode = 2 @@ -37,8 +35,7 @@ shadow_enabled = true spot_angle = 32.1 [node name="SpotLight2" type="SpotLight" parent="."] -transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.305956, 0.959701, -0.838667 ) -visible = false +transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.055364, 0.959701, -0.401885 ) light_color = Color( 0.564706, 0.227451, 0.227451, 1 ) light_energy = 10.0 light_indirect_energy = 4.0 @@ -46,27 +43,9 @@ light_bake_mode = 2 shadow_enabled = true spot_angle = 15.0 -[node name="sm_book3" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.03881 ) -mesh = ExtResource( 1 ) -material/0 = SubResource( 1 ) - -[node name="sm_book4" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.743055, 0.0414186, 1.03485 ) -use_in_baked_light = true -mesh = ExtResource( 1 ) -material/0 = SubResource( 2 ) - -[node name="sm_book" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0435888, 0.106022 ) -use_in_baked_light = true -lightmap_scale = 1 -mesh = ExtResource( 1 ) -material/0 = null - [node name="MeshInstance" type="MeshInstance" parent="."] use_in_baked_light = true -mesh = SubResource( 3 ) +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.0619116, 2.07081, 2.13639, 0.731596 ) @@ -78,16 +57,94 @@ lightmap_scale = 1 mesh = ExtResource( 5 ) material/0 = null -[node name="sm_book2" type="MeshInstance" parent="."] -transform = Transform( 0.276862, 0, 0.96091, 0, 1, 0, -0.96091, 0, 0.276862, 0.186131, 0.0414188, -0.458372 ) +[node name="plane" type="MeshInstance" parent="."] +transform = Transform( 5.179, 0, 0, 0, 1, 0, 0, 0, 8.204, -0.583, 0, 0 ) +use_in_baked_light = true +lightmap_scale = 2 +mesh = ExtResource( 4 ) +material/0 = ExtResource( 6 ) + +[node name="sm_candle_a" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.460123, 0.0295914, 0.0291587 ) +use_in_baked_light = true +mesh = ExtResource( 9 ) +material/0 = null + +[node name="sm_candle_a2" type="MeshInstance" parent="."] +transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0.291979, 0.0295914, 0.0291587 ) +use_in_baked_light = true +lightmap_scale = 2 +mesh = ExtResource( 9 ) +material/0 = null + +[node name="sm_book3" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.03881 ) use_in_baked_light = true lightmap_scale = 1 mesh = ExtResource( 1 ) material/0 = null -[node name="plane" type="MeshInstance" parent="."] -transform = Transform( 5.17929, 0, 0, 0, 5.17929, 0, 0, 0, 8.20363, 0, 0, 0 ) +[node name="sm_book10" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 0.331732 ) use_in_baked_light = true -lightmap_scale = 2 -mesh = ExtResource( 4 ) -material/0 = ExtResource( 6 ) +mesh = ExtResource( 1 ) +material/0 = ExtResource( 7 ) + +[node name="sm_book9" type="MeshInstance" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.53911 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = null + +[node name="Books" type="Spatial" parent="."] + +[node name="sm_book4" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.743055, 0.0414186, 1.03485 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book5" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0423009, 0.0414186, 1.05613 ) +use_in_baked_light = true +lightmap_scale = 3 +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book11" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0423009, 0.0414186, 1.52165 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book6" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.293967, 0.0414186, 1.03485 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book7" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.743055, 0.0414186, 1.51383 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book8" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.293967, 0.0414186, 1.51383 ) +use_in_baked_light = true +mesh = ExtResource( 1 ) +material/0 = ExtResource( 8 ) + +[node name="sm_book" type="MeshInstance" parent="Books"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0435888, 0.106022 ) +use_in_baked_light = true +lightmap_scale = 1 +mesh = ExtResource( 1 ) +material/0 = null + +[node name="sm_book2" type="MeshInstance" parent="Books"] +transform = Transform( 0.276862, 0, 0.96091, 0, 1, 0, -0.96091, 0, 0.276862, 0.186131, 0.0414188, -0.458372 ) +use_in_baked_light = true +lightmap_scale = 1 +mesh = ExtResource( 1 ) +material/0 = null