Update ROS2 Related prefabs (#695)

* Update ROS2 Related prefabs

Signed-off-by: Mateusz Wasilewski <[email protected]>

Gems/ProteusRobot/Assets/Proteus.prefab

@@ -369,7 +369,7 @@
                                     "guid": "{8A2E7A82-D7C3-5E9C-A56C-6EDA70876347}",
                                     "subId": 268721130
                                 },
-                                "assetHint": "materialeditor/viewportmodels/cylinder.azmodel"
+                                "assetHint": "materialeditor/viewportmodels/cylinder.fbx.azmodel"
                             }
                         }
                     }
@@ -728,12 +728,12 @@
                 },
                 "Component_[639102350977932618]": {
                     "$type": "ROS2FrameEditorComponent",
+                    "Id": 1381491360893018223,
                     "ROS2FrameConfiguration": {
                         "Namespace Configuration": {
                             "Namespace": "base_link"
                         },
-                        "Frame Name": "base_link",
-                        "Effective namespace": "base_link"
+                        "Frame Name": "base_link"
                     }
                 },
                 "Component_[6563269519356188309]": {
@@ -1400,7 +1400,7 @@
                                     "guid": "{42648578-F5A3-52BC-89BF-0D5FC8608250}",
                                     "subId": 276024436
                                 },
-                                "assetHint": "proteus2_lift.azmodel"
+                                "assetHint": "proteus2_lift.fbx.azmodel"
                             }
                         }
                     }
@@ -1759,7 +1759,7 @@
                                     "guid": "{F9B95287-0FA8-5624-92A1-217B33F08280}",
                                     "subId": 277942675
                                 },
-                                "assetHint": "proteus_wheel.azmodel"
+                                "assetHint": "proteus_wheel.fbx.azmodel"
                             }
                         }
                     }
@@ -1875,7 +1875,7 @@
                                     "guid": "{F9B95287-0FA8-5624-92A1-217B33F08280}",
                                     "subId": 277942675
                                 },
-                                "assetHint": "proteus_wheel.azmodel"
+                                "assetHint": "proteus_wheel.fbx.azmodel"
                             }
                         }
                     }
@@ -2036,7 +2036,7 @@
                                     "guid": "{60318C54-1D60-53EC-85AA-2CADBFD83ED9}",
                                     "subId": 278773777
                                 },
-                                "assetHint": "proteus2_chassis.azmodel"
+                                "assetHint": "proteus2_chassis.fbx.azmodel"
                             }
                         }
                     }

Gems/ROS2/Assets/Prefabs/Sensors/CameraOrbbeck.prefab

@@ -77,7 +77,7 @@
                         "MaterialSlots": {
                             "Slots": [
                                 {
-                                    "Name": "Entire object"
+                                    "Name": "DefaultMaterial"
                                 }
                             ]
                         }
@@ -89,7 +89,7 @@
                                     "guid": "{0E27CF27-5752-5557-B77A-4B29A5870E0E}",
                                     "subId": 3865077323
                                 },
-                                "assetHint": "models/sensors/camera/cameraorbbeck.pxmesh"
+                                "assetHint": "models/sensors/camera/cameraorbbeck.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -98,7 +98,7 @@
                                         "subId": 3865077323
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "models/sensors/camera/cameraorbbeck.pxmesh"
+                                    "assetHint": "models/sensors/camera/cameraorbbeck.fbx.pxmesh"
                                 }
                             }
                         }

Gems/ROS2/Assets/Prefabs/Sensors/LidarOS2.prefab

@@ -174,7 +174,7 @@
                                     "guid": "{99D850A3-8E59-5E78-93FE-AE8DB228684D}",
                                     "subId": 2574200790
                                 },
-                                "assetHint": "models/sensors/lidaros2/lidaros2.pxmesh"
+                                "assetHint": "models/sensors/lidaros2/lidaros2.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -183,7 +183,7 @@
                                         "subId": 2574200790
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "models/sensors/lidaros2/lidaros2.pxmesh"
+                                    "assetHint": "models/sensors/lidaros2/lidaros2.fbx.pxmesh"
                                 }
                             }
                         }

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

@@ -107,7 +107,7 @@
                                             "assetId": {
                                                 "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.material.azmaterial"
                                         }
                                     }
                                 }
@@ -125,7 +125,7 @@
                                     "guid": "{8A03C41F-AC4F-5852-8AA7-0A4EFA5E2D61}",
                                     "subId": 282632013
                                 },
-                                "assetHint": "assets/warehouse/models/box1.azmodel"
+                                "assetHint": "assets/warehouse/models/box1.fbx.azmodel"
                             }
                         }
                     }

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

@@ -107,7 +107,7 @@
                                             "assetId": {
                                                 "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.material.azmaterial"
                                         }
                                     }
                                 }
@@ -125,7 +125,7 @@
                                     "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
                                     "subId": 282185463
                                 },
-                                "assetHint": "assets/warehouse/models/box2.azmodel"
+                                "assetHint": "assets/warehouse/models/box2.fbx.azmodel"
                             }
                         }
                     }

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

@@ -107,7 +107,7 @@
                                             "assetId": {
                                                 "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.material.azmaterial"
                                         }
                                     }
                                 }
@@ -125,7 +125,7 @@
                                     "guid": "{6B552C1C-B7A0-5029-AEF6-C0FE06A69877}",
                                     "subId": 280128450
                                 },
-                                "assetHint": "assets/warehouse/models/box4.azmodel"
+                                "assetHint": "assets/warehouse/models/box4.fbx.azmodel"
                             }
                         }
                     }

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

@@ -119,7 +119,7 @@
                                             "assetId": {
                                                 "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.material.azmaterial"
                                         }
                                     }
                                 }
@@ -146,7 +146,7 @@
                                     "guid": "{198A15B4-31E6-5693-BCF6-6C3D49884F59}",
                                     "subId": 282185463
                                 },
-                                "assetHint": "assets/warehouse/models/box2.azmodel"
+                                "assetHint": "assets/warehouse/models/box2.fbx.azmodel"
                             }
                         }
                     }

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

@@ -72,7 +72,7 @@
                                     "guid": "{665AB396-251A-55E3-83E2-AAB98CB864FB}",
                                     "subId": 280860284
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_rack.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_rack.fbx.azmodel"
                             }
                         }
                     }
@@ -92,7 +92,7 @@
                                             "assetId": {
                                                 "guid": "{0F02CB79-3194-5377-808F-5EEF328D40DF}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousestorage.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousestorage.material.azmaterial"
                                         }
                                     }
                                 }
@@ -123,7 +123,7 @@
                                     "guid": "{665AB396-251A-55E3-83E2-AAB98CB864FB}",
                                     "subId": 1812650258
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_rack.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -132,7 +132,7 @@
                                         "subId": 1812650258
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_rack.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                                 }
                             }
                         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Misc/Movable_blue.prefab

@@ -122,7 +122,7 @@
                                 "assetId": {
                                     "guid": "{8DE38686-852C-5110-96BB-BB1361502266}"
                                 },
-                                "assetHint": "assets/warehouse/floor_markings/markings_blue.azmaterial"
+                                "assetHint": "assets/warehouse/floor_markings/markings_blue.material.azmaterial"
                             }
                         }
                     }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Rack_protectors/Rack_front_protector.prefab

@@ -81,7 +81,7 @@
                                     "guid": "{9928FCBB-9AD8-5B3E-94FF-3516CC574ED1}",
                                     "subId": 4102061829
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -90,7 +90,7 @@
                                         "subId": 4102061829
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.fbx.pxmesh"
                                 }
                             }
                         }
@@ -153,7 +153,7 @@
                                             "assetId": {
                                                 "guid": "{DC927EEA-A70D-5383-96AA-665AC07DC591}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.material.azmaterial"
                                         }
                                     }
                                 },
@@ -166,7 +166,7 @@
                                             "assetId": {
                                                 "guid": "{DC927EEA-A70D-5383-96AA-665AC07DC591}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.material.azmaterial"
                                         }
                                     }
                                 }
@@ -192,7 +192,7 @@
                                     "guid": "{9928FCBB-9AD8-5B3E-94FF-3516CC574ED1}",
                                     "subId": 271948536
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_frontrackprotector.fbx.azmodel"
                             }
                         }
                     }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Rack_protectors/Rack_side_protector.prefab

@@ -115,7 +115,7 @@
                                     "guid": "{663633B0-B67A-5957-BC3A-53FA65F40353}",
                                     "subId": 282952590
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_siderackprotector.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_siderackprotector.fbx.azmodel"
                             }
                         }
                     }
@@ -147,7 +147,7 @@
                                             "assetId": {
                                                 "guid": "{DC927EEA-A70D-5383-96AA-665AC07DC591}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehouseprops.material.azmaterial"
                                         }
                                     }
                                 }
@@ -174,7 +174,7 @@
                                     "guid": "{663633B0-B67A-5957-BC3A-53FA65F40353}",
                                     "subId": 3163433385
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_siderackprotector.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_siderackprotector.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -183,7 +183,7 @@
                                         "subId": 3163433385
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_siderackprotector.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_siderackprotector.fbx.pxmesh"
                                 }
                             }
                         }

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

@@ -85,7 +85,7 @@
                                             "assetId": {
                                                 "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.material.azmaterial"
                                         }
                                     }
                                 }
@@ -111,7 +111,7 @@
                                     "guid": "{FD1A02B5-A597-52A4-88EF-33D00822FDD6}",
                                     "subId": 281610153
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_storage_on_wheels.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_storage_on_wheels.fbx.azmodel"
                             }
                         }
                     }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Components/Ceiling_Lamp.prefab

@@ -304,7 +304,7 @@
                                             "assetId": {
                                                 "guid": "{EF5EE945-8A4F-578E-8AF5-2D545FA4CDEE}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules_lamps.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules_lamps.material.azmaterial"
                                         }
                                     }
                                 }
@@ -358,7 +358,7 @@
                                     "guid": "{3FE74ABC-001D-5AA5-ADBE-20F0964178DD}",
                                     "subId": 277792031
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_ceiling_lamp.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_ceiling_lamp.fbx.azmodel"
                             }
                         }
                     }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Floor.prefab

@@ -64,7 +64,7 @@
                                     "guid": "{4687EDB6-F57B-592A-8451-4A41BD678D9A}",
                                     "subId": 270838499
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_floor.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_floor.fbx.azmodel"
                             }
                         }
                     }
@@ -130,7 +130,7 @@
                                     "guid": "{4687EDB6-F57B-592A-8451-4A41BD678D9A}",
                                     "subId": 2070809848
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_floor.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_floor.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "Scale": [
@@ -144,12 +144,13 @@
                                         "subId": 2070809848
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_floor.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_floor.fbx.pxmesh"
                                 }
                             }
                         },
                         "HasNonUniformScale": true
-                    }
+                    },
+                    "HasNonUniformScale": true
                 },
                 "Component_[17647558825107464022]": {
                     "$type": "EditorVisibilityComponent",
@@ -198,7 +199,7 @@
                                             "assetId": {
                                                 "guid": "{67470786-4A32-5D05-9EE2-73060764DC1D}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousefloor.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousefloor.material.azmaterial"
                                         }
                                     }
                                 }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Roof.prefab

@@ -510,7 +510,7 @@
                                     "guid": "{C8DB7BC9-31FC-5548-9E7A-CE1A886BE5E4}",
                                     "subId": 277880160
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_ceiling.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_ceiling.fbx.azmodel"
                             }
                         }
                     }
@@ -542,7 +542,7 @@
                                             "assetId": {
                                                 "guid": "{4D881031-88E9-5300-B525-6F6E35182D97}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules_roof.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules_roof.material.azmaterial"
                                         }
                                     }
                                 }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab

@@ -160,7 +160,7 @@
                                     "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
                                     "subId": 279508339
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.azmodel"
                             }
                         }
                     }
@@ -180,7 +180,7 @@
                                             "assetId": {
                                                 "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                         }
                                     }
                                 },
@@ -193,7 +193,7 @@
                                             "assetId": {
                                                 "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousegate.material.azmaterial"
                                         }
                                     }
                                 }
@@ -231,7 +231,7 @@
                                     "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
                                     "subId": 675098786
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -240,7 +240,7 @@
                                         "subId": 675098786
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.pxmesh"
                                 }
                             }
                         }
@@ -295,7 +295,7 @@
                                     "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
                                     "subId": 279103289
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.azmodel"
                             }
                         }
                     }
@@ -324,7 +324,7 @@
                                             "assetId": {
                                                 "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                         }
                                     }
                                 }
@@ -351,7 +351,7 @@
                                     "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
                                     "subId": 3814177680
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -360,7 +360,7 @@
                                         "subId": 3814177680
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.pxmesh"
                                 }
                             }
                         }
@@ -414,7 +414,7 @@
                                     "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
                                     "subId": 269507228
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.azmodel"
                             }
                         }
                     }
@@ -439,7 +439,7 @@
                                             "assetId": {
                                                 "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                         }
                                     }
                                 }
@@ -478,7 +478,7 @@
                                     "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
                                     "subId": 2510506373
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -487,7 +487,7 @@
                                         "subId": 2510506373
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_front.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.pxmesh"
                                 }
                             }
                         }
@@ -567,7 +567,7 @@
                                             "assetId": {
                                                 "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                             },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                         }
                                     }
                                 }
@@ -594,7 +594,7 @@
                                     "guid": "{1DB458F4-42D7-5377-995B-415257F59549}",
                                     "subId": 1364068586
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_side.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_side.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -603,7 +603,7 @@
                                         "subId": 1364068586
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_side.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_side.fbx.pxmesh"
                                 }
                             }
                         }
@@ -623,7 +623,7 @@
                                     "guid": "{1DB458F4-42D7-5377-995B-415257F59549}",
                                     "subId": 277096602
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_side.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_side.fbx.azmodel"
                             }
                         }
                     }
@@ -736,8 +736,23 @@
                 "Component_[7017245480046407512]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7017245480046407512,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10232715223514738948]": {
+                            "$type": "AZ::Render::EditorMeshComponent",
+                            "Id": 10232715223514738948,
+                            "Controller": {
+                                "Configuration": {
+                                    "ModelAsset": {
+                                        "assetId": {
+                                            "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
+                                            "subId": 269507228
+                                        },
+                                        "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.azmodel"
+                                    }
+                                }
+                            }
+                        },
+                        "Component_[3790789121538053334]": {
                             "$type": "EditorColliderComponent",
                             "Id": 3790789121538053334,
                             "ColliderConfiguration": {
@@ -770,29 +785,14 @@
                                     }
                                 }
                             }
-                        },
-                        {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10232715223514738948,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
-                                            "subId": 269507228
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front.azmodel"
-                                    }
-                                }
-                            }
                         }
-                    ]
+                    }
                 },
                 "Component_[8212625672736002681]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8212625672736002681,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[11718397946111790072]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 11718397946111790072,
                             "Controller": {
@@ -807,7 +807,7 @@
                                                     "assetId": {
                                                         "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                                     },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                                 }
                                             }
                                         }
@@ -815,7 +815,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9253383058600544919]": {
                     "$type": "EditorInspectorComponent",
@@ -872,8 +872,23 @@
                 "Component_[7017245480046407512]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7017245480046407512,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10232715223514738948]": {
+                            "$type": "AZ::Render::EditorMeshComponent",
+                            "Id": 10232715223514738948,
+                            "Controller": {
+                                "Configuration": {
+                                    "ModelAsset": {
+                                        "assetId": {
+                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
+                                            "subId": 279103289
+                                        },
+                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.azmodel"
+                                    }
+                                }
+                            }
+                        },
+                        "Component_[1554132197757752789]": {
                             "$type": "EditorColliderComponent",
                             "Id": 1554132197757752789,
                             "ColliderConfiguration": {
@@ -906,29 +921,14 @@
                                     }
                                 }
                             }
-                        },
-                        {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10232715223514738948,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
-                                            "subId": 279103289
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.azmodel"
-                                    }
-                                }
-                            }
                         }
-                    ]
+                    }
                 },
                 "Component_[8212625672736002681]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8212625672736002681,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[11718397946111790072]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 11718397946111790072,
                             "Controller": {
@@ -943,7 +943,7 @@
                                                     "assetId": {
                                                         "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                                     },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                                 }
                                             }
                                         }
@@ -951,7 +951,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9253383058600544919]": {
                     "$type": "EditorInspectorComponent",
@@ -978,8 +978,8 @@
                 "Component_[17614188821325671055]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17614188821325671055,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10387122939797774050]": {
                             "$type": "AZ::Render::EditorMeshComponent",
                             "Id": 10387122939797774050,
                             "Controller": {
@@ -989,12 +989,12 @@
                                             "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
                                             "subId": 279508339
                                         },
-                                        "assetHint": "assets/warehouse/models/warehouse_gate_closed.azmodel"
+                                        "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.azmodel"
                                     }
                                 }
                             }
                         },
-                        {
+                        "Component_[16809483465388003559]": {
                             "$type": "EditorColliderComponent",
                             "Id": 16809483465388003559,
                             "ColliderConfiguration": {
@@ -1031,7 +1031,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[17714278481541526192]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -1070,8 +1070,8 @@
                 "Component_[8806906810237163444]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8806906810237163444,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[12188643545659218893]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 12188643545659218893,
                             "Controller": {
@@ -1086,7 +1086,7 @@
                                                     "assetId": {
                                                         "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
                                                     },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
+                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.material.azmaterial"
                                                 }
                                             }
                                         },
@@ -1099,7 +1099,7 @@
                                                     "assetId": {
                                                         "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
                                                     },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
+                                                    "assetHint": "assets/warehouse/materials/mwarehousegate.material.azmaterial"
                                                 }
                                             }
                                         }
@@ -1107,7 +1107,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9994022325695796853]": {
                     "$type": "EditorStaticRigidBodyComponent",