Kaynağa Gözat

Moved sensor assets from ROS2 Gem to ROS2SampleRobots Gem (#886)

Signed-off-by: Paweł Budziszewski <[email protected]>
Paweł Budziszewski 3 ay önce
ebeveyn
işleme
67956855ad
20 değiştirilmiş dosya ile 377 ekleme ve 287 silme
  1. 0 3
      Gems/ROS2/Assets/Models/Sensors/Camera/CameraOrbbeck.fbx
  2. 0 3
      Gems/ROS2/Assets/Models/Sensors/LidarOS2/LidarOS2.fbx
  3. 0 3
      Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/AO_green.png
  4. 0 3
      Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/Smoothness.png
  5. 0 163
      Gems/ROS2/Assets/Prefabs/Sensors/CameraOrbbeck.prefab
  6. 3 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/LidarOS2.fbx
  7. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/LidarOS2.fbx.assetinfo
  8. 25 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/LidarOS2_OS2Material.material
  9. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/AO_grey.png
  10. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Diffuse.png
  11. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Metallic.png
  12. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Roughness.png
  13. 76 108
      Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/OS2Lidar.prefab
  14. 3 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/CameraOrbbeck.fbx
  15. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/CameraOrbbeck.fbx.assetinfo
  16. 3 4
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/OrbbeckCamera_Body.material
  17. 22 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/OrbbeckCamera_Glass.material
  18. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/Textures/AO.png
  19. 0 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/Textures/Body_Diffuse.png
  20. 245 0
      Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/OrbbeckCamera.prefab

+ 0 - 3
Gems/ROS2/Assets/Models/Sensors/Camera/CameraOrbbeck.fbx

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a409d15dff6905764f833d9c1776d91d47aa106cea0f36def24d3997e3f670b7
-size 86204

+ 0 - 3
Gems/ROS2/Assets/Models/Sensors/LidarOS2/LidarOS2.fbx

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1a630c97a3b192f56b42e87650edfb1f10a4967cb2c7211d7ac00eb487d1b0f
-size 237180

+ 0 - 3
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/AO_green.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f312eb2eac4a1d5cf7f3ebbdccc5f9e7095b810a912f715926c39b7d18864e91
-size 901336

+ 0 - 3
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/Smoothness.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:702ab6984e68abcfc434e90f3475badc9bbeeb8ef7edadd986ec84db985951a1
-size 123513

+ 0 - 163
Gems/ROS2/Assets/Prefabs/Sensors/CameraOrbbeck.prefab

@@ -1,163 +0,0 @@
-{
-    "ContainerEntity": {
-        "Id": "ContainerEntity",
-        "Name": "CameraOrbbeck",
-        "Components": {
-            "Component_[11102275644839424768]": {
-                "$type": "EditorDisabledCompositionComponent",
-                "Id": 11102275644839424768
-            },
-            "Component_[13196476423961983989]": {
-                "$type": "EditorVisibilityComponent",
-                "Id": 13196476423961983989
-            },
-            "Component_[13762686544738860494]": {
-                "$type": "EditorPendingCompositionComponent",
-                "Id": 13762686544738860494
-            },
-            "Component_[14647808383678281689]": {
-                "$type": "EditorPrefabComponent",
-                "Id": 14647808383678281689
-            },
-            "Component_[16541569782343084053]": {
-                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                "Id": 16541569782343084053,
-                "Parent Entity": ""
-            },
-            "Component_[362243497987326595]": {
-                "$type": "EditorEntitySortComponent",
-                "Id": 362243497987326595,
-                "Child Entity Order": [
-                    "Entity_[505721939488]"
-                ]
-            },
-            "Component_[6195463370225568393]": {
-                "$type": "EditorLockComponent",
-                "Id": 6195463370225568393
-            },
-            "Component_[7051867183047048361]": {
-                "$type": "EditorEntityIconComponent",
-                "Id": 7051867183047048361
-            },
-            "Component_[8693333803190442857]": {
-                "$type": "EditorOnlyEntityComponent",
-                "Id": 8693333803190442857
-            },
-            "Component_[921489768285039708]": {
-                "$type": "EditorInspectorComponent",
-                "Id": 921489768285039708
-            }
-        }
-    },
-    "Entities": {
-        "Entity_[505721939488]": {
-            "Id": "Entity_[505721939488]",
-            "Name": "shape",
-            "Components": {
-                "Component_[12057597801334645923]": {
-                    "$type": "EditorStaticRigidBodyComponent",
-                    "Id": 12057597801334645923
-                },
-                "Component_[12232650884412772636]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 12232650884412772636
-                },
-                "Component_[13423704711553959863]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 13423704711553959863
-                },
-                "Component_[14616296837285217185]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 14616296837285217185
-                },
-                "Component_[14985514809153430690]": {
-                    "$type": "EditorMeshColliderComponent",
-                    "Id": 14985514809153430690,
-                    "ColliderConfiguration": {
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "DefaultMaterial"
-                                }
-                            ]
-                        }
-                    },
-                    "ShapeConfiguration": {
-                        "PhysicsAsset": {
-                            "Asset": {
-                                "assetId": {
-                                    "guid": "{0E27CF27-5752-5557-B77A-4B29A5870E0E}",
-                                    "subId": 3865077323
-                                },
-                                "assetHint": "models/sensors/camera/cameraorbbeck.fbx.pxmesh"
-                            },
-                            "Configuration": {
-                                "PhysicsAsset": {
-                                    "assetId": {
-                                        "guid": "{0E27CF27-5752-5557-B77A-4B29A5870E0E}",
-                                        "subId": 3865077323
-                                    },
-                                    "loadBehavior": "QueueLoad",
-                                    "assetHint": "models/sensors/camera/cameraorbbeck.fbx.pxmesh"
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[15329441649387498950]": {
-                    "$type": "AZ::Render::EditorMeshComponent",
-                    "Id": 15329441649387498950,
-                    "Controller": {
-                        "Configuration": {
-                            "ModelAsset": {
-                                "assetId": {
-                                    "guid": "{0E27CF27-5752-5557-B77A-4B29A5870E0E}",
-                                    "subId": 272993556
-                                },
-                                "assetHint": "models/sensors/camera/cameraorbbeck.azmodel"
-                            }
-                        }
-                    }
-                },
-                "Component_[16525421850445080131]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 16525421850445080131
-                },
-                "Component_[1664914396196781949]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 1664914396196781949
-                },
-                "Component_[18099860883597356778]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 18099860883597356778,
-                    "Parent Entity": "ContainerEntity"
-                },
-                "Component_[18322469032445804849]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 18322469032445804849
-                },
-                "Component_[2491808840491479985]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 2491808840491479985,
-                    "ComponentOrderEntryArray": [
-                        {
-                            "ComponentId": 18099860883597356778
-                        },
-                        {
-                            "ComponentId": 15329441649387498950,
-                            "SortIndex": 1
-                        },
-                        {
-                            "ComponentId": 14985514809153430690,
-                            "SortIndex": 2
-                        }
-                    ]
-                },
-                "Component_[6578496273892635118]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 6578496273892635118
-                }
-            }
-        }
-    }
-}

+ 3 - 0
Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/LidarOS2.fbx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:484c3c47bfaa8ca71a8c551f9126b392bc3c4ef80168e89de0fc4f853e03eb00
+size 243792

+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/LidarOS2/LidarOS2.fbx.assetinfo → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/LidarOS2.fbx.assetinfo


+ 25 - 0
Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/LidarOS2_OS2Material.material

@@ -0,0 +1,25 @@
+{
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.800000011920929,
+            0.800000011920929,
+            0.800000011920929,
+            1.0
+        ],
+        "baseColor.textureMap": "Textures/Diffuse.png",
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "metallic.textureMap": "Textures/Metallic.png",
+        "occlusion.diffuseTextureMap": "Textures/AO_grey.png",
+        "opacity.factor": 1.0,
+        "roughness.lowerBound": 0.09000000357627869,
+        "roughness.textureMap": "Textures/Roughness.png",
+        "roughness.upperBound": 0.8100000023841858
+    }
+}

+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/AO_grey.png → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/AO_grey.png


+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/Diffuse.png → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Diffuse.png


+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/Metallic.png → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Metallic.png


+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/LidarOS2/textures/Roughness.png → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/Models/Materials/Textures/Roughness.png


+ 76 - 108
Gems/ROS2/Assets/Prefabs/Sensors/LidarOS2.prefab → Gems/ROS2SampleRobots/Assets/Components/OS2Lidar/OS2Lidar.prefab

@@ -1,133 +1,104 @@
 {
 {
     "ContainerEntity": {
     "ContainerEntity": {
         "Id": "ContainerEntity",
         "Id": "ContainerEntity",
-        "Name": "LidarOS2",
+        "Name": "OS2Lidar",
         "Components": {
         "Components": {
-            "Component_[11054240545439632695]": {
-                "$type": "EditorPendingCompositionComponent",
-                "Id": 11054240545439632695
+            "EditorDisabledCompositionComponent": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 11296661804430830189
             },
             },
-            "Component_[12267693294305582384]": {
-                "$type": "EditorPrefabComponent",
-                "Id": 12267693294305582384
+            "EditorEntityIconComponent": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 15434553774900741338
             },
             },
-            "Component_[13753717631378233523]": {
-                "$type": "EditorInspectorComponent",
-                "Id": 13753717631378233523
+            "EditorEntitySortComponent": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 11120781934780152543,
+                "Child Entity Order": [
+                    "Entity_[2123866998197]"
+                ]
             },
             },
-            "Component_[14137377640240728084]": {
-                "$type": "EditorOnlyEntityComponent",
-                "Id": 14137377640240728084
+            "EditorInspectorComponent": {
+                "$type": "EditorInspectorComponent",
+                "Id": 403700110033079549
             },
             },
-            "Component_[17530435867448426523]": {
+            "EditorLockComponent": {
                 "$type": "EditorLockComponent",
                 "$type": "EditorLockComponent",
-                "Id": 17530435867448426523
+                "Id": 9658122995487508822
             },
             },
-            "Component_[18045801361193694910]": {
-                "$type": "EditorEntityIconComponent",
-                "Id": 18045801361193694910
+            "EditorOnlyEntityComponent": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 11227736333808441704
             },
             },
-            "Component_[3246013088748543125]": {
-                "$type": "EditorEntitySortComponent",
-                "Id": 3246013088748543125,
-                "Child Entity Order": [
-                    "Entity_[417184227077]"
-                ]
+            "EditorPendingCompositionComponent": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 6954464244017628351
             },
             },
-            "Component_[5389828146587111030]": {
-                "$type": "EditorDisabledCompositionComponent",
-                "Id": 5389828146587111030
+            "EditorPrefabComponent": {
+                "$type": "EditorPrefabComponent",
+                "Id": 4914526603541139134
             },
             },
-            "Component_[5989395931141545750]": {
+            "EditorVisibilityComponent": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 7200744503169156196
+            },
+            "TransformComponent": {
                 "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                 "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                "Id": 5989395931141545750,
+                "Id": 269878832931862170,
                 "Parent Entity": ""
                 "Parent Entity": ""
-            },
-            "Component_[6982904761689756877]": {
-                "$type": "EditorVisibilityComponent",
-                "Id": 6982904761689756877
             }
             }
         }
         }
     },
     },
     "Entities": {
     "Entities": {
-        "Entity_[1273969985848]": {
-            "Id": "Entity_[1273969985848]",
-            "Name": "Sensor",
+        "Entity_[2123866998197]": {
+            "Id": "Entity_[2123866998197]",
+            "Name": "OS2Lidar",
             "Components": {
             "Components": {
-                "Component_[1058300359310703890]": {
-                    "$type": "ROS2FrameEditorComponent",
-                    "Id": 1058300359310703890,
-                    "ROS2FrameConfiguration": {
-                        "Namespace Configuration": {
-                            "Namespace Strategy": 1
-                        },
-                        "Frame Name": "lidar"
-                    }
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14421666155801050818
                 },
                 },
-                "Component_[1067011392942644324]": {
+                "EditorEntityIconComponent": {
                     "$type": "EditorEntityIconComponent",
                     "$type": "EditorEntityIconComponent",
-                    "Id": 1067011392942644324
+                    "Id": 8513369820040480554
                 },
                 },
-                "Component_[10842630456390194262]": {
-                    "$type": "GenericComponentWrapper",
-                    "Id": 10842630456390194262,
-                    "m_template": {
-                        "$type": "ROS2LidarSensorComponent",
-                        "SensorConfiguration": {
-                            "Publishers": {
-                                "sensor_msgs::msg::PointCloud2": {
-                                    "Type": "sensor_msgs::msg::PointCloud2",
-                                    "Topic": "pc"
-                                }
-                            }
-                        }
-                    }
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14856527367541348485,
+                    "Child Entity Order": [
+                        "Entity_[2128161965493]"
+                    ]
                 },
                 },
-                "Component_[13013301136498148727]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 13013301136498148727
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 15852700971544254272
                 },
                 },
-                "Component_[13444160964623421011]": {
+                "EditorLockComponent": {
                     "$type": "EditorLockComponent",
                     "$type": "EditorLockComponent",
-                    "Id": 13444160964623421011
+                    "Id": 11084506034782928671
                 },
                 },
-                "Component_[14110476541514862518]": {
+                "EditorOnlyEntityComponent": {
                     "$type": "EditorOnlyEntityComponent",
                     "$type": "EditorOnlyEntityComponent",
-                    "Id": 14110476541514862518
-                },
-                "Component_[17124975368240161289]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 17124975368240161289
+                    "Id": 16658067942896254394
                 },
                 },
-                "Component_[1863593986687460136]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 1863593986687460136
-                },
-                "Component_[3070834537283917104]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 3070834537283917104
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 9602630122799639820
                 },
                 },
-                "Component_[7054215981025466544]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 7054215981025466544
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 16984790709733995753
                 },
                 },
-                "Component_[8854312938977545065]": {
+                "TransformComponent": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 8854312938977545065,
-                    "Parent Entity": "Entity_[417184227077]",
-                    "Transform Data": {
-                        "Translate": [
-                            0.0,
-                            0.0,
-                            0.06961321830749512
-                        ]
-                    }
+                    "Id": 8415199491072389980,
+                    "Parent Entity": "ContainerEntity"
                 }
                 }
             }
             }
         },
         },
-        "Entity_[417184227077]": {
-            "Id": "Entity_[417184227077]",
-            "Name": "LidarOS2",
+        "Entity_[2128161965493]": {
+            "Id": "Entity_[2128161965493]",
+            "Name": "visual",
             "Components": {
             "Components": {
                 "Component_[10387713135725007135]": {
                 "Component_[10387713135725007135]": {
                     "$type": "AZ::Render::EditorMeshComponent",
                     "$type": "AZ::Render::EditorMeshComponent",
@@ -136,10 +107,10 @@
                         "Configuration": {
                         "Configuration": {
                             "ModelAsset": {
                             "ModelAsset": {
                                 "assetId": {
                                 "assetId": {
-                                    "guid": "{99D850A3-8E59-5E78-93FE-AE8DB228684D}",
+                                    "guid": "{867FBB10-91D2-538E-A7FE-D1BA211575B9}",
                                     "subId": 268955557
                                     "subId": 268955557
                                 },
                                 },
-                                "assetHint": "models/sensors/lidaros2/lidaros2.azmodel"
+                                "assetHint": "components/os2lidar/models/lidaros2.fbx.azmodel"
                             }
                             }
                         }
                         }
                     }
                     }
@@ -171,19 +142,19 @@
                         "PhysicsAsset": {
                         "PhysicsAsset": {
                             "Asset": {
                             "Asset": {
                                 "assetId": {
                                 "assetId": {
-                                    "guid": "{99D850A3-8E59-5E78-93FE-AE8DB228684D}",
+                                    "guid": "{867FBB10-91D2-538E-A7FE-D1BA211575B9}",
                                     "subId": 2574200790
                                     "subId": 2574200790
                                 },
                                 },
-                                "assetHint": "models/sensors/lidaros2/lidaros2.fbx.pxmesh"
+                                "assetHint": "components/os2lidar/models/lidaros2.fbx.pxmesh"
                             },
                             },
                             "Configuration": {
                             "Configuration": {
                                 "PhysicsAsset": {
                                 "PhysicsAsset": {
                                     "assetId": {
                                     "assetId": {
-                                        "guid": "{99D850A3-8E59-5E78-93FE-AE8DB228684D}",
+                                        "guid": "{867FBB10-91D2-538E-A7FE-D1BA211575B9}",
                                         "subId": 2574200790
                                         "subId": 2574200790
                                     },
                                     },
                                     "loadBehavior": "QueueLoad",
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "models/sensors/lidaros2/lidaros2.fbx.pxmesh"
+                                    "assetHint": "components/os2lidar/models/lidaros2.fbx.pxmesh"
                                 }
                                 }
                             }
                             }
                         }
                         }
@@ -200,7 +171,7 @@
                 "Component_[3201525403568523459]": {
                 "Component_[3201525403568523459]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3201525403568523459,
                     "Id": 3201525403568523459,
-                    "Parent Entity": "ContainerEntity"
+                    "Parent Entity": "Entity_[2123866998197]"
                 },
                 },
                 "Component_[5004394864880282263]": {
                 "Component_[5004394864880282263]": {
                     "$type": "EditorEntityIconComponent",
                     "$type": "EditorEntityIconComponent",
@@ -240,9 +211,9 @@
                                     "Value": {
                                     "Value": {
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
-                                                "guid": "{305BAE93-C067-5CA7-8C6F-6D9737E15C1B}"
+                                                "guid": "{60B891CD-63FE-5AD1-83D1-6F5F6009361C}"
                                             },
                                             },
-                                            "assetHint": "models/sensors/lidaros2/lidaros2_os2material.azmaterial"
+                                            "assetHint": "components/os2lidar/models/materials/lidaros2_os2material.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }
@@ -260,10 +231,7 @@
                 },
                 },
                 "Component_[8808389010192194694]": {
                 "Component_[8808389010192194694]": {
                     "$type": "EditorEntitySortComponent",
                     "$type": "EditorEntitySortComponent",
-                    "Id": 8808389010192194694,
-                    "Child Entity Order": [
-                        "Entity_[1273969985848]"
-                    ]
+                    "Id": 8808389010192194694
                 }
                 }
             }
             }
         }
         }

+ 3 - 0
Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/CameraOrbbeck.fbx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7538c010e99c0cd2869e2c8dd01b21cf9843c0509c9192ccef2162d88d39430
+size 93792

+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/Camera/CameraOrbbeck.fbx.assetinfo → Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/CameraOrbbeck.fbx.assetinfo


+ 3 - 4
Gems/ROS2/Assets/Models/Sensors/LidarOS2/LidarOS2_OS2Material.material → Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/OrbbeckCamera_Body.material

@@ -8,16 +8,15 @@
             0.800000011920929,
             0.800000011920929,
             1.0
             1.0
         ],
         ],
-        "baseColor.textureMap": "textures/Diffuse.png",
+        "baseColor.textureMap": "Textures/Body_Diffuse.png",
         "emissive.color": [
         "emissive.color": [
             0.0,
             0.0,
             0.0,
             0.0,
             0.0,
             0.0,
             1.0
             1.0
         ],
         ],
-        "metallic.textureMap": "textures/Metallic.png",
-        "occlusion.diffuseTextureMap": "textures/AO_grey.png",
+        "occlusion.diffuseTextureMap": "Textures/AO.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
-        "roughness.textureMap": "textures/Roughness.png"
+        "roughness.factor": 0.4000000059604645
     }
     }
 }
 }

+ 22 - 0
Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/OrbbeckCamera_Glass.material

@@ -0,0 +1,22 @@
+{
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.800000011920929,
+            0.800000011920929,
+            0.800000011920929,
+            1.0
+        ],
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "metallic.factor": 0.8700000047683716,
+        "opacity.factor": 1.0,
+        "roughness.factor": 0.30000001192092896,
+        "specularF0.factor": 0.7900000214576721
+    }
+}

+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/Camera/AO.png → Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/Textures/AO.png


+ 0 - 0
Gems/ROS2/Assets/Models/Sensors/Camera/Body_Diffuse.png → Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/Models/Materials/Textures/Body_Diffuse.png


+ 245 - 0
Gems/ROS2SampleRobots/Assets/Components/OrbbeckCamera/OrbbeckCamera.prefab

@@ -0,0 +1,245 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "OrbbeckCamera",
+        "Components": {
+            "EditorDisabledCompositionComponent": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 10942439558212771036
+            },
+            "EditorEntityIconComponent": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 14035999115027477189
+            },
+            "EditorEntitySortComponent": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 4113198002018313498,
+                "Child Entity Order": [
+                    "Entity_[2209766344117]"
+                ]
+            },
+            "EditorInspectorComponent": {
+                "$type": "EditorInspectorComponent",
+                "Id": 8562443704576400949
+            },
+            "EditorLockComponent": {
+                "$type": "EditorLockComponent",
+                "Id": 10362863927969789171
+            },
+            "EditorOnlyEntityComponent": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 2381198399607887042
+            },
+            "EditorPendingCompositionComponent": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 10108089512319451050
+            },
+            "EditorPrefabComponent": {
+                "$type": "EditorPrefabComponent",
+                "Id": 14036257410100713734
+            },
+            "EditorVisibilityComponent": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 3735174475555922499
+            },
+            "TransformComponent": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 7484990908473607619,
+                "Parent Entity": ""
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[2209766344117]": {
+            "Id": "Entity_[2209766344117]",
+            "Name": "OrbbeckCamera",
+            "Components": {
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 9758352434647478121
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 16345441105574838653
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 9209245584197550432,
+                    "Child Entity Order": [
+                        "Entity_[2214061311413]"
+                    ]
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 16396620250368568003
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 14680429319681099810
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 17863863023842455283
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 7875510946789850905
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 13371499317808249484
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 13159310090264494797,
+                    "Parent Entity": "ContainerEntity"
+                }
+            }
+        },
+        "Entity_[2214061311413]": {
+            "Id": "Entity_[2214061311413]",
+            "Name": "visual",
+            "Components": {
+                "Component_[12057597801334645923]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12057597801334645923
+                },
+                "Component_[12232650884412772636]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 12232650884412772636
+                },
+                "Component_[13423704711553959863]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13423704711553959863
+                },
+                "Component_[14616296837285217185]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 14616296837285217185
+                },
+                "Component_[14985514809153430690]": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 14985514809153430690,
+                    "ColliderConfiguration": {
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "DefaultMaterial"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{C97E0520-0CA4-5100-B4E5-7C0DDFBC0A0F}",
+                                    "subId": 3865077323
+                                },
+                                "assetHint": "components/orbbeckcamera/models/cameraorbbeck.fbx.pxmesh"
+                            },
+                            "Configuration": {
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{C97E0520-0CA4-5100-B4E5-7C0DDFBC0A0F}",
+                                        "subId": 3865077323
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "components/orbbeckcamera/models/cameraorbbeck.fbx.pxmesh"
+                                }
+                            }
+                        }
+                    }
+                },
+                "Component_[15329441649387498950]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 15329441649387498950,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{C97E0520-0CA4-5100-B4E5-7C0DDFBC0A0F}",
+                                    "subId": 272993556
+                                },
+                                "assetHint": "components/orbbeckcamera/models/cameraorbbeck.fbx.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[16525421850445080131]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 16525421850445080131
+                },
+                "Component_[1664914396196781949]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 1664914396196781949
+                },
+                "Component_[18099860883597356778]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18099860883597356778,
+                    "Parent Entity": "Entity_[2209766344117]"
+                },
+                "Component_[18322469032445804849]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 18322469032445804849
+                },
+                "Component_[2491808840491479985]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2491808840491479985,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 18099860883597356778
+                        },
+                        {
+                            "ComponentId": 15329441649387498950,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 14985514809153430690,
+                            "SortIndex": 2
+                        }
+                    ]
+                },
+                "Component_[6578496273892635118]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 6578496273892635118
+                },
+                "EditorMaterialComponent": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 7348856277130129267,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 1175894265
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{B7844A0C-C604-51BC-AC04-B1E7F4AFA837}"
+                                            },
+                                            "assetHint": "components/orbbeckcamera/models/materials/orbbeckcamera_body.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3232760133
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{19C5DB1F-2232-5757-821E-FB2E2E569151}"
+                                            },
+                                            "assetHint": "components/orbbeckcamera/models/materials/orbbeckcamera_glass.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}