Skip to content

Commit

Permalink
Fix dependency issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@Steveplays28
Steveplays28 committed Jun 3, 2022
1 parent 7465f1d commit d5c7d83
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 49 deletions.
21 changes: 18 additions & 3 deletions prefabs/brick_wall1.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://resources/models/brick_wall1/brick_wall1.glb" type="PackedScene" id=1]
[ext_resource path="res://resources/materials/brick.material" type="Material" id=2]

[node name="BrickWall1" instance=ExtResource( 1 )]
[sub_resource type="ArrayMesh" id=1]
resource_name = "brick_wall1_Cube"
surfaces/0 = {
"aabb": AABB( -1, -1, -1, 2.00001, 2.00001, 2 ),
"array_data": PoolByteArray( 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 191, 127, 127, 129, 63, 146, 36, 146, 36, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 191, 0, 127, 129, 63, 121, 57, 210, 58, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 191, 127, 0, 127, 127, 70, 56, 158, 53, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 0, 129, 127, 63, 48, 57, 209, 58, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 127, 127, 129, 63, 146, 36, 12, 53, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 191, 127, 0, 127, 127, 70, 56, 48, 57, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 127, 63, 12, 53, 121, 57, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 127, 129, 63, 121, 57, 130, 58, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 127, 0, 127, 127, 115, 55, 158, 53, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 0, 129, 127, 63, 48, 57, 132, 58, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 127, 63, 12, 53, 219, 59, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 128, 63, 127, 0, 127, 127, 115, 55, 48, 57, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 191, 129, 0, 0, 63, 211, 47, 158, 53, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 191, 127, 127, 129, 63, 12, 53, 146, 36, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 191, 0, 127, 129, 63, 219, 59, 210, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 129, 0, 0, 63, 211, 47, 48, 57, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 0, 129, 127, 63, 158, 53, 209, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 191, 127, 127, 129, 63, 12, 53, 12, 53, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 63, 129, 0, 0, 63, 192, 50, 158, 53, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 127, 63, 146, 36, 121, 57, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 128, 63, 0, 127, 129, 63, 219, 59, 130, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 129, 0, 0, 63, 192, 50, 48, 57, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 0, 129, 127, 63, 158, 53, 132, 58, 0, 0, 128, 191, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 127, 63, 146, 36, 219, 59 ),
"array_index_data": PoolByteArray( 1, 0, 20, 0, 14, 0, 1, 0, 7, 0, 20, 0, 10, 0, 19, 0, 6, 0, 10, 0, 23, 0, 19, 0, 21, 0, 12, 0, 18, 0, 21, 0, 15, 0, 12, 0, 16, 0, 9, 0, 3, 0, 16, 0, 22, 0, 9, 0, 5, 0, 8, 0, 2, 0, 5, 0, 11, 0, 8, 0, 17, 0, 0, 0, 13, 0, 17, 0, 4, 0, 0, 0 ),
"blend_shape_data": [ ],
"format": 2194711,
"index_count": 36,
"primitive": 4,
"skeleton_aabb": [ ],
"vertex_count": 24
}

[node name="Cube" parent="." index="0"]
[node name="BrickWall1" type="Spatial"]

[node name="Cube" type="MeshInstance" parent="."]
transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 1, 0, 10, 0 )
mesh = SubResource( 1 )
material/0 = ExtResource( 2 )
17 changes: 17 additions & 0 deletions prefabs/level_prototyping/prototype_cube.tscn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://resources/materials/purple.tres" type="Material" id=1]

[sub_resource type="BoxShape" id=12]

[sub_resource type="CubeMesh" id=13]

[node name="PrototypeCube1" type="StaticBody"]

[node name="CollisionShape" type="CollisionShape" parent="."]
shape = SubResource( 12 )

[node name="MeshInstance" type="MeshInstance" parent="CollisionShape"]
mesh = SubResource( 13 )
skeleton = NodePath("../../../Floor2")
material/0 = ExtResource( 1 )
56 changes: 10 additions & 46 deletions scenes/warehouse.tscn
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=5 format=2]

[ext_resource path="res://prefabs/brick_wall1.tscn" type="PackedScene" id=1]
[ext_resource path="res://main_environment.tres" type="Environment" id=2]
[ext_resource path="res://prefabs/steel_beam1.tscn" type="PackedScene" id=3]
[ext_resource path="res://resources/materials/purple.tres" type="Material" id=4]

[sub_resource type="BoxShape" id=12]

[sub_resource type="CubeMesh" id=13]
[ext_resource path="res://prefabs/level_prototyping/prototype_cube.tscn" type="PackedScene" id=4]

[node name="Warehouse" type="Spatial"]

Expand All @@ -18,52 +14,20 @@ environment = ExtResource( 2 )
transform = Transform( 1, 0, 0, 0, -0.707107, 0.707107, 0, -0.707107, -0.707107, 0, 0, 0 )
shadow_enabled = true

[node name="Floor" type="StaticBody" parent="."]
[node name="PrototypeCube1" parent="." instance=ExtResource( 4 )]
transform = Transform( 50, 0, 0, 0, 1, 0, 0, 0, 50, 0, 0, 0 )

[node name="CollisionShape" type="CollisionShape" parent="Floor"]
shape = SubResource( 12 )

[node name="MeshInstance" type="MeshInstance" parent="Floor/CollisionShape"]
mesh = SubResource( 13 )
skeleton = NodePath("../..")
material/0 = ExtResource( 4 )

[node name="Floor2" type="StaticBody" parent="."]
[node name="PrototypeCube2" parent="." instance=ExtResource( 4 )]
transform = Transform( 25, 0, 0, 0, 1, 0, 0, 0, 25, 25, 0, -75 )

[node name="CollisionShape" type="CollisionShape" parent="Floor2"]
shape = SubResource( 12 )

[node name="MeshInstance" type="MeshInstance" parent="Floor2/CollisionShape"]
mesh = SubResource( 13 )
skeleton = NodePath("../../../Floor2")
material/0 = ExtResource( 4 )

[node name="Floor3" type="StaticBody" parent="."]
transform = Transform( 10, 0, 0, 0, 0.5, 0, 0, 0, 15, 40, 7, -85 )

[node name="CollisionShape" type="CollisionShape" parent="Floor3"]
shape = SubResource( 12 )

[node name="MeshInstance" type="MeshInstance" parent="Floor3/CollisionShape"]
mesh = SubResource( 13 )
skeleton = NodePath("../../../Floor2")
material/0 = ExtResource( 4 )

[node name="Floor4" type="StaticBody" parent="."]
transform = Transform( 15, 0, 0, 0, 0.5, 0, 0, 0, 2, 15, 7, -77.5 )

[node name="CollisionShape" type="CollisionShape" parent="Floor4"]
shape = SubResource( 12 )
[node name="PrototypeCube3" parent="." instance=ExtResource( 4 )]
transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 15, 39.5, 7, -25 )

[node name="MeshInstance" type="MeshInstance" parent="Floor4/CollisionShape"]
mesh = SubResource( 13 )
skeleton = NodePath("../../../Floor2")
material/0 = ExtResource( 4 )
[node name="PrototypeCube4" parent="." instance=ExtResource( 4 )]
transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 2, 19.5, 7, -25 )

[node name="SteelBeam1" parent="." instance=ExtResource( 3 )]
transform = Transform( 0.5, 0, 0, 0, 1, 0, 0, 0, 0.5, 20.5502, 1.00003, -75.0231 )
transform = Transform( 0.5, 0, 0, 0, 0.55, 0, 0, 0, 0.5, 20.5502, 1.00003, -23.8421 )

[node name="BrickWall1" parent="." instance=ExtResource( 1 )]
transform = Transform( -3.27835e-07, 0, -0.5, 0, 0.5, 0, 7.5, 0, -2.18557e-08, 49.5, 1, -25 )
Expand All @@ -87,4 +51,4 @@ transform = Transform( 2.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 25, 1, -100 )
transform = Transform( 2.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -25, 1, 15 )

[node name="BrickWall8" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 10, 1, -75 )
transform = Transform( 1, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 25, 1, -65 )

0 comments on commit d5c7d83

Please sign in to comment.