Updated the Ros2ProjectTemplate to use WarehouseAssets gem instead of WarehouseSample gem (#878)

Signed-off-by: Paweł Budziszewski <[email protected]>

Gems/WarehouseAssets/Assets/Prefabs/WarehouseScene_small.prefab

@@ -50,6 +50,65 @@
         }
     },
     "Entities": {
+        "Entity_[156715931804810]": {
+            "Id": "Entity_[156715931804810]",
+            "Name": "stack",
+            "Components": {
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 6750850448791453210
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 1695628273634435230
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 18000658611895054290,
+                    "Child Entity Order": [
+                        "Instance_[117206527648906]/ContainerEntity",
+                        "Instance_[117185052812426]/ContainerEntity"
+                    ]
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 5352550403798658821
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 11722715638339377088
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 3753176593120087786
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15227716575171220787
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 6431319541866323654
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 9144659784922251940,
+                    "Parent Entity": "Entity_[918102226001826]",
+                    "Transform Data": {
+                        "Translate": [
+                            3.3757693767547607,
+                            -5.978062629699707,
+                            0.0
+                        ],
+                        "Rotate": [
+                            0.0,
+                            0.0,
+                            -30.604509353637695
+                        ]
+                    }
+                }
+            }
+        },
         "Entity_[917805873258402]": {
             "Id": "Entity_[917805873258402]",
             "Name": "circle",
@@ -5291,7 +5350,9 @@
                         "Instance_[790245344567202]/ContainerEntity",
                         "Instance_[790262524436386]/ContainerEntity",
                         "Instance_[790271114370978]/ContainerEntity",
-                        "Instance_[790236754632610]/ContainerEntity"
+                        "Instance_[790236754632610]/ContainerEntity",
+                        "Instance_[131579759611092]/ContainerEntity",
+                        "Entity_[156715931804810]"
                     ]
                 },
                 "EditorInspectorComponent": {
@@ -11087,6 +11148,91 @@
         }
     },
     "Instances": {
+        "Instance_[117185052812426]": {
+            "Source": "Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Parent Entity",
+                    "value": "../Entity_[156715931804810]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/0",
+                    "value": 0.10521316528320313
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/1",
+                    "value": -0.09033679962158203
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/2",
+                    "value": -9.5367431640625e-7
+                }
+            ]
+        },
+        "Instance_[117206527648906]": {
+            "Source": "Prefabs/Warehouse_storage/Components/WarehouseBox3.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4983371344376764259]/Parent Entity",
+                    "value": "../Entity_[156715931804810]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4983371344376764259]/Transform Data/Translate/0",
+                    "value": -0.03409838676452637
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4983371344376764259]/Transform Data/Translate/1",
+                    "value": 0.2546825408935547
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4983371344376764259]/Transform Data/Translate/2",
+                    "value": 0.4254189729690552
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4983371344376764259]/Transform Data/Rotate/0",
+                    "value": -73.7313461303711
+                }
+            ]
+        },
+        "Instance_[131579759611092]": {
+            "Source": "Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Parent Entity",
+                    "value": "../Entity_[918102226001826]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/0",
+                    "value": 0.780985951423645
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/1",
+                    "value": -1.1412373781204224
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Translate/2",
+                    "value": -9.5367431640625e-7
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Rotate/2",
+                    "value": 89.99994659423828
+                }
+            ]
+        },
         "Instance_[1560327100006690]": {
             "Source": "Prefabs/Warehouse_storage/Rack_protectors/Rack_front_protector.prefab",
             "Patches": [

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab

@@ -156,6 +156,44 @@
                 "Component_[9483887954899180333]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 9483887954899180333
+                },
+                "EditorMeshColliderComponent": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 2151018690426040466,
+                    "ColliderConfiguration": {
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "MWarehouseBoxes"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{8A03C41F-AC4F-5852-8AA7-0A4EFA5E2D61}",
+                                    "subId": 3771023971
+                                },
+                                "assetHint": "assets/warehouse/models/box1.fbx.pxmesh"
+                            },
+                            "Configuration": {
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{8A03C41F-AC4F-5852-8AA7-0A4EFA5E2D61}",
+                                        "subId": 3771023971
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "assets/warehouse/models/box1.fbx.pxmesh"
+                                }
+                            }
+                        }
+                    }
+                },
+                "EditorStaticRigidBodyComponent": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11444425248016076172
                 }
             }
         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox2.prefab

@@ -156,6 +156,44 @@
                 "Component_[9483887954899180333]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 9483887954899180333
+                },
+                "EditorMeshColliderComponent": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 785209467024958258,
+                    "ColliderConfiguration": {
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "MWarehouseBoxes_001"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
+                                    "subId": 3227237471
+                                },
+                                "assetHint": "assets/warehouse/models/box2.fbx.pxmesh"
+                            },
+                            "Configuration": {
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
+                                        "subId": 3227237471
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "assets/warehouse/models/box2.fbx.pxmesh"
+                                }
+                            }
+                        }
+                    }
+                },
+                "EditorStaticRigidBodyComponent": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12865458759216510293
                 }
             }
         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox3.prefab

@@ -156,6 +156,44 @@
                 "Component_[9483887954899180333]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 9483887954899180333
+                },
+                "EditorMeshColliderComponent": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 8978121544097958921,
+                    "ColliderConfiguration": {
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "MWarehouseBoxes_003"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{6B552C1C-B7A0-5029-AEF6-C0FE06A69877}",
+                                    "subId": 3067473921
+                                },
+                                "assetHint": "assets/warehouse/models/box4.fbx.pxmesh"
+                            },
+                            "Configuration": {
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{6B552C1C-B7A0-5029-AEF6-C0FE06A69877}",
+                                        "subId": 3067473921
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "assets/warehouse/models/box4.fbx.pxmesh"
+                                }
+                            }
+                        }
+                    }
+                },
+                "EditorStaticRigidBodyComponent": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18263535199983635633
                 }
             }
         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox4.prefab

@@ -177,6 +177,51 @@
                 "Component_[9483887954899180333]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 9483887954899180333
+                },
+                "EditorMeshColliderComponent": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 13457564342271675332,
+                    "ColliderConfiguration": {
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "MWarehouseBoxes_001"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
+                                    "subId": 3227237471
+                                },
+                                "assetHint": "assets/warehouse/models/box2.fbx.pxmesh"
+                            },
+                            "Configuration": {
+                                "Scale": [
+                                    1.2999999523162842,
+                                    1.2999999523162842,
+                                    1.5600000619888306
+                                ],
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
+                                        "subId": 3227237471
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "assets/warehouse/models/box2.fbx.pxmesh"
+                                }
+                            }
+                        },
+                        "HasNonUniformScale": true
+                    },
+                    "HasNonUniformScale": true
+                },
+                "EditorStaticRigidBodyComponent": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2298260891530613232
                 }
             }
         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab

@@ -84,7 +84,8 @@
                                         "MaterialAsset": {
                                             "assetId": {
                                                 "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
-                                            }
+                                            },
+                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
                                         }
                                     }
                                 },
@@ -164,20 +165,60 @@
                             "ComponentId": 7562106464527649334
                         },
                         {
-                            "ComponentId": 2195363291273355971,
+                            "ComponentId": 5146712439650349843,
                             "SortIndex": 1
                         },
                         {
-                            "ComponentId": 18429466845483581173,
+                            "ComponentId": 10125249807132554809,
                             "SortIndex": 2
                         },
                         {
-                            "ComponentId": 13201342092318588972,
+                            "ComponentId": 5269735565457263604,
                             "SortIndex": 3
                         },
                         {
-                            "ComponentId": 9509677040110797884,
+                            "ComponentId": 4137486570050063712,
                             "SortIndex": 4
+                        },
+                        {
+                            "ComponentId": 10867460426661892159,
+                            "SortIndex": 5
+                        },
+                        {
+                            "ComponentId": 13446196332041057509,
+                            "SortIndex": 6
+                        },
+                        {
+                            "ComponentId": 5324226478596329467,
+                            "SortIndex": 7
+                        },
+                        {
+                            "ComponentId": 4588174646852359714,
+                            "SortIndex": 8
+                        },
+                        {
+                            "ComponentId": 9509677040110797884,
+                            "SortIndex": 9
+                        },
+                        {
+                            "ComponentId": 10454605220892528989,
+                            "SortIndex": 10
+                        },
+                        {
+                            "ComponentId": 14166927651230603815,
+                            "SortIndex": 11
+                        },
+                        {
+                            "ComponentId": 4867191232725169311,
+                            "SortIndex": 12
+                        },
+                        {
+                            "ComponentId": 8990768301169768524,
+                            "SortIndex": 13
+                        },
+                        {
+                            "ComponentId": 1329524434344098663,
+                            "SortIndex": 14
                         }
                     ]
                 },
@@ -192,7 +233,7 @@
                         "Position": [
                             0.0,
                             0.0,
-                            1.0
+                            1.0576494932174683
                         ],
                         "MaterialSlots": {
                             "Slots": [
@@ -215,7 +256,7 @@
                             "Configuration": [
                                 0.6499999761581421,
                                 1.149999976158142,
-                                1.5
+                                1.762472152709961
                             ]
                         }
                     }
@@ -232,41 +273,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4588174646852359714
                 },
-                "Component_[5143803638157116517]": {
-                    "$type": "EditorColliderComponent",
-                    "Id": 5143803638157116517,
-                    "ColliderConfiguration": {
-                        "Position": [
-                            0.0,
-                            0.5495275855064392,
-                            0.07400000095367432
-                        ],
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "Entire object",
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
-                                            "subId": 1
-                                        },
-                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    "ShapeConfiguration": {
-                        "ShapeType": 1,
-                        "Box": {
-                            "Configuration": [
-                                0.6499999761581421,
-                                0.05000000074505806,
-                                0.15000000596046448
-                            ]
-                        }
-                    }
-                },
                 "Component_[5146712439650349843]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 5146712439650349843
@@ -299,8 +305,8 @@
                     "Id": 8990768301169768524,
                     "ColliderConfiguration": {
                         "Position": [
-                            0.0,
-                            -0.5529183149337769,
+                            -0.29356321692466736,
+                            0.5683783292770386,
                             0.07400000095367432
                         ],
                         "MaterialSlots": {
@@ -322,8 +328,8 @@
                         "ShapeType": 1,
                         "Box": {
                             "Configuration": [
-                                0.6499999761581421,
-                                0.05000000074505806,
+                                0.062225550413131714,
+                                0.1364762783050537,
                                 0.15000000596046448
                             ]
                         }
@@ -359,6 +365,111 @@
                         "SolverPositionIterations": 40,
                         "SolverVelocityIterations": 10
                     }
+                },
+                "EditorColliderComponent": {
+                    "$type": "EditorColliderComponent",
+                    "Id": 14166927651230603815,
+                    "ColliderConfiguration": {
+                        "Position": [
+                            0.29356318712234497,
+                            0.5683783292770386,
+                            0.07400000095367432
+                        ],
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object",
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
+                                            "subId": 1
+                                        },
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "ShapeType": 1,
+                        "Box": {
+                            "Configuration": [
+                                0.062225598841905594,
+                                0.1364762932062149,
+                                0.15000000596046448
+                            ]
+                        }
+                    }
+                },
+                "EditorColliderComponent_2": {
+                    "$type": "EditorColliderComponent",
+                    "Id": 10454605220892528989,
+                    "ColliderConfiguration": {
+                        "Position": [
+                            0.29356318712234497,
+                            -0.5683783292770386,
+                            0.07400000095367432
+                        ],
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object",
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
+                                            "subId": 1
+                                        },
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "ShapeType": 1,
+                        "Box": {
+                            "Configuration": [
+                                0.062225598841905594,
+                                0.1364762932062149,
+                                0.15000000596046448
+                            ]
+                        }
+                    }
+                },
+                "EditorColliderComponent_3": {
+                    "$type": "EditorColliderComponent",
+                    "Id": 4867191232725169311,
+                    "ColliderConfiguration": {
+                        "Position": [
+                            -0.29356318712234497,
+                            -0.5683783292770386,
+                            0.07400000095367432
+                        ],
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object",
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
+                                            "subId": 1
+                                        },
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "ShapeType": 1,
+                        "Box": {
+                            "Configuration": [
+                                0.062225598841905594,
+                                0.1364762932062149,
+                                0.15000000596046448
+                            ]
+                        }
+                    }
                 }
             }
         }

Gems/WarehouseAssets/Assets/assets/Warehouse/Models/Box1.fbx.assetinfo

@@ -0,0 +1,132 @@
+{
+    "values": [
+        {
+            "$type": "{5B03C8E6-8CEE-4DA0-A7FA-CD88689DD45B} MeshGroup",
+            "id": "{AD09B8ED-F893-5AEF-A33B-B7500E17F465}",
+            "name": "Box1",
+            "NodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box1_LOD1"
+                ],
+                "unselectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box1_LOD0"
+                ]
+            },
+            "export method": 2,
+            "PhysicsMaterialSlots": {
+                "Slots": [
+                    {
+                        "Name": "MWarehouseBoxes"
+                    }
+                ]
+            }
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "Box1",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box1_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box1_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule",
+                        "nodeSelectionList": [
+                            {
+                                "selectedNodes": [
+                                    {},
+                                    "RootNode",
+                                    "RootNode.Box1_LOD1"
+                                ],
+                                "unselectedNodes": [
+                                    "RootNode.Box1_LOD0"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "$type": "MaterialRule"
+                    }
+                ]
+            },
+            "id": "{A582DB2D-EBE2-559F-8096-7FED1B853071}"
+        },
+        {
+            "$type": "{41DCBEAB-203C-4A05-96FA-98E1D8A96FA1} ImportGroup"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box1_3F7F372E_C573_5D6E_94C3_53C76B6D3277_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box1_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box1_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{3F7F372E-C573-5D6E-94C3-53C76B6D3277}"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box1_6787F691_BF27_5C6E_836C_B477EECCCEFF_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box1_LOD1"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box1_LOD0"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{6787F691-BF27-5C6E-836C-B477EECCCEFF}"
+        },
+        {
+            "$type": "PrefabGroup",
+            "name": "assets/Warehouse/Models/Box1_fbx.procprefab",
+            "id": "{1EF54A17-ECAE-5210-9196-D6439E36A935}"
+        }
+    ]
+}

Gems/WarehouseAssets/Assets/assets/Warehouse/Models/Box2.fbx.assetinfo

@@ -0,0 +1,132 @@
+{
+    "values": [
+        {
+            "$type": "{5B03C8E6-8CEE-4DA0-A7FA-CD88689DD45B} MeshGroup",
+            "id": "{553732FB-CF0F-58C9-A565-EF20316A2DFD}",
+            "name": "Box2",
+            "NodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box2_LOD1"
+                ],
+                "unselectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box2_LOD0"
+                ]
+            },
+            "export method": 2,
+            "PhysicsMaterialSlots": {
+                "Slots": [
+                    {
+                        "Name": "MWarehouseBoxes_001"
+                    }
+                ]
+            }
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "Box2",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box2_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box2_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule",
+                        "nodeSelectionList": [
+                            {
+                                "selectedNodes": [
+                                    {},
+                                    "RootNode",
+                                    "RootNode.Box2_LOD1"
+                                ],
+                                "unselectedNodes": [
+                                    "RootNode.Box2_LOD0"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "$type": "MaterialRule"
+                    }
+                ]
+            },
+            "id": "{2CEC723D-4C0F-5AAA-9072-22568CE32023}"
+        },
+        {
+            "$type": "{41DCBEAB-203C-4A05-96FA-98E1D8A96FA1} ImportGroup"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box2_8D91EC08_6392_5321_8ECD_A49EC1F40DA7_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box2_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box2_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{8D91EC08-6392-5321-8ECD-A49EC1F40DA7}"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box2_F165AAE3_5CFB_592F_82D6_74EE29EB1F0C_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box2_LOD1"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box2_LOD0"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{F165AAE3-5CFB-592F-82D6-74EE29EB1F0C}"
+        },
+        {
+            "$type": "PrefabGroup",
+            "name": "assets/Warehouse/Models/Box2_fbx.procprefab",
+            "id": "{54A3CD60-467B-5168-A0EF-FEAA1CF552D2}"
+        }
+    ]
+}

Gems/WarehouseAssets/Assets/assets/Warehouse/Models/Box3.fbx.assetinfo

@@ -0,0 +1,132 @@
+{
+    "values": [
+        {
+            "$type": "{5B03C8E6-8CEE-4DA0-A7FA-CD88689DD45B} MeshGroup",
+            "id": "{CA15E656-E832-5FEB-8321-03738120BC3D}",
+            "name": "Box3",
+            "NodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box3_LOD1"
+                ],
+                "unselectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box3_LOD0"
+                ]
+            },
+            "export method": 2,
+            "PhysicsMaterialSlots": {
+                "Slots": [
+                    {
+                        "Name": "MWarehouseBoxes_002"
+                    }
+                ]
+            }
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "Box3",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box3_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box3_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule",
+                        "nodeSelectionList": [
+                            {
+                                "selectedNodes": [
+                                    {},
+                                    "RootNode",
+                                    "RootNode.Box3_LOD1"
+                                ],
+                                "unselectedNodes": [
+                                    "RootNode.Box3_LOD0"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "$type": "MaterialRule"
+                    }
+                ]
+            },
+            "id": "{7245953B-C562-5FF6-8172-4A924DA13B1A}"
+        },
+        {
+            "$type": "{41DCBEAB-203C-4A05-96FA-98E1D8A96FA1} ImportGroup"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box3_039C139C_1E74_5FDA_85D2_29C9AD24B598_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box3_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box3_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{039C139C-1E74-5FDA-85D2-29C9AD24B598}"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box3_522A82A3_7AEB_59AE_8F7F_A111F1C28563_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box3_LOD1"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box3_LOD0"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{522A82A3-7AEB-59AE-8F7F-A111F1C28563}"
+        },
+        {
+            "$type": "PrefabGroup",
+            "name": "assets/Warehouse/Models/Box3_fbx.procprefab",
+            "id": "{0DE589A5-896F-5596-BEB0-F0E78A89D88C}"
+        }
+    ]
+}

Gems/WarehouseAssets/Assets/assets/Warehouse/Models/Box4.fbx.assetinfo

@@ -0,0 +1,132 @@
+{
+    "values": [
+        {
+            "$type": "{5B03C8E6-8CEE-4DA0-A7FA-CD88689DD45B} MeshGroup",
+            "id": "{40654DA7-7345-5BAC-A0C7-2CB22057D3C7}",
+            "name": "Box4",
+            "NodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box4_LOD1"
+                ],
+                "unselectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box4_LOD0"
+                ]
+            },
+            "export method": 2,
+            "PhysicsMaterialSlots": {
+                "Slots": [
+                    {
+                        "Name": "MWarehouseBoxes_003"
+                    }
+                ]
+            }
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "Box4",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    {},
+                    "RootNode",
+                    "RootNode.Box4_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box4_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule",
+                        "nodeSelectionList": [
+                            {
+                                "selectedNodes": [
+                                    {},
+                                    "RootNode",
+                                    "RootNode.Box4_LOD1"
+                                ],
+                                "unselectedNodes": [
+                                    "RootNode.Box4_LOD0"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "$type": "MaterialRule"
+                    }
+                ]
+            },
+            "id": "{0541EBF5-E23E-5432-B535-EF6731B7BB47}"
+        },
+        {
+            "$type": "{41DCBEAB-203C-4A05-96FA-98E1D8A96FA1} ImportGroup"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box4_4C4B5F09_0B67_5356_87CC_9FE9FE34D2BB_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box4_LOD0"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box4_LOD1"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{4C4B5F09-0B67-5356-87CC-9FE9FE34D2BB}"
+        },
+        {
+            "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+            "name": "default_Box4_EC66D8A3_74CE_52F1_88ED_04289D477ADC_",
+            "nodeSelectionList": {
+                "selectedNodes": [
+                    "RootNode.Box4_LOD1"
+                ],
+                "unselectedNodes": [
+                    "RootNode.Box4_LOD0"
+                ]
+            },
+            "rules": {
+                "rules": [
+                    {
+                        "$type": "ProceduralMeshGroupRule"
+                    },
+                    {
+                        "$type": "UnmodifiableRule"
+                    },
+                    {
+                        "$type": "CoordinateSystemRule",
+                        "useAdvancedData": true
+                    },
+                    {
+                        "$type": "{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule"
+                    }
+                ]
+            },
+            "id": "{EC66D8A3-74CE-52F1-88ED-04289D477ADC}"
+        },
+        {
+            "$type": "PrefabGroup",
+            "name": "assets/Warehouse/Models/Box4_fbx.procprefab",
+            "id": "{5451D97F-2471-5A53-8A28-B65657F32F5D}"
+        }
+    ]
+}

Templates/Ros2ProjectTemplate/README.md

@@ -6,7 +6,6 @@ It is designed to help you quickly start simulating robots in Open 3D Engine (O3
 This template has the following characteristics:
 - It is the simplest and using the least resources among templates.
 - Comes with Husarion ROSBot XL model, equipped with lidar and a differential drive.
-- The interior scene does not look photorealistic but is quite simple.
 
 An example ROS 2 navigation stack launch file is bundled with the template.
 

Templates/Ros2ProjectTemplate/Template/Examples/slam_navigation/README.md

@@ -4,7 +4,7 @@ With this example you will learn how to run ROS 2 navigation with a project crea
 
 These instructions assume that you have created and built your project following the [Template README](https://github.com/o3de/o3de-extras/tree/development/Templates/Ros2ProjectTemplate/README.md).
 
-[ROS 2 navigation stack](https://navigation.ros.org/) is a set of packages which can deliver robot navigation almost out-of-the-box following configuration for your specific robot.
+[ROS 2 navigation stack](https://nav2.org/) is a set of packages which can deliver robot navigation almost out-of-the-box following configuration for your specific robot.
 In other cases, it can serve as a great basis to build your custom robot navigation.
 
 ## How to run the example

Templates/Ros2ProjectTemplate/Template/Levels/DemoLevel/DemoLevel.prefab

@@ -25,9 +25,9 @@
                 "Id": 14126657869720434043,
                 "Child Entity Order": [
                     "Entity_[541237100205]",
-                    "Instance_[650636534085]/ContainerEntity",
                     "Entity_[1176639161715]",
-                    "Instance_[594075265400]/ContainerEntity"
+                    "Instance_[475051143394]/ContainerEntity",
+                    "Instance_[24371968301931]/ContainerEntity"
                 ]
             },
             "Component_[15230859088967841193]": {
@@ -333,8 +333,8 @@
                     "Parent Entity": "Entity_[541237100205]",
                     "Transform Data": {
                         "Translate": [
-                            2.0,
-                            -12.0,
+                            3.2081193923950195,
+                            0.10913896560668945,
                             0.10000000149011612
                         ]
                     }
@@ -431,8 +431,8 @@
                     "Parent Entity": "Entity_[541237100205]",
                     "Transform Data": {
                         "Translate": [
-                            5.5,
-                            -12.0,
+                            -2.0983591079711914,
+                            0.023543179035186768,
                             0.10000000149011612
                         ]
                     }
@@ -537,8 +537,8 @@
                     "Controller": {
                         "Configuration": {
                             "LightType": 4,
-                            "Intensity": 40000.0,
-                            "AttenuationRadius": 632.4555053710938
+                            "Intensity": 4000.0,
+                            "AttenuationRadius": 200.0
                         }
                     }
                 },
@@ -607,6 +607,16 @@
         }
     },
     "Instances": {
+        "Instance_[24371968301931]": {
+            "Source": "Prefabs/WarehouseScene_small.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/TransformComponent/Parent Entity",
+                    "value": "../Entity_[1146574390643]"
+                }
+            ]
+        },
         "Instance_[475051143394]": {
             "Source": "RosbotXL/ROSBotXL_Slamtec.prefab",
             "Patches": [
@@ -618,32 +628,144 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[959982562508610]/Transform Data/Translate/0",
-                    "value": 0.842374324798584
+                    "value": 7.697054386138916
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[959982562508610]/Transform Data/Translate/1",
-                    "value": -12.669219970703123
+                    "value": 0.0905170440673828
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[959982562508610]/Transform Data/Translate/2",
                     "value": 0.034102797508239746
-                }
-            ]
-        },
-        "Instance_[650636534085]": {
-            "Source": "O3DEScene/Prefabs/Warehouse.prefab",
-            "Patches": [
+                },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[5813610029120484168]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "path": "/ContainerEntity/Components/Component_[959982562508610]/Transform Data/Rotate/2",
+                    "value": 180.0
+                },
+                {
+                    "op": "add",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[68669379374302]",
+                    "value": {
+                        "Id": "Entity_[68669379374302]",
+                        "Name": "lookat target",
+                        "Components": {
+                            "EditorDisabledCompositionComponent": {
+                                "$type": "EditorDisabledCompositionComponent",
+                                "Id": 15409149668968175942,
+                                "DisabledComponents": []
+                            },
+                            "EditorEntityIconComponent": {
+                                "$type": "EditorEntityIconComponent",
+                                "Id": 3952881133842929321,
+                                "EntityIconAssetId": {
+                                    "guid": "{00000000-0000-0000-0000-000000000000}",
+                                    "subId": 0
+                                }
+                            },
+                            "EditorEntitySortComponent": {
+                                "$type": "EditorEntitySortComponent",
+                                "Id": 5001276784154274519,
+                                "Child Entity Order": []
+                            },
+                            "EditorInspectorComponent": {
+                                "$type": "EditorInspectorComponent",
+                                "Id": 5979027607784539121,
+                                "ComponentOrderEntryArray": []
+                            },
+                            "EditorLockComponent": {
+                                "$type": "EditorLockComponent",
+                                "Id": 2473250940919498597,
+                                "Locked": false
+                            },
+                            "EditorOnlyEntityComponent": {
+                                "$type": "EditorOnlyEntityComponent",
+                                "Id": 12628568304252498147,
+                                "IsEditorOnly": false
+                            },
+                            "EditorPendingCompositionComponent": {
+                                "$type": "EditorPendingCompositionComponent",
+                                "Id": 2352289547677223177,
+                                "PendingComponents": []
+                            },
+                            "EditorVisibilityComponent": {
+                                "$type": "EditorVisibilityComponent",
+                                "Id": 96415449403825232,
+                                "VisibilityFlag": true
+                            },
+                            "TransformComponent": {
+                                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                                "Id": 14148221524752624297,
+                                "Parent Entity": "Entity_[5430681421086]",
+                                "Transform Data": {
+                                    "Translate": [
+                                        0.0,
+                                        0.09051704406738281,
+                                        1.0
+                                    ],
+                                    "Rotate": [
+                                        0.0,
+                                        0.0,
+                                        0.0
+                                    ],
+                                    "Scale": [
+                                        1.0,
+                                        1.0,
+                                        1.0
+                                    ],
+                                    "Locked": false,
+                                    "UniformScale": 1.0
+                                },
+                                "Parent Activation Transform Mode": 0,
+                                "IsStatic": false,
+                                "InterpolatePosition": 0,
+                                "InterpolateRotation": 0
+                            }
+                        },
+                        "IsRuntimeActive": true
+                    }
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[12369258732578569179]/Target",
+                    "value": "Entity_[68669379374302]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Parent Entity",
+                    "value": "Entity_[5430681421086]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Translate/0",
+                    "value": -2.08961820602417
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Translate/1",
+                    "value": -0.054331496357917786
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Translate/2",
+                    "value": 2.7520740032196045
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Rotate/0",
+                    "value": -3.3104679584503174
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Rotate/1",
+                    "value": 39.79645919799805
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[5813610029120484168]/Transform Data/Translate/1",
-                    "value": -12.499871253967283
+                    "path": "/Instances/Instance_[1711844155761]/Entities/Entity_[5417796519198]/Components/Component_[6043040033160946649]/Transform Data/Rotate/2",
+                    "value": -84.8361587524414
                 }
             ]
         }

Templates/Ros2ProjectTemplate/Template/project.json

@@ -42,7 +42,7 @@
         "StartingPointInput",
         "TextureAtlas",
         "WhiteBox",
-        "WarehouseSample",
+        "WarehouseAssets",
         "${Name}"
     ]    
 }

Templates/Ros2ProjectTemplate/preview.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d4907a219add8ff8c90d8006992b183b40457a4166089c21c45ae1574233dea
-size 42149
+oid sha256:781a0c0e2d6507eaa11ff9c2ac1cf8c42e0c629b50a0543b3446cfb277588bef
+size 38380