Optimized buildings a bit

godot/astream/terrain/details/bus-stop.tscn

@@ -5,22 +5,26 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 7.05784, 0.158917, 1.3372 )
 
-[node name="bus-stop" instance=ExtResource( 1 )]
+[node name="bus-stop" type="Spatial"]
 
-[node name="StaticBody" type="StaticBody" parent="bus-stop" index="0"]
+[node name="StaticBody" type="StaticBody" parent="."]
 
-[node name="CollisionShape" type="CollisionShape" parent="bus-stop/StaticBody" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.121079, 2.09843 )
 shape = SubResource( 1 )
 
-[node name="CollisionShape2" type="CollisionShape" parent="bus-stop/StaticBody" index="1"]
+[node name="CollisionShape2" type="CollisionShape" parent="StaticBody"]
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.6043, 3.3849 )
 shape = SubResource( 1 )
 
-[node name="CollisionShape3" type="CollisionShape" parent="bus-stop/StaticBody" index="2"]
+[node name="CollisionShape3" type="CollisionShape" parent="StaticBody"]
 transform = Transform( 1, 0, 0, 0, 0.902893, -0.429865, 0, 0.429865, 0.902893, 0, 4.61468, 2.35981 )
 shape = SubResource( 1 )
 
-[node name="CollisionShape4" type="CollisionShape" parent="bus-stop/StaticBody" index="3"]
+[node name="CollisionShape4" type="CollisionShape" parent="StaticBody"]
 transform = Transform( 1, 0, 0, 0, 0.915396, 0.402555, 0, -0.402555, 0.915396, 0, 4.61468, 0.296666 )
 shape = SubResource( 1 )
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="bus-stop" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/business-bar1.tscn

@@ -6,48 +6,40 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.7, 1, 0.6 )
 
-[node name="business-bar1" instance=ExtResource( 1 )]
+[node name="business-bar1" type="Spatial"]
 
-[node name="door1-portal" parent="." index="9" instance=ExtResource( 2 )]
+[node name="door1-portal" parent="." instance=ExtResource( 2 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, 15.2012 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 1004432320
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="door1-portal2" parent="." index="10" instance=ExtResource( 2 )]
+[node name="door1-portal2" parent="." instance=ExtResource( 2 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 6, 15.2079 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal2" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal2" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal2/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal2/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal2/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 1010586212
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal2/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal2/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal2/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="business-bar1" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/business-cafe1.tscn

@@ -7,54 +7,46 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.7, 1, 0.6 )
 
-[node name="business-cafe1" instance=ExtResource( 1 )]
+[node name="business-cafe1" type="Spatial"]
 
-[node name="door1-portal" parent="." index="1" instance=ExtResource( 2 )]
+[node name="door1-portal" parent="." instance=ExtResource( 2 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, 11.6464 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 1157234688
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="door1-portal2" parent="." index="2" instance=ExtResource( 2 )]
+[node name="door1-portal2" parent="." instance=ExtResource( 2 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1, 1, -8.35364 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal2" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal2" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal2/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal2/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal2/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 749479152
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal2/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal2/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal2/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="residental-house-stair" parent="." index="3" instance=ExtResource( 3 )]
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="residental-house-stair" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -9 )
 
-[node name="residental-house-stair2" parent="." index="4" instance=ExtResource( 3 )]
+[node name="residental-house-stair2" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 12 )
+
+[node name="business-cafe1" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/business-store1.tscn

@@ -7,54 +7,46 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.7, 1, 0.6 )
 
-[node name="business-store1" instance=ExtResource( 1 )]
+[node name="business-store1" type="Spatial"]
 
-[node name="door1-portal" parent="." index="1" instance=ExtResource( 2 )]
+[node name="door1-portal" parent="." instance=ExtResource( 2 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, 11.3964 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 696515904
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="door1-portal2" parent="." index="2" instance=ExtResource( 2 )]
+[node name="door1-portal2" parent="." instance=ExtResource( 2 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1, 1, -8.63923 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal2" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal2" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal2/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal2/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal2/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = -991068160
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal2/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal2/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal2/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal2/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="residental-house-stair" parent="." index="3" instance=ExtResource( 3 )]
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="residental-house-stair" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 12 )
 
-[node name="residental-house-stair2" parent="." index="4" instance=ExtResource( 3 )]
+[node name="residental-house-stair2" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 0, 0, -9 )
+
+[node name="business-store1" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/gym-exterior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://astream/terrain/details/gym-exterior.gltf" type="PackedScene" id=1]
 
@@ -8,20 +8,69 @@ extents = Vector3( 3.29498, 1.40109, 2.65188 )
 [sub_resource type="BoxShape" id=2]
 extents = Vector3( 3.29498, 1.40109, 2.65188 )
 
-[node name="gym-exterior" instance=ExtResource( 1 )]
+[sub_resource type="OccluderShapePolygon" id=3]
+polygon_points = PoolVector2Array( 28.7597, -0.491868, 29.2978, 10.8914, -29.0209, 11.1607, -28.8603, -0.722813 )
 
-[node name="scene_gym" type="Spatial" parent="." index="5" groups=["actuator"]]
+[sub_resource type="OccluderShapePolygon" id=4]
+polygon_points = PoolVector2Array( 48.1488, 0.0463181, 48.6876, 35.0645, -49.6328, 35.3339, -48.9593, -0.223056 )
+
+[sub_resource type="OccluderShapePolygon" id=5]
+polygon_points = PoolVector2Array( 46.5459, -47.5139, 48.291, 48.4641, -47.4376, 48.4641, -46.9391, -47.2646 )
+
+[node name="gym-exterior" type="Spatial"]
+
+[node name="scene_gym" type="Spatial" parent="." groups=["actuator"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -32.3505, 2.70111, 0.0815773 )
 
-[node name="Area" type="Area" parent="scene_gym" index="0"]
+[node name="Area" type="Area" parent="scene_gym"]
 
-[node name="CollisionShape" type="CollisionShape" parent="scene_gym/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="scene_gym/Area"]
 shape = SubResource( 1 )
 
-[node name="scene_shooting_gallery" type="Spatial" parent="." index="6" groups=["actuator"]]
+[node name="scene_shooting_gallery" type="Spatial" parent="." groups=["actuator"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.74583, 3.20716, -0.052886 )
 
-[node name="Area" type="Area" parent="scene_shooting_gallery" index="0"]
+[node name="Area" type="Area" parent="scene_shooting_gallery"]
 
-[node name="CollisionShape" type="CollisionShape" parent="scene_shooting_gallery/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="scene_shooting_gallery/Area"]
 shape = SubResource( 2 )
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="gym-exterior" parent="MergeGroup" instance=ExtResource( 1 )]
+
+[node name="Occluder" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -28.5533 )
+shape = SubResource( 3 )
+
+[node name="Occluder2" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 28.688 )
+shape = SubResource( 3 )
+
+[node name="Occluder3" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 28, 0, -0.312035 )
+shape = SubResource( 3 )
+
+[node name="Occluder4" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -29, 0, -0.312035 )
+shape = SubResource( 3 )
+
+[node name="Occluder5" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -47, 13, -0.312035 )
+shape = SubResource( 4 )
+
+[node name="Occluder6" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 47, 13, -0.312035 )
+shape = SubResource( 4 )
+
+[node name="Occluder7" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, 47.688 )
+shape = SubResource( 4 )
+
+[node name="Occluder8" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, -47.312 )
+shape = SubResource( 4 )
+
+[node name="Occluder9" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 48, -0.312035 )
+shape = SubResource( 5 )

godot/astream/terrain/details/home-exterior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://astream/terrain/details/home-exterior.gltf" type="PackedScene" id=1]
 
@@ -6,17 +6,62 @@
 height = 3.0
 radius = 1.17873
 
-[node name="home-exterior" instance=ExtResource( 1 )]
+[sub_resource type="OccluderShapePolygon" id=2]
+polygon_points = PoolVector2Array( 19.7965, -0.837705, 19.7965, 5.77514, -19.2274, 5.83753, -19.1651, -0.650547 )
 
-[node name="scene_home" type="Spatial" parent="." index="9" groups=["actuator"]]
+[sub_resource type="OccluderShapePolygon" id=3]
+polygon_points = PoolVector2Array( 19.7965, -0.837705, 19.7965, 5.77514, 0.237133, 5.71275, 0.486673, -0.213853 )
+
+[sub_resource type="OccluderShapePolygon" id=4]
+polygon_points = PoolVector2Array( 13.0002, -0.955048, 13.5094, 5.5803, 0.237133, 5.71275, 0.486673, -0.213853 )
+
+[node name="home-exterior" type="Spatial"]
+
+[node name="scene_home" type="Spatial" parent="." groups=["actuator"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 18.7743 )
 
-[node name="Area" type="Area" parent="scene_home" index="0"]
+[node name="Area" type="Area" parent="scene_home"]
 
-[node name="CollisionShape" type="CollisionShape" parent="scene_home/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="scene_home/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 1.40819 )
 shape = SubResource( 1 )
 
-[node name="CollisionShape2" type="CollisionShape" parent="scene_home/Area" index="1"]
+[node name="CollisionShape2" type="CollisionShape" parent="scene_home/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4, -0.375477 )
 shape = SubResource( 1 )
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="home-exterior" parent="MergeGroup" instance=ExtResource( 1 )]
+
+[node name="Occluder" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -19.8075 )
+shape = SubResource( 2 )
+
+[node name="Occluder2" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 19.8664 )
+shape = SubResource( 2 )
+
+[node name="Occluder3" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -19.317, 0, 0.375481 )
+shape = SubResource( 2 )
+
+[node name="Occluder4" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 19.5775, 0, 0.375481 )
+shape = SubResource( 2 )
+
+[node name="Occluder5" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 35.8901, 0, 0.375481 )
+shape = SubResource( 3 )
+
+[node name="Occluder6" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 21.5775, 0, 0.375481 )
+shape = SubResource( 3 )
+
+[node name="Occluder7" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21.5775, 0, -0.15785 )
+shape = SubResource( 4 )
+
+[node name="Occluder8" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21.5775, 0, -19.708 )
+shape = SubResource( 4 )

godot/astream/terrain/details/office-exterior.tscn

@@ -1,17 +1,43 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://astream/terrain/details/office-exterior.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 3.29498, 1.40109, 4.14298 )
 
-[node name="office-exterior" instance=ExtResource( 1 )]
+[sub_resource type="OccluderShapePolygon" id=2]
+polygon_points = PoolVector2Array( 39.4718, 0.292291, 39.4718, 14.251, -39.7263, 13.855, -39.5283, 0.68828 )
 
-[node name="scene_office" type="Spatial" parent="." index="4" groups=["actuator"]]
+[sub_resource type="OccluderShapePolygon" id=3]
+polygon_points = PoolVector2Array( 19.5713, 0.55356, 19.5713, 13.9182, -19.4337, 14.0172, -19.3347, 0.751557 )
+
+[node name="office-exterior" type="Spatial"]
+
+[node name="scene_office" type="Spatial" parent="." groups=["actuator"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 19.0407 )
 
-[node name="Area" type="Area" parent="scene_office" index="0"]
+[node name="Area" type="Area" parent="scene_office"]
 
-[node name="CollisionShape" type="CollisionShape" parent="scene_office/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="scene_office/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000112534, 2.48236, -4.51659 )
 shape = SubResource( 1 )
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="office-exterior" parent="MergeGroup" instance=ExtResource( 1 )]
+
+[node name="Occluder" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 19.1658 )
+shape = SubResource( 2 )
+
+[node name="Occluder2" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -19.48 )
+shape = SubResource( 2 )
+
+[node name="Occluder3" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -40, 0, 0.157095 )
+shape = SubResource( 3 )
+
+[node name="Occluder4" type="Occluder" parent="."]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 40, 0, 0.157095 )
+shape = SubResource( 3 )

godot/astream/terrain/details/parts/power-pole-wire.tscn

@@ -3,6 +3,10 @@
 [ext_resource path="res://astream/terrain/details/parts/power-pole-wire.gltf" type="PackedScene" id=1]
 [ext_resource path="res://astream/terrain/details/parts/power-pole.tscn" type="PackedScene" id=2]
 
-[node name="power-pole-wire" instance=ExtResource( 1 )]
+[node name="power-pole-wire" type="Spatial"]
 
-[node name="power-pole" parent="." index="2" instance=ExtResource( 2 )]
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="power-pole" parent="MergeGroup" instance=ExtResource( 2 )]
+
+[node name="power-pole-wire" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/parts/power-pole.tscn

@@ -2,4 +2,8 @@
 
 [ext_resource path="res://astream/terrain/details/parts/power-pole.gltf" type="PackedScene" id=1]
 
-[node name="power-pole" instance=ExtResource( 1 )]
+[node name="power-pole" type="Spatial"]
+
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="power-pole" parent="MergeGroup" instance=ExtResource( 1 )]

godot/astream/terrain/details/residental-garage-enterance.gltf

@@ -0,0 +1,153 @@
+{
+	"asset":{
+		"generator":"Khronos glTF Blender I/O v3.6.28",
+		"version":"2.0"
+	},
+	"extensionsUsed":[
+		"KHR_materials_specular",
+		"KHR_materials_ior"
+	],
+	"scene":0,
+	"scenes":[
+		{
+			"name":"Scene",
+			"nodes":[
+				0
+			]
+		}
+	],
+	"nodes":[
+		{
+			"mesh":0,
+			"name":"garage-enterance"
+		}
+	],
+	"materials":[
+		{
+			"alphaCutoff":0.5,
+			"alphaMode":"MASK",
+			"extensions":{
+				"KHR_materials_specular":{
+					"specularColorFactor":[
+						0.474271529955476,
+						0.474271529955476,
+						0.474271529955476
+					]
+				},
+				"KHR_materials_ior":{
+					"ior":1.4500000476837158
+				}
+			},
+			"name":"material_atlas_36953_1",
+			"pbrMetallicRoughness":{
+				"baseColorTexture":{
+					"index":0
+				},
+				"metallicFactor":0
+			}
+		}
+	],
+	"meshes":[
+		{
+			"name":"Cube",
+			"primitives":[
+				{
+					"attributes":{
+						"POSITION":0,
+						"NORMAL":1,
+						"TEXCOORD_0":2
+					},
+					"indices":3,
+					"material":0
+				}
+			]
+		}
+	],
+	"textures":[
+		{
+			"sampler":0,
+			"source":0
+		}
+	],
+	"images":[
+		{
+			"mimeType":"image/png",
+			"name":"Atlas_36953",
+			"uri":"Atlas_36953.png"
+		}
+	],
+	"accessors":[
+		{
+			"bufferView":0,
+			"componentType":5126,
+			"count":44,
+			"max":[
+				3,
+				5,
+				0
+			],
+			"min":[
+				-3,
+				0,
+				-0.5
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":1,
+			"componentType":5126,
+			"count":44,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":2,
+			"componentType":5126,
+			"count":44,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":3,
+			"componentType":5123,
+			"count":72,
+			"type":"SCALAR"
+		}
+	],
+	"bufferViews":[
+		{
+			"buffer":0,
+			"byteLength":528,
+			"byteOffset":0,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":528,
+			"byteOffset":528,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":352,
+			"byteOffset":1056,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":144,
+			"byteOffset":1408,
+			"target":34963
+		}
+	],
+	"samplers":[
+		{
+			"magFilter":9729,
+			"minFilter":9987
+		}
+	],
+	"buffers":[
+		{
+			"byteLength":1552,
+			"uri":"residental-garage-enterance.bin"
+		}
+	]
+}

godot/astream/terrain/details/residental-garage1.tscn

@@ -1,8 +1,11 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://astream/terrain/details/residental-garage.gltf" type="PackedScene" id=1]
 [ext_resource path="res://astream/terrain/details/residental-garage-roof1.gltf" type="PackedScene" id=2]
 [ext_resource path="res://astream/terrain/details/residental-garage-door.gltf" type="PackedScene" id=3]
+[ext_resource path="res://astream/terrain/details/residental-wall1.gltf" type="PackedScene" id=4]
+[ext_resource path="res://astream/terrain/details/residental-wall-corner.gltf" type="PackedScene" id=5]
+[ext_resource path="res://astream/terrain/details/residental-garage-enterance.gltf" type="PackedScene" id=6]
 
 [sub_resource type="CubeMesh" id=1]
 size = Vector3( 27, 1, 10 )
@@ -16,6 +19,9 @@ size = Vector3( 25, 6, 9 )
 [sub_resource type="SpatialMaterial" id=4]
 albedo_color = Color( 0.980392, 0.639216, 0.0705882, 1 )
 
+[sub_resource type="OccluderShapePolygon" id=5]
+polygon_points = PoolVector2Array( 12.3046, -2.07897, 12.3844, 1.81323, -10.6155, 1.85245, -10.5569, -2.00206 )
+
 [node name="garage" type="Spatial"]
 
 [node name="LOD" type="LOD" parent="."]
@@ -29,7 +35,115 @@ lod_range = 35.0
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0 )
 
 [node name="residental-garage-door" parent="LOD/MergeGroup" instance=ExtResource( 3 )]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12.7459, 1, 0 )
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 13.3215, 1, 0 )
+
+[node name="residental-wall1_1" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 12, 0, -5 )
+
+[node name="residental-wall1_2" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 10, 0, -5 )
+
+[node name="residental-wall1_3" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 8, 0, -5 )
+
+[node name="residental-wall1_4" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 6, 0, -5 )
+
+[node name="residental-wall1_5" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 4, 0, -5 )
+
+[node name="residental-wall1_6" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 2, 0, -5 )
+
+[node name="residental-wall1_7" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 0, 0, -5 )
+
+[node name="residental-wall1_8" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -2, 0, -5 )
+
+[node name="residental-wall1_9" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -4, 0, -5 )
+
+[node name="residental-wall1_10" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -6, 0, -5 )
+
+[node name="residental-wall1_11" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -8, 0, -5 )
+
+[node name="residental-wall1_12" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, -10, 0, -5 )
+
+[node name="residental-wall1_13" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -10, 0, 5 )
+
+[node name="residental-wall1_14" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -8, 0, 5 )
+
+[node name="residental-wall1_15" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -6, 0, 5 )
+
+[node name="residental-wall1_16" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -4, 0, 5 )
+
+[node name="residental-wall1_17" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -2, 0, 5 )
+
+[node name="residental-wall1_18" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 5 )
+
+[node name="residental-wall1_19" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2, 0, 5 )
+
+[node name="residental-wall1_20" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 4, 0, 5 )
+
+[node name="residental-wall1_21" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6, 0, 5 )
+
+[node name="residental-wall1_22" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 8, 0, 5 )
+
+[node name="residental-wall1_23" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 10, 0, 5 )
+
+[node name="residental-wall1_24" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 12, 0, 5 )
+
+[node name="residental-wall-corner_1" parent="LOD/MergeGroup" instance=ExtResource( 5 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -11, 0, -5 )
+
+[node name="residental-wall1_25" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -11, 0, -4 )
+
+[node name="residental-wall1_26" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -11, 0, -2 )
+
+[node name="residental-wall1_27" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -11, 0, 0 )
+
+[node name="residental-wall1_28" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -11, 0, 2 )
+
+[node name="residental-wall1_31" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( -2.18557e-07, 0, 1, 0, 1, 0, -1, 0, -2.18557e-07, -11, 0, 4 )
+
+[node name="residental-wall-corner_2" parent="LOD/MergeGroup" instance=ExtResource( 5 )]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -11, 0, 5 )
+
+[node name="residental-wall-corner_3" parent="LOD/MergeGroup" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 13, 0, 5 )
+
+[node name="residental-wall1_32" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 3.0598e-07, 0, -1, 0, 1, 0, 1, 0, 3.0598e-07, 13, 0, 4 )
+
+[node name="residental-wall1_33" parent="LOD/MergeGroup" instance=ExtResource( 4 )]
+transform = Transform( 3.0598e-07, 0, -1, 0, 1, 0, 1, 0, 3.0598e-07, 13, 0, -4 )
+
+[node name="residental-garage-enterance" parent="LOD/MergeGroup" instance=ExtResource( 6 )]
+transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 13, 0, 0 )
+
+[node name="residental-wall-corner_4" parent="LOD/MergeGroup" instance=ExtResource( 5 )]
+transform = Transform( 1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 13, 0, -5 )
 
 [node name="MergeGroup1" type="MergeGroup" parent="LOD"]
 visible = false
@@ -55,3 +169,11 @@ material/0 = SubResource( 4 )
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.427596, 6.49411, 0 )
 mesh = SubResource( 1 )
 material/0 = SubResource( 2 )
+
+[node name="Occluder" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43748, 4.26318 )
+shape = SubResource( 5 )
+
+[node name="Occluder2" type="Occluder" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.43748, -4.71023 )
+shape = SubResource( 5 )

godot/astream/terrain/details/residental-house1.gltf

@@ -1,6 +1,6 @@
 {
 	"asset":{
-		"generator":"Khronos glTF Blender I/O v3.6.27",
+		"generator":"Khronos glTF Blender I/O v3.6.28",
 		"version":"2.0"
 	},
 	"extensionsUsed":[

godot/astream/terrain/details/residental-house1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://astream/terrain/details/residental-house1.gltf" type="PackedScene" id=1]
 [ext_resource path="res://astream/terrain/details/parts/door1-portal.tscn" type="PackedScene" id=2]
@@ -7,29 +7,33 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.7, 1, 0.6 )
 
-[node name="residental-house1" instance=ExtResource( 1 )]
+[sub_resource type="OccluderShapeSphere" id=2]
+spheres = [ Plane( 6, 6, -3, 6 ), Plane( -6, 6, -3, 6 ), Plane( 6, 6, 6, 6 ), Plane( -6, 6, 6, 6 ) ]
 
-[node name="door1-portal" parent="." index="1" instance=ExtResource( 2 )]
+[node name="residental-house1" type="Spatial"]
+
+[node name="door1-portal" parent="." instance=ExtResource( 2 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1, 1, -8.5131 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 703765168
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="residental-house-stair" parent="." index="2" instance=ExtResource( 3 )]
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="residental-house1" parent="MergeGroup" instance=ExtResource( 1 )]
+
+[node name="residental-house-stair" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -9 )
+
+[node name="Occluder" type="Occluder" parent="."]
+shape = SubResource( 2 )

godot/astream/terrain/details/residental-house10.gltf

@@ -1,6 +1,6 @@
 {
 	"asset":{
-		"generator":"Khronos glTF Blender I/O v3.6.27",
+		"generator":"Khronos glTF Blender I/O v3.6.28",
 		"version":"2.0"
 	},
 	"extensionsUsed":[

godot/astream/terrain/details/residental-house10.tscn

@@ -7,29 +7,27 @@
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.7, 1, 0.6 )
 
-[node name="residental-house10" instance=ExtResource( 1 )]
+[node name="residental-house10" type="Spatial"]
 
-[node name="door1-portal" parent="." index="2" instance=ExtResource( 2 )]
+[node name="door1-portal" parent="." instance=ExtResource( 2 )]
 transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1, -10.6561 )
 
-[node name="enter_destination" type="Spatial" parent="door1-portal" index="5" groups=["smart_object"]]
+[node name="enter_destination" type="Spatial" parent="door1-portal" groups=["smart_object"]]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.905, 0, 0.65 )
 
-[node name="actions" type="Node" parent="door1-portal/enter_destination" index="0"]
+[node name="actions" type="Node" parent="door1-portal/enter_destination"]
 
-[node name="EnterDestination" type="GoapActionData" parent="door1-portal/enter_destination/actions" index="0"]
-preconditions = {
-"have_ped_destination": 1
-}
-variation = 1052938076
-cost = 100
-distance = 0.0
+[node name="EnterDestination" type="Node" parent="door1-portal/enter_destination/actions"]
 
-[node name="Area" type="Area" parent="door1-portal/enter_destination" index="1"]
+[node name="Area" type="Area" parent="door1-portal/enter_destination"]
 
-[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area" index="0"]
+[node name="CollisionShape" type="CollisionShape" parent="door1-portal/enter_destination/Area"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0 )
 shape = SubResource( 1 )
 
-[node name="residental-house-stair" parent="." index="3" instance=ExtResource( 3 )]
+[node name="MergeGroup" type="MergeGroup" parent="."]
+
+[node name="residental-house-stair" parent="MergeGroup" instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -13 )
+
+[node name="residental-house10" parent="MergeGroup" instance=ExtResource( 1 )]