Selaa lähdekoodia

Update prefabs with ed_physxUpdatePrefabsWithColliderComponents for PhysX (#116)

Signed-off-by: Michał Pełka <[email protected]>
Michał Pełka 2 vuotta sitten
vanhempi
commit
c8857ac5d3

+ 8 - 10
Gems/ROS2/Assets/Prefabs/Sensors/CameraOrbbeck.prefab

@@ -7,10 +7,6 @@
                 "$type": "EditorDisabledCompositionComponent",
                 "$type": "EditorDisabledCompositionComponent",
                 "Id": 11102275644839424768
                 "Id": 11102275644839424768
             },
             },
-            "Component_[11542908075789116644]": {
-                "$type": "SelectionComponent",
-                "Id": 11542908075789116644
-            },
             "Component_[13196476423961983989]": {
             "Component_[13196476423961983989]": {
                 "$type": "EditorVisibilityComponent",
                 "$type": "EditorVisibilityComponent",
                 "Id": 13196476423961983989
                 "Id": 13196476423961983989
@@ -58,9 +54,9 @@
             "Id": "Entity_[505721939488]",
             "Id": "Entity_[505721939488]",
             "Name": "shape",
             "Name": "shape",
             "Components": {
             "Components": {
-                "Component_[10894288830090806011]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10894288830090806011
+                "Component_[12057597801334645923]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12057597801334645923
                 },
                 },
                 "Component_[12232650884412772636]": {
                 "Component_[12232650884412772636]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "$type": "EditorDisabledCompositionComponent",
@@ -78,9 +74,11 @@
                     "$type": "EditorColliderComponent",
                     "$type": "EditorColliderComponent",
                     "Id": 14985514809153430690,
                     "Id": 14985514809153430690,
                     "ColliderConfiguration": {
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                             ]
                         }
                         }
                     },
                     },

+ 10 - 16
Gems/ROS2/Assets/Prefabs/Sensors/Imu.prefab

@@ -7,10 +7,6 @@
                 "$type": "EditorLockComponent",
                 "$type": "EditorLockComponent",
                 "Id": 10933327020638125059
                 "Id": 10933327020638125059
             },
             },
-            "Component_[13139737976503828664]": {
-                "$type": "SelectionComponent",
-                "Id": 13139737976503828664
-            },
             "Component_[15418568890677341368]": {
             "Component_[15418568890677341368]": {
                 "$type": "EditorOnlyEntityComponent",
                 "$type": "EditorOnlyEntityComponent",
                 "Id": 15418568890677341368
                 "Id": 15418568890677341368
@@ -66,17 +62,15 @@
                     "$type": "EditorOnlyEntityComponent",
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 11958193181460909696
                     "Id": 11958193181460909696
                 },
                 },
-                "Component_[12008599340723129520]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12008599340723129520
-                },
                 "Component_[12053638524449760314]": {
                 "Component_[12053638524449760314]": {
                     "$type": "EditorColliderComponent",
                     "$type": "EditorColliderComponent",
                     "Id": 12053638524449760314,
                     "Id": 12053638524449760314,
                     "ColliderConfiguration": {
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                             ]
                         }
                         }
                     },
                     },
@@ -169,6 +163,10 @@
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 16208993720168044799,
                     "Id": 16208993720168044799,
                     "Parent Entity": "ContainerEntity"
                     "Parent Entity": "ContainerEntity"
+                },
+                "Component_[6556961023163958494]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6556961023163958494
                 }
                 }
             }
             }
         },
         },
@@ -184,10 +182,6 @@
                     "$type": "EditorInspectorComponent",
                     "$type": "EditorInspectorComponent",
                     "Id": 12018107220451562856
                     "Id": 12018107220451562856
                 },
                 },
-                "Component_[13764353402899190262]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13764353402899190262
-                },
                 "Component_[14000889612025468259]": {
                 "Component_[14000889612025468259]": {
                     "$type": "EditorLockComponent",
                     "$type": "EditorLockComponent",
                     "Id": 14000889612025468259
                     "Id": 14000889612025468259
@@ -246,4 +240,4 @@
             }
             }
         }
         }
     }
     }
-}
+}

+ 5 - 7
Gems/ROS2/Assets/Prefabs/Sensors/LidarOS2.prefab

@@ -81,8 +81,7 @@
                                     "Topic": "pc"
                                     "Topic": "pc"
                                 }
                                 }
                             }
                             }
-                        },
-                        "LidarTransparentEntityId": ""
+                        }
                     }
                     }
                 },
                 },
                 "Component_[13013301136498148727]": {
                 "Component_[13013301136498148727]": {
@@ -167,11 +166,6 @@
                                     "Name": "DefaultMaterial"
                                     "Name": "DefaultMaterial"
                                 }
                                 }
                             ]
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                         }
                     },
                     },
                     "ShapeConfiguration": {
                     "ShapeConfiguration": {
@@ -200,6 +194,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17075071070477116796
                     "Id": 17075071070477116796
                 },
                 },
+                "Component_[226256536131696604]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 226256536131696604
+                },
                 "Component_[3201525403568523459]": {
                 "Component_[3201525403568523459]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3201525403568523459,
                     "Id": 3201525403568523459,