fixed deadend's ceiling hole

added hallway with torch scene
started adding pieces back into main
master
Zac 4 years ago
parent 905efd1b0c
commit e490e4acc6
  1. 18
      _scenes/main.tscn
  2. 10
      _scenes/pieces/deadend.tscn
  3. 2
      _scenes/pieces/hallway.tscn
  4. 40
      _scenes/pieces/hallway_w_torch.tscn

@ -1,7 +1,10 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://_scenes/pieces/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://_scenes/pieces/UI.tscn" type="PackedScene" id=2]
[ext_resource path="res://_scenes/pieces/hallway.tscn" type="PackedScene" id=3]
[ext_resource path="res://_scenes/pieces/hallway_w_torch.tscn" type="PackedScene" id=4]
[ext_resource path="res://_scenes/pieces/deadend.tscn" type="PackedScene" id=5]
[node name="main" type="Spatial"]
@ -12,4 +15,17 @@ input_ray_pickable = false
[node name="UI" parent="." instance=ExtResource( 2 )]
[node name="map" type="Spatial" parent="."]
[node name="hallway" parent="map" instance=ExtResource( 3 )]
[node name="hallway2" parent="map" instance=ExtResource( 4 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0, 0 )
[node name="hallway3" parent="map" instance=ExtResource( 4 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, 0 )
[node name="deadend" parent="map" instance=ExtResource( 5 )]
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -16, 0, 0 )
[editable path="player"]

@ -9,9 +9,10 @@
[sub_resource type="BoxShape" id=1]
extents = Vector3( 0.282713, 1, 4.24084 )
[node name="deadend" index="0" instance=ExtResource( 1 )]
[node name="deadend" instance=ExtResource( 1 )]
[node name="ceiling001" parent="." index="0"]
transform = Transform( 1, 3.25841e-007, -8.74228e-008, 3.25841e-007, -1, 0, -8.74228e-008, -2.8486e-014, -1, -1.01493, 7.82703, 0 )
material/0 = ExtResource( 2 )
[node name="walls001" parent="." index="1"]
@ -27,16 +28,15 @@ transform = Transform( 1.33034, 0, 0, 0, 1.16516, 0, 0, 0, 1.33034, 3.65142, 3.7
transform = Transform( 1.33034, 0, 0, 0, 1.16516, 0, 0, 0, 1.33034, 3.65142, 3.71428, 3.58174 )
[node name="collision" type="StaticBody" parent="." index="5"]
editor/display_folded = true
[node name="CollisionShape" type="CollisionShape" parent="collision" index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 3.19781, 0 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 3.66364, 0 )
shape = SubResource( 1 )
[node name="CollisionShape2" type="CollisionShape" parent="collision" index="1"]
transform = Transform( -4.37114e-008, -4.37114e-008, -1, 4.37114e-008, 1, -4.37114e-008, 1, -4.37114e-008, -4.37114e-008, 0, 3.19781, 4 )
transform = Transform( -4.37114e-008, -4.37114e-008, -1, 4.37114e-008, 1, -4.37114e-008, 1, -4.37114e-008, -4.37114e-008, 0, 3.66364, 4 )
shape = SubResource( 1 )
[node name="CollisionShape3" type="CollisionShape" parent="collision" index="2"]
transform = Transform( -4.37114e-008, -4.37114e-008, -1, 4.37114e-008, 1, -4.37114e-008, 1, -4.37114e-008, -4.37114e-008, 0, 3.19781, -4 )
transform = Transform( -4.37114e-008, -4.37114e-008, -1, 4.37114e-008, 1, -4.37114e-008, 1, -4.37114e-008, -4.37114e-008, 0, 3.66364, -4 )
shape = SubResource( 1 )

@ -8,7 +8,7 @@
[sub_resource type="BoxShape" id=1]
extents = Vector3( 4.02299, 1, 0.412802 )
[node name="hallway" index="0" instance=ExtResource( 1 )]
[node name="hallway" instance=ExtResource( 1 )]
[node name="floor" parent="." index="0"]
material/0 = ExtResource( 2 )

@ -0,0 +1,40 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://models/hallv2.gltf" type="PackedScene" id=1]
[ext_resource path="res://assets/floor_material.tres" type="Material" id=2]
[ext_resource path="res://assets/wall_material.tres" type="Material" id=3]
[ext_resource path="res://assets/ceiling_material.tres" type="Material" id=4]
[ext_resource path="res://_scenes/pieces/torch_holder.tscn" type="PackedScene" id=5]
[sub_resource type="BoxShape" id=1]
extents = Vector3( 4.02299, 1, 0.412802 )
[node name="hallway" instance=ExtResource( 1 )]
[node name="floor" parent="." index="0"]
material/0 = ExtResource( 2 )
[node name="walls" parent="." index="1"]
material/0 = ExtResource( 3 )
[node name="ceiling" parent="." index="2"]
material/0 = ExtResource( 4 )
[node name="StaticBody" type="StaticBody" parent="." index="3"]
editor/display_folded = true
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, -4 )
shape = SubResource( 1 )
[node name="CollisionShape2" type="CollisionShape" parent="StaticBody" index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 4 )
shape = SubResource( 1 )
[node name="torches" type="Spatial" parent="." index="4"]
[node name="holder" parent="torches" index="0" instance=ExtResource( 5 )]
transform = Transform( 0.73, 0, 0, 0, 0.73, 0, 0, 0, 0.73, 0, 4.57873, 3.61158 )
[node name="holder2" parent="torches" index="1" instance=ExtResource( 5 )]
transform = Transform( -0.73, 0, -6.38186e-008, 0, 0.73, 0, 6.38186e-008, 0, -0.73, 0, 4.579, -3.63515 )
Loading…
Cancel
Save