Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
This commit is contained in:
commit
b7542cd706
@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=27 format=2]
|
||||
[gd_scene load_steps=28 format=2]
|
||||
|
||||
[ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://scripts/cameras.gd" type="Script" id=2]
|
||||
@ -26,7 +26,11 @@ height = 5.22615
|
||||
radius = 12.052
|
||||
|
||||
[sub_resource type="BoxShape" id=4]
|
||||
extents = Vector3( 1.78436, 2.33105, 6.04815 )
|
||||
extents = Vector3( 2.35482, 2.33105, 6.04815 )
|
||||
|
||||
[sub_resource type="CylinderShape" id=10]
|
||||
height = 3.37631
|
||||
radius = 5.66158
|
||||
|
||||
[sub_resource type="Animation" id=3]
|
||||
length = 0.001
|
||||
@ -125,7 +129,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 16.3 )
|
||||
script = ExtResource( 5 )
|
||||
|
||||
[node name="camera" type="Camera" parent="cameras/camera_room_hallway"]
|
||||
transform = Transform( -4.37114e-08, 0.965926, -0.258819, 0, 0.258819, 0.965926, 1, 4.2222e-08, -1.13133e-08, -1.397, 10, -2.312 )
|
||||
transform = Transform( -1, -8.44439e-08, 2.26267e-08, 0, 0.258819, 0.965926, -8.74228e-08, 0.965926, -0.258819, 0.079, 10, -2.807 )
|
||||
|
||||
[node name="hitbox" type="Area" parent="cameras/camera_room_hallway"]
|
||||
collision_layer = 16
|
||||
@ -135,6 +139,21 @@ collision_mask = 2
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.52689, -1.44831 )
|
||||
shape = SubResource( 4 )
|
||||
|
||||
[node name="camera_room_bedroom" type="Spatial" parent="cameras"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 27.5 )
|
||||
script = ExtResource( 5 )
|
||||
|
||||
[node name="camera" type="Camera" parent="cameras/camera_room_bedroom"]
|
||||
transform = Transform( -1, 8.44439e-08, -2.26267e-08, 0, 0.258819, 0.965926, 8.74228e-08, 0.965926, -0.258819, 0, 10, -3.925 )
|
||||
|
||||
[node name="hitbox" type="Area" parent="cameras/camera_room_bedroom"]
|
||||
collision_layer = 16
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="cameras/camera_room_bedroom/hitbox"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -1.00274 )
|
||||
shape = SubResource( 10 )
|
||||
|
||||
[node name="camera_rover" parent="cameras" instance=ExtResource( 4 )]
|
||||
transform = Transform( -0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, -11.526, 0, 11.526 )
|
||||
|
||||
@ -190,6 +209,12 @@ shadow_enabled = true
|
||||
omni_range = 5.893
|
||||
omni_attenuation = 2.0
|
||||
|
||||
[node name="light_bedroom" type="OmniLight" parent="lights"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.24654, 25.9525 )
|
||||
shadow_enabled = true
|
||||
omni_range = 7.99929
|
||||
omni_attenuation = 2.0
|
||||
|
||||
[node name="light_rover" type="OmniLight" parent="lights"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11.526, 3.329, 11.526 )
|
||||
shadow_enabled = true
|
||||
@ -288,7 +313,7 @@ modulate = Color( 0, 0, 0, 1 )
|
||||
text = "TRANSFORMATRON"
|
||||
|
||||
[node name="Bed_Room" type="Spatial" parent="."]
|
||||
transform = Transform( -0.999913, 0, 0.0131247, 0, 1, 0, -0.0131247, 0, -0.999913, -0.0536704, 0, 8.64287 )
|
||||
transform = Transform( -0.999913, 0, 0.0131247, 0, 1, 0, -0.0131247, 0, -0.999913, -0.0536704, 0, 23.0231 )
|
||||
|
||||
[node name="Room_Label" type="Label3D" parent="Bed_Room"]
|
||||
transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 )
|
||||
@ -366,6 +391,10 @@ transform = Transform( 1, 3.49246e-10, -2.23517e-08, -3.49246e-10, 1, 1.60071e-1
|
||||
[connection signal="player_exited" from="cameras/camera_room_hallway" to="cameras" method="_on_camera_room_player_exited"]
|
||||
[connection signal="area_entered" from="cameras/camera_room_hallway/hitbox" to="cameras/camera_room_hallway" method="_on_hitbox_area_entered"]
|
||||
[connection signal="area_exited" from="cameras/camera_room_hallway/hitbox" to="cameras/camera_room_hallway" method="_on_hitbox_area_exited"]
|
||||
[connection signal="player_entered" from="cameras/camera_room_bedroom" to="cameras" method="_on_camera_room_player_entered"]
|
||||
[connection signal="player_exited" from="cameras/camera_room_bedroom" to="cameras" method="_on_camera_room_player_exited"]
|
||||
[connection signal="area_entered" from="cameras/camera_room_bedroom/hitbox" to="cameras/camera_room_bedroom" method="_on_hitbox_area_entered"]
|
||||
[connection signal="area_exited" from="cameras/camera_room_bedroom/hitbox" to="cameras/camera_room_bedroom" method="_on_hitbox_area_exited"]
|
||||
[connection signal="player_entered" from="cameras/camera_rover" to="cameras" method="_on_camera_room_player_entered"]
|
||||
[connection signal="player_exited" from="cameras/camera_rover" to="cameras" method="_on_camera_room_player_exited"]
|
||||
[connection signal="player_entered" from="cameras/camera_comms" to="cameras" method="_on_camera_room_player_entered"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user