Преглед на файлове

Updates to support the PhysX split

Signed-off-by: Steve Pham <[email protected]>
Steve Pham преди 1 година
родител
ревизия
158af24959
променени са 4 файла, в които са добавени 6 реда и са изтрити 8 реда
  1. 2 2
      Project/Gem/CMakeLists.txt
  2. 1 1
      Project/Gem/enabled_gems.cmake
  3. 2 4
      Project/Registry/physxsystemconfiguration.setreg
  4. 1 1
      Project/project.json

+ 2 - 2
Project/Gem/CMakeLists.txt

@@ -49,7 +49,7 @@ ly_add_target(
             Gem::LyShine
             Gem::Atom_AtomBridge.Static
             Gem::ImGui.Static
-            Gem::PhysX.Static
+            Gem::PhysX5.Static
 )
 
 target_depends_on_ros2_packages(ROSConDemo.Static std_srvs nav_msgs vision_msgs)
@@ -97,7 +97,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
         BUILD_DEPENDENCIES
             PUBLIC
                 AZ::AzToolsFramework
-                Gem::AtomLyIntegration_CommonFeatures.Editor.Static
+                Gem::CommonFeaturesAtom.Editor.Static
                 Gem::LmbrCentral.API
                 Gem::ROS2.Editor.Static
                 Gem::ROSConDemo.Static

+ 1 - 1
Project/Gem/enabled_gems.cmake

@@ -11,7 +11,7 @@ set(ENABLED_GEMS
     ImGui
     LandscapeCanvas
     LyShine
-    PhysX
+    PhysX5
     PrimitiveAssets
     PrefabBuilder
     SaveData

+ 2 - 4
Project/Registry/physxsystemconfiguration.setreg

@@ -3,13 +3,11 @@
         "Gems": {
             "PhysX": {
                 "PhysXSystemConfiguration": {
-                    "FixedTimeStep": 0.009999999776482582,
-                    "OverlapBufferSize": 256,
                     "CollisionConfig": {
                         "Layers": {
                             "LayerNames": [
                                 "Default",
-                                "Robot",
+                                {},
                                 {},
                                 {},
                                 {},
@@ -82,7 +80,7 @@
                                 },
                                 {
                                     "Id": {
-                                        "GroupId": "{EAE75F31-696E-4659-8792-7CBA45ABD41B}"
+                                        "GroupId": "{BE28E146-905B-44E2-BB05-2CA6CE7B4BE7}"
                                     },
                                     "Name": "None",
                                     "Group": {

+ 1 - 1
Project/project.json

@@ -20,5 +20,5 @@
     "gem_names": [
         "ROS2"
     ],
-    "engine_version": "2.1.0"
+    "engine_version": "4.0.0"
 }