Fix potential issues when taking pills inside labyrinth corridor

This commit is contained in:
karl 2020-01-26 00:51:41 +01:00
parent 082ad8738a
commit 153a478e2d
5 changed files with 5465 additions and 63 deletions

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=2] [gd_scene load_steps=14 format=2]
[ext_resource path="res://Level/Labyrinth/LabyrinthCorridorTrue.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Labyrinth/LabyrinthCorridorTrue.tscn" type="PackedScene" id=1]
[ext_resource path="res://Level/Labyrinth/LabyrinthCrossing.tscn" type="PackedScene" id=2] [ext_resource path="res://Level/Labyrinth/LabyrinthCrossing.tscn" type="PackedScene" id=2]
@ -29,6 +29,9 @@ points = PoolVector3Array( 65, 0, 4, -65, 0, 4, 65, 0, -4, -65, 0, -4 )
[sub_resource type="ConvexPolygonShape" id=8] [sub_resource type="ConvexPolygonShape" id=8]
points = PoolVector3Array( 65, 0, 4, -65, 0, 4, 65, 0, -4, -65, 0, -4 ) points = PoolVector3Array( 65, 0, 4, -65, 0, 4, 65, 0, -4, -65, 0, -4 )
[sub_resource type="Environment" id=9]
ambient_light_color = Color( 0.290196, 0, 0, 1 )
[node name="Labyrinth" type="Spatial"] [node name="Labyrinth" type="Spatial"]
[node name="LabyrinthCorridorTrue" parent="." instance=ExtResource( 1 )] [node name="LabyrinthCorridorTrue" parent="." instance=ExtResource( 1 )]
@ -52,15 +55,9 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -45, 0, 30 )
[node name="LabyrinthCorridorTrue13" parent="." instance=ExtResource( 1 )] [node name="LabyrinthCorridorTrue13" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, 30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, 30 )
[node name="LabyrinthCorridorTrue14" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, 0 )
[node name="LabyrinthCorridorTrue16" parent="." instance=ExtResource( 1 )] [node name="LabyrinthCorridorTrue16" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75, 0, -30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -75, 0, -30 )
[node name="LabyrinthCorridorTrue15" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -105, 0, -30 )
[node name="LabyrinthCorridorTrue5" parent="." instance=ExtResource( 1 )] [node name="LabyrinthCorridorTrue5" parent="." instance=ExtResource( 1 )]
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 15 ) transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 15 )
@ -99,27 +96,18 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, 30 )
[node name="LabyrinthCrossing15" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing15" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, 30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, 30 )
[node name="LabyrinthCrossing19" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -120, 0, 30 )
[node name="LabyrinthCrossing11" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing11" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, 0 )
[node name="LabyrinthCrossing17" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing17" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, 0 )
[node name="LabyrinthCrossing21" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -120, 0, 0 )
[node name="LabyrinthCrossing13" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing13" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, -60 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, -60 )
[node name="LabyrinthCrossing14" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing14" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, -60 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, -60 )
[node name="LabyrinthCrossing18" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -120, 0, -60 )
[node name="LabyrinthCrossing2" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing2" parent="." instance=ExtResource( 2 )]
[node name="LabyrinthCrossing22" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing22" parent="." instance=ExtResource( 2 )]
@ -134,9 +122,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -60, 0, -30 )
[node name="LabyrinthCrossing16" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing16" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, -30 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -90, 0, -30 )
[node name="LabyrinthCrossing20" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -120, 0, -30 )
[node name="LabyrinthCrossing8" parent="." instance=ExtResource( 2 )] [node name="LabyrinthCrossing8" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -60 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -30, 0, -60 )
@ -194,7 +179,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 0, 0 )
[node name="OuterWalls" type="Spatial" parent="."] [node name="OuterWalls" type="Spatial" parent="."]
[node name="MeshInstance" type="MeshInstance" parent="OuterWalls"] [node name="MeshInstance" type="MeshInstance" parent="OuterWalls"]
transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -60, 5, 35 ) transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, -50, 5, 35 )
layers = 3 layers = 3
mesh = SubResource( 1 ) mesh = SubResource( 1 )
material/0 = null material/0 = null
@ -205,7 +190,7 @@ material/0 = null
shape = SubResource( 2 ) shape = SubResource( 2 )
[node name="MeshInstance2" type="MeshInstance" parent="OuterWalls"] [node name="MeshInstance2" type="MeshInstance" parent="OuterWalls"]
transform = Transform( 1, 1.74846e-07, -7.64274e-15, 0, -4.37114e-08, -1, -1.74846e-07, 1, -4.37114e-08, -60, 5, -65 ) transform = Transform( 1, 1.74846e-07, -7.64274e-15, 0, -4.37114e-08, -1, -1.74846e-07, 1, -4.37114e-08, -50, 5, -65 )
layers = 3 layers = 3
mesh = SubResource( 1 ) mesh = SubResource( 1 )
material/0 = null material/0 = null
@ -248,6 +233,17 @@ material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="OuterWalls/MeshInstance5/StaticBody"] [node name="CollisionShape" type="CollisionShape" parent="OuterWalls/MeshInstance5/StaticBody"]
shape = SubResource( 6 ) shape = SubResource( 6 )
[node name="MeshInstance8" type="MeshInstance" parent="OuterWalls"]
transform = Transform( -7.98311e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -0.49, -1.62921e-07, 7.12149e-15, -95, 5, -15 )
layers = 3
mesh = SubResource( 1 )
material/0 = null
[node name="StaticBody" type="StaticBody" parent="OuterWalls/MeshInstance8"]
[node name="CollisionShape" type="CollisionShape" parent="OuterWalls/MeshInstance8/StaticBody"]
shape = SubResource( 6 )
[node name="MeshInstance6" type="MeshInstance" parent="OuterWalls"] [node name="MeshInstance6" type="MeshInstance" parent="OuterWalls"]
transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, 75, 5, 4.99999 ) transform = Transform( -1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, 75, 5, 4.99999 )
layers = 3 layers = 3
@ -269,3 +265,6 @@ material/0 = null
[node name="CollisionShape" type="CollisionShape" parent="OuterWalls/MeshInstance7/StaticBody"] [node name="CollisionShape" type="CollisionShape" parent="OuterWalls/MeshInstance7/StaticBody"]
shape = SubResource( 8 ) shape = SubResource( 8 )
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource( 9 )

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,6 @@
[gd_resource type="SpatialMaterial" format=2] [gd_resource type="SpatialMaterial" format=2]
[resource] [resource]
params_cull_mode = 2
metallic = 0.65 metallic = 0.65
roughness = 0.71 roughness = 0.71

View File

@ -1,12 +1,10 @@
# Blender MTL File: 'None' # Blender MTL File: 'None'
# Material Count: 1 # Material Count: 1
newmtl Material newmtl None
Ns 323.999994 Ns 500
Ka 1.000000 1.000000 1.000000 Ka 0.8 0.8 0.8
Kd 0.800000 0.800000 0.800000 Kd 0.8 0.8 0.8
Ks 0.500000 0.500000 0.500000 Ks 0.8 0.8 0.8
Ke 0.0 0.0 0.0 d 1
Ni 1.450000
d 1.000000
illum 2 illum 2

File diff suppressed because it is too large Load Diff