Jelajahi Sumber

Merge pull request #3 from o3de/UpdatePhysX

Updating PhysX and fix to script.
Jonny Galloway 2 tahun lalu
induk
melakukan
68b584ac1b

+ 3 - 11
Gems/BasePlanet/Assets/PickUps/Gem.prefab

@@ -16,10 +16,6 @@
                 "$type": "EditorOnlyEntityComponent",
                 "Id": 1337480352582872265
             },
-            "Component_[14409333348344207076]": {
-                "$type": "SelectionComponent",
-                "Id": 14409333348344207076
-            },
             "Component_[14435506774525712807]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 14435506774525712807
@@ -197,9 +193,9 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10764333226398071306
                 },
-                "Component_[11570210216039784556]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11570210216039784556
+                "Component_[13200749432017061275]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13200749432017061275
                 },
                 "Component_[13882027931495789401]": {
                     "$type": "EditorLockComponent",
@@ -370,10 +366,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 18063816367385414700
                 },
-                "Component_[2344322974889594480]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2344322974889594480
-                },
                 "Component_[8570238131290691153]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8570238131290691153

+ 4 - 0
Gems/BasePlanet/Assets/PickUps/Pick_Up_Power.prefab

@@ -178,6 +178,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7256103390470666656
                 },
+                "Component_[7294088404429300502]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7294088404429300502
+                },
                 "Component_[9031493117224326634]": {
                     "$type": "EditorScriptCanvasComponent",
                     "Id": 9031493117224326634,

+ 4 - 3
Gems/BasePlanet/Assets/Props/Coral_Air_Plant.prefab

@@ -105,6 +105,10 @@
                         }
                     }
                 },
+                "Component_[15825715460789613195]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15825715460789613195
+                },
                 "Component_[1702404017217684356]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1702404017217684356
@@ -145,9 +149,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "props/coral_air_plant.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentTarget": ""
                 },
                 "Component_[7739249974576042811]": {

+ 4 - 0
Gems/BasePlanet/Assets/Props/Large_Rock_One.prefab

@@ -170,6 +170,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7808445149826072271
                 },
+                "Component_[7856795939738354985]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7856795939738354985
+                },
                 "Component_[8911718439806927649]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8911718439806927649

+ 4 - 0
Gems/BasePlanet/Assets/Props/Med_Rock_One.prefab

@@ -119,6 +119,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7808445149826072271
                 },
+                "Component_[801425304867882384]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 801425304867882384
+                },
                 "Component_[8138251872423091292]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 8138251872423091292,

+ 4 - 0
Gems/BasePlanet/Assets/Props/Small_Rock_One.prefab

@@ -54,6 +54,10 @@
             "Id": "Entity_[3854088832756]",
             "Name": "Small_Rock_One",
             "Components": {
+                "Component_[11322835762862219446]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11322835762862219446
+                },
                 "Component_[13551766466811803649]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 13551766466811803649

+ 86 - 95
Project/Levels/Main/Main.prefab

@@ -124,6 +124,51 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 10663792775745862861
                 },
+                "Component_[13211924182011325725]": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 9335031146978547202,
+                    "ColliderConfiguration": {
+                        "CollisionLayer": {
+                            "Index": 2
+                        },
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "MainShipMAT"
+                                },
+                                {
+                                    "Name": "ShipPartsMAT"
+                                }
+                            ]
+                        },
+                        "ColliderTag": "Ship"
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{F90F6215-CA23-5506-89C3-4495539484FB}",
+                                    "subId": 2884240345
+                                },
+                                "assetHint": "spaceships/mainplayerlandingship.pxmesh"
+                            },
+                            "Configuration": {
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{F90F6215-CA23-5506-89C3-4495539484FB}",
+                                        "subId": 2884240345
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "spaceships/mainplayerlandingship.pxmesh"
+                                },
+                                "UseMaterialsFromAsset": false
+                            }
+                        }
+                    },
+                    "DebugDrawSettings": {
+                        "LocallyEnabled": false
+                    }
+                },
                 "Component_[13486720338851256531]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 13486720338851256531
@@ -183,55 +228,14 @@
                         "Entity_[52518376258791]"
                     ]
                 },
+                "Component_[6225939989508102459]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6225939989508102459
+                },
                 "Component_[7980187145222437072]": {
                     "$type": "EditorLockComponent",
                     "Id": 7980187145222437072
                 },
-                "Component_[9335031146978547202]": {
-                    "$type": "EditorColliderComponent",
-                    "Id": 9335031146978547202,
-                    "ColliderConfiguration": {
-                        "CollisionLayer": {
-                            "Index": 2
-                        },
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "MainShipMAT"
-                                },
-                                {
-                                    "Name": "ShipPartsMAT"
-                                }
-                            ]
-                        },
-                        "ColliderTag": "Ship"
-                    },
-                    "ShapeConfiguration": {
-                        "PhysicsAsset": {
-                            "Asset": {
-                                "assetId": {
-                                    "guid": "{F90F6215-CA23-5506-89C3-4495539484FB}",
-                                    "subId": 2884240345
-                                },
-                                "assetHint": "spaceships/mainplayerlandingship.pxmesh"
-                            },
-                            "Configuration": {
-                                "PhysicsAsset": {
-                                    "assetId": {
-                                        "guid": "{F90F6215-CA23-5506-89C3-4495539484FB}",
-                                        "subId": 2884240345
-                                    },
-                                    "loadBehavior": "QueueLoad",
-                                    "assetHint": "spaceships/mainplayerlandingship.pxmesh"
-                                },
-                                "UseMaterialsFromAsset": false
-                            }
-                        }
-                    },
-                    "DebugDrawSettings": {
-                        "LocallyEnabled": false
-                    }
-                },
                 "Component_[9626976516920809142]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 9626976516920809142
@@ -926,6 +930,10 @@
                         }
                     }
                 },
+                "Component_[13326249254225138850]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13326249254225138850
+                },
                 "Component_[13575659593392057369]": {
                     "$type": "EditorLockComponent",
                     "Id": 13575659593392057369
@@ -2170,6 +2178,10 @@
                         }
                     }
                 },
+                "Component_[11504335314365086147]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11504335314365086147
+                },
                 "Component_[12654805976110548127]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 12654805976110548127
@@ -3066,6 +3078,10 @@
                     "$type": "EditorInspectorComponent",
                     "Id": 1641785984053544956
                 },
+                "Component_[16841048059455175406]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16841048059455175406
+                },
                 "Component_[17237976107571838644]": {
                     "$type": "EditorColliderComponent",
                     "Id": 17237976107571838644,
@@ -3907,9 +3923,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_shoe_left_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 }
@@ -3991,9 +4004,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_chestprotector_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 },
@@ -4034,9 +4044,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_shoe_right_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 },
@@ -4230,9 +4237,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentTarget": ""
                 },
                 "Component_[14877113385555450889]": {
@@ -4478,9 +4482,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_watch_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 },
@@ -4546,9 +4547,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_rocketwings_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 },
@@ -4675,9 +4673,6 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/mainplayer/main_player_helment_attachment.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentType": 2,
                     "AttachmentTarget": "Entity_[88967228199909]"
                 },
@@ -4771,32 +4766,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 10491048867960330155
                 },
-                "Component_[10868660521230225483]": {
-                    "$type": "EditorCharacterControllerComponent",
-                    "Id": 10868660521230225483,
-                    "Configuration": {
-                        "entityId": "",
-                        "CollisionLayer": {
-                            "Index": 3
-                        },
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "Entire object"
-                                }
-                            ]
-                        },
-                        "ColliderTag": "Buggy",
-                        "ContactOffset": 0.009999999776482582,
-                        "ScaleCoeff": 1.0
-                    },
-                    "ShapeConfig": {
-                        "Capsule": {
-                            "Height": 2.0199999809265137,
-                            "Radius": 0.5
-                        }
-                    }
-                },
                 "Component_[14208068500515114237]": {
                     "$type": "EditorDetourNavigationComponent",
                     "Id": 14208068500515114237,
@@ -4998,15 +4967,37 @@
                         "loadBehavior": "QueueLoad",
                         "assetHint": "characters/buggy/buggyactor.actor"
                     },
-                    "MaterialPerLOD": [
-                        {}
-                    ],
                     "AttachmentTarget": ""
                 },
                 "Component_[7576156279467917687]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7576156279467917687
                 },
+                "Component_[7817048981013174589]": {
+                    "$type": "EditorCharacterControllerComponent",
+                    "Id": 7817048981013174589,
+                    "Configuration": {
+                        "entityId": "",
+                        "CollisionLayer": {
+                            "Index": 3
+                        },
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
+                            ]
+                        },
+                        "ColliderTag": "Buggy",
+                        "ContactOffset": 0.009999999776482582
+                    },
+                    "ShapeConfig": {
+                        "Capsule": {
+                            "Height": 2.0199999809265137,
+                            "Radius": 0.5
+                        }
+                    }
+                },
                 "Component_[8831432650552942432]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 8831432650552942432,

File diff ditekan karena terlalu besar
+ 283 - 89
Project/scriptcanvas/Buggy_Nav.scriptcanvas


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini