darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix all material, mesh and lightmap site ; disable light and set the basic fire light

Browse Source
This commit is contained in:
VAILLANT Jeremy
2021-05-14 23:28:46 +02:00
parent 332ccf95e7
commit 384b1245b9
7 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/levels/warcraft/WarCraft.tscn
+90 -52
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=58 format=2]
[gd_scene load_steps=59 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]
@@ -39,10 +39,10 @@
[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]
[ext_resource path="res://assets/props/column/sm_column.mesh" type="ArrayMesh" id=40]
[ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=41]
[sub_resource type="PlaneMesh" id=1]
[sub_resource type="ArrayMesh" id=2]
[sub_resource type="ArrayMesh" id=1]
lightmap_size_hint = Vector2( 338, 334 )
surfaces/0 = {
"aabb": AABB( -10, -0.00836658, -7, 12, 0.0792593, 12 ),
@@ -57,12 +57,12 @@ surfaces/0 = {
"vertex_count": 75486
}
[sub_resource type="PanoramaSky" id=3]
[sub_resource type="PanoramaSky" id=2]
panorama = ExtResource( 11 )
[sub_resource type="Environment" id=4]
[sub_resource type="Environment" id=3]
background_mode = 3
background_sky = SubResource( 3 )
background_sky = SubResource( 2 )
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 )
@@ -82,54 +82,54 @@ ss_reflections_enabled = true
dof_blur_far_distance = 2.0
glow_enabled = true
[sub_resource type="CapsuleShape" id=5]
[sub_resource type="CapsuleShape" id=4]
radius = 0.130821
height = 0.168171
[sub_resource type="CapsuleShape" id=6]
[sub_resource type="CapsuleShape" id=5]
radius = 0.129956
height = 0.149993
[sub_resource type="CapsuleShape" id=7]
[sub_resource type="CapsuleShape" id=6]
radius = 0.124344
height = 0.123496
[sub_resource type="CapsuleShape" id=8]
[sub_resource type="CapsuleShape" id=7]
radius = 0.0500489
height = 0.330211
[sub_resource type="CapsuleShape" id=9]
[sub_resource type="CapsuleShape" id=8]
radius = 0.0995524
height = 0.748899
[sub_resource type="CapsuleShape" id=10]
[sub_resource type="CapsuleShape" id=9]
radius = 0.114536
height = 0.236295
[sub_resource type="CapsuleShape" id=11]
[sub_resource type="CapsuleShape" id=10]
radius = 0.0911443
height = 0.831942
[sub_resource type="SphereShape" id=12]
[sub_resource type="SphereShape" id=11]
radius = 0.0777453
[sub_resource type="SphereShape" id=13]
[sub_resource type="SphereShape" id=12]
radius = 0.0939276
[sub_resource type="SphereShape" id=14]
[sub_resource type="SphereShape" id=13]
radius = 0.0872712
[sub_resource type="SphereShape" id=15]
[sub_resource type="SphereShape" id=14]
radius = 0.0817803
[sub_resource type="BoxShape" id=16]
[sub_resource type="BoxShape" id=15]
extents = Vector3( 0.075969, 0.0690835, 0.0842404 )
[sub_resource type="CylinderShape" id=17]
[sub_resource type="CylinderShape" id=16]
radius = 0.0715322
height = 0.169626
[sub_resource type="CylinderShape" id=18]
[sub_resource type="CylinderShape" id=17]
radius = 0.0931278
height = 0.171908
@@ -151,10 +151,30 @@ far = 60.0
[node name="Building" type="Spatial" parent="."]
[node name="MeshInstance" type="MeshInstance" parent="Building"]
transform = Transform( 5.45383, 0, 0, 0, -6.36082e-07, 2.46314, 0, -2.05553, -1.52086e-08, -3.48147, 2.21218, 4.82163 )
[node name="walls" type="Spatial" parent="Building"]
[node name="wall_left" type="MeshInstance" parent="Building/walls"]
transform = Transform( 17.6823, 0, 0, 0, -2.06229e-06, 7.98594, 0, -6.6644, -4.9309e-08, -3.48147, 2.21218, 4.82163 )
use_in_baked_light = true
mesh = SubResource( 1 )
mesh = ExtResource( 41 )
material/0 = ExtResource( 8 )
[node name="wall_roof" type="MeshInstance" parent="Building/walls"]
transform = Transform( 19.0333, 0, 0, 0, -2.05553, -1.80384e-05, 0, 1.78061e-06, -20.8236, -3.43417, 4.19346, -0.500263 )
use_in_baked_light = true
mesh = ExtResource( 41 )
material/0 = ExtResource( 8 )
[node name="wall_right" type="MeshInstance" parent="Building/walls"]
transform = Transform( -17.1913, -1.14248, -5.98426e-08, 0, -2.8759e-07, 7.88397, -3.0313, 6.47934, 3.39384e-07, -3.48147, 2.21218, -5.82482 )
use_in_baked_light = true
mesh = ExtResource( 41 )
material/0 = ExtResource( 8 )
[node name="wall_background" type="MeshInstance" parent="Building/walls"]
transform = Transform( -3.92366, 6.98897, 3.66077e-07, 0, -3.1021e-07, 8.50407, 22.2522, 1.23234, 6.45493e-08, -7.48147, 2.21218, -0.975186 )
use_in_baked_light = true
mesh = ExtResource( 41 )
material/0 = ExtResource( 8 )
[node name="GridMapFloor" type="GridMap" parent="Building"]
@@ -162,9 +182,9 @@ mesh_library = ExtResource( 15 )
use_in_baked_light = true
cell_center_y = false
cell_center_z = false
baked_meshes = [ SubResource( 2 ) ]
baked_meshes = [ SubResource( 1 ) ]
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, 536870915 )
"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, 536870915, 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,
@@ -172,19 +192,32 @@ __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 )
[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 )
transform = Transform( 0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, 0.173648, -6.41226, 0, -3.39909 )
use_in_baked_light = true
mesh = ExtResource( 40 )
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 )
transform = Transform( 0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, 0.173648, -7.23782, 0, 1.51736 )
use_in_baked_light = true
mesh = ExtResource( 40 )
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 )
transform = Transform( 0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, 0.173648, -7.73765, 0, 4.20657 )
use_in_baked_light = true
mesh = ExtResource( 40 )
material/0 = null
[node name="sm_column4" type="MeshInstance" parent="Building"]
transform = Transform( 0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, 0.173648, -5.90352, 0, -6.13626 )
use_in_baked_light = true
mesh = ExtResource( 40 )
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 )
transform = Transform( 0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, 0.173648, -7.17176, -2.38419e-07, -1.02066 )
use_in_baked_light = true
mesh = ExtResource( 39 )
material/0 = null
@@ -277,7 +310,9 @@ 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 = 2.0
light_energy = 6.0
light_indirect_energy = 1.4
light_bake_mode = 2
omni_range = 0.6
[node name="sm_table2" type="MeshInstance" parent="Main Scene Props"]
@@ -419,7 +454,7 @@ material/0 = null
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_energy = 0.0
light_bake_mode = 2
shadow_enabled = true
shadow_contact = 1.0
@@ -428,12 +463,14 @@ shadow_contact = 1.0
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_energy = 0.0
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_energy = 0.0
light_specular = 0.23
light_bake_mode = 2
spot_range = 8.1
@@ -443,21 +480,22 @@ spot_angle = 55.8
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="Sun" type="DirectionalLight" parent="Lighting"]
transform = Transform( -0.777664, -0.348191, 0.523451, 0.0166148, 0.820946, 0.570764, -0.62846, 0.45256, -0.632635, 0, 1.62188, 0 )
transform = Transform( -0.831386, -0.510132, 0.220371, -0.132879, 0.567564, 0.812536, -0.539575, 0.646248, -0.53965, 0, 1.62188, 0 )
light_color = Color( 0.501961, 0.67451, 1, 1 )
light_energy = 8.0
light_energy = 0.0
light_bake_mode = 2
shadow_enabled = true
shadow_contact = 0.3
[node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"]
environment = SubResource( 4 )
environment = SubResource( 3 )
[node name="Dialog" type="Control" parent="."]
margin_right = 40.0
@@ -499,7 +537,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole1/Area"]
transform = Transform( 1, 2.98023e-08, -8.9407e-08, 0, -1.19209e-07, 1, -8.9407e-08, -1, 2.98023e-08, -5.96046e-08, 0.0801149, 0 )
shape = SubResource( 5 )
shape = SubResource( 4 )
[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 )
@@ -512,7 +550,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole2/Area"]
transform = Transform( 1, 5.96046e-08, -8.9407e-08, 2.98023e-08, -8.9407e-08, 1, -8.9407e-08, -1, 0, 2.38419e-07, 0.0823998, -1.19209e-07 )
shape = SubResource( 6 )
shape = SubResource( 5 )
[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 )
@@ -529,7 +567,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/fioles/fiole_socle/fiole3/Area"]
transform = Transform( 1, 2.08616e-07, -7.45058e-08, -5.96046e-08, -1.49012e-07, 1, 5.96046e-08, -1, -1.04308e-07, -1.78814e-07, 0.0560231, 0 )
shape = SubResource( 7 )
shape = SubResource( 6 )
[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 )
@@ -541,7 +579,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/dagger/Area"]
transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.0802139, 0 )
shape = SubResource( 8 )
shape = SubResource( 7 )
[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 )
@@ -551,7 +589,7 @@ collision_mask = 2
[node name="CollisionShape" type="CollisionShape" parent="Hidden Objects Items/spyglass/Area"]
transform = Transform( 1, 0, 0, 1.86265e-09, 1, 3.72529e-09, -2.98023e-08, 3.72529e-09, 1, 2.38419e-07, -1.19209e-07, 0.0177534 )
shape = SubResource( 9 )
shape = SubResource( 8 )
[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 )
@@ -564,7 +602,7 @@ collision_mask = 2
[node name="CollisionShapeBeer" type="CollisionShape" parent="Hidden Objects Items/beer/Area"]
transform = Transform( 1, 0, -1.61817e-08, 1.83936e-08, -4.28408e-08, 1, 0, -1, -4.65661e-08, 9.53674e-07, 0.0746492, 2.38419e-07 )
shape = SubResource( 10 )
shape = SubResource( 9 )
[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 )
@@ -576,7 +614,7 @@ collision_mask = 2
[node name="CollisionShapeWeapon" type="CollisionShape" parent="Hidden Objects Items/weapon/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, 0.0388942, 0.0484145, -8.19564e-08 )
shape = SubResource( 11 )
shape = SubResource( 10 )
[node name="apples" type="Spatial" parent="Hidden Objects Items"]
@@ -590,7 +628,7 @@ collision_mask = 2
[node name="CollisionShapeApple" type="CollisionShape" parent="Hidden Objects Items/apples/apple1/Area"]
transform = Transform( -1.45286e-07, -2.98023e-08, 1, -1, -1.11759e-08, 0, 1.86265e-08, -1, -8.9407e-08, -1.90735e-06, 0.00575864, 0 )
shape = SubResource( 12 )
shape = SubResource( 11 )
[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 )
@@ -602,7 +640,7 @@ collision_mask = 2
[node name="CollisionShapeApple2" type="CollisionShape" parent="Hidden Objects Items/apples/apple2/Area"]
transform = Transform( -1.49012e-07, 4.47035e-08, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -1.49012e-08, -4.76837e-07, -0.00566041, 0 )
shape = SubResource( 13 )
shape = SubResource( 12 )
[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 )
@@ -614,7 +652,7 @@ collision_mask = 2
[node name="CollisionShapeApple3" type="CollisionShape" parent="Hidden Objects Items/apples/apple3/Area"]
transform = Transform( -1.71363e-07, 0, 1, -1, -3.72529e-08, 1.49012e-08, 2.98023e-08, -1, -1.19209e-07, -3.57628e-07, 0.0142345, 2.38419e-07 )
shape = SubResource( 14 )
shape = SubResource( 13 )
[node name="apple4" type="MeshInstance" parent="Hidden Objects Items/apples"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.97752, -0.491035, 0.41055 )
@@ -626,7 +664,7 @@ collision_mask = 2
[node name="CollisionShapeApple4" type="CollisionShape" parent="Hidden Objects Items/apples/apple4/Area"]
transform = Transform( -1.49012e-07, 0, 1, -1, -1.49012e-08, 0, 3.72529e-08, -1, -5.21541e-08, -4.76837e-07, 0.00115258, -1.17347e-07 )
shape = SubResource( 15 )
shape = SubResource( 14 )
[node name="golds" type="Spatial" parent="Hidden Objects Items"]
@@ -640,7 +678,7 @@ collision_mask = 2
[node name="CollisionShapeGold1" type="CollisionShape" parent="Hidden Objects Items/golds/coin1/Area"]
transform = Transform( 1, -4.65661e-08, 0, -1.38185e-07, 0.999999, 3.14321e-08, 4.17233e-07, -4.19095e-09, 1, 0.0276761, 0.00212932, 0.0336302 )
shape = SubResource( 16 )
shape = SubResource( 15 )
[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 )
@@ -653,7 +691,7 @@ collision_mask = 2
[node name="CollisionShapeGold2" type="CollisionShape" parent="Hidden Objects Items/golds/coin2/Area"]
transform = Transform( 1, 0, 2.98023e-08, 7.45058e-09, 1, -9.31323e-10, 5.96046e-08, 0, 1, 0.0499306, 1.19209e-07, 0.0191208 )
shape = SubResource( 17 )
shape = SubResource( 16 )
[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 )
@@ -665,6 +703,6 @@ collision_mask = 2
[node name="CollisionShapeGold3" type="CollisionShape" parent="Hidden Objects Items/golds/coin3/Area"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 )
shape = SubResource( 18 )
shape = SubResource( 17 )
[connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"]