Merge branch 'o3de:development' into development

RobotecAI · Feb 9, 2024 · b5be871 · b5be871
2 parents 5da5649 + 2f9a8a7
commit b5be871
Show file tree

Hide file tree

Showing 34 changed files with 2,786 additions and 301 deletions.
diff --git a/Gems/ProteusRobot/gem.json b/Gems/ProteusRobot/gem.json
@@ -1,6 +1,6 @@
 {
     "gem_name": "ProteusRobot",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "display_name": "Proteus Robot",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -21,14 +21,14 @@
     "requirements": "Requires ROS 2 Gem",
     "documentation_url": "https://www.o3de.org/docs/user-guide/interactivity/robotics/project-configuration/#ros-2-project-templates",
     "dependencies": [
-        "ROS2==3.0.0"
+        "ROS2>=3.1.0"
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "compatible_engines": [
-        "o3de-sdk>=1.2.0",
-        "o3de>=1.2.0"
+        "o3de-sdk>=4.1.0",
+        "o3de>=4.1.0"
     ],
     "engine_api_dependencies": [],
     "restricted": "ProteusRobot",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-1.0.0-gem.zip"
-}
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-1.1.0-gem.zip"
+}
diff --git a/Gems/ROS2/Code/CMakeLists.txt b/Gems/ROS2/Code/CMakeLists.txt
@@ -65,7 +65,7 @@ ly_add_target(
             Gem::Atom_Feature_Common.Static
             Gem::Atom_Component_DebugCamera.Static
             Gem::StartingPointInput
-            Gem::PhysX.Static
+            Gem::PhysX5.Static
             Gem::LmbrCentral.API
 )
 
@@ -132,7 +132,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::AzToolsFramework
                 Gem::CommonFeaturesAtom.Editor.Static
                 Gem::LmbrCentral.API
-                Gem::PhysX.Editor.Static
+                Gem::PhysX5.Editor.Static
                 Gem::${gem_name}.Static
             PRIVATE
                 AZ::AssetBuilderSDK
@@ -214,7 +214,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzManipulatorTestFramework.Static
                     Gem::ROS2.Static
                 RUNTIME_DEPENDENCIES
-                    Gem::PhysX.Editor
+                    Gem::PhysX5.Editor
         )
 
         ly_add_googletest(

diff --git a/Gems/ROS2/gem.json b/Gems/ROS2/gem.json
@@ -1,6 +1,6 @@
 {
     "gem_name": "ROS2",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "platforms": [
         "Linux"
     ],
@@ -18,8 +18,8 @@
         "ROS2"
     ],
     "compatible_engines": [
-        "o3de-sdk>=3.1.0",
-        "o3de>=3.1.0"
+        "o3de-sdk>=4.1.0",
+        "o3de>=4.1.0"
     ],
     "icon_path": "preview.png",
     "requirements": "Requires ROS 2 installation (supported distributions: Humble). Source your workspace before building the Gem",
@@ -29,12 +29,11 @@
         "Atom_Feature_Common",
         "Atom_Component_DebugCamera",
         "CommonFeaturesAtom",
-        "PhysX",
+        "PhysX5",
         "PrimitiveAssets",
         "StartingPointInput"
-
     ],
     "restricted": "ROS2",
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-2.0.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-3.1.0-gem.zip"
 }
diff --git a/Gems/RosRobotSample/gem.json b/Gems/RosRobotSample/gem.json
@@ -1,5 +1,6 @@
 {
     "gem_name": "RosRobotSample",
+    "version": "1.1.0",
     "display_name": "ROS Robot Sample",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -20,14 +21,13 @@
     "requirements": "Requires ROS 2 Gem",
     "documentation_url": "",
     "dependencies": [
-        "ROS2==3.0.0"
+        "ROS2>=3.1.0"
     ],
     "compatible_engines": [
-        "o3de-sdk>=1.2.0",
-        "o3de>=1.2.0"
+        "o3de-sdk>=4.1.0",
+        "o3de>=4.1.0"
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "restricted": "",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-1.0.0-gem.zip",
-    "version": "1.0.0"
-}
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-1.1.0-gem.zip"
+}
diff --git a/Gems/WarehouseAutomation/Code/CMakeLists.txt b/Gems/WarehouseAutomation/Code/CMakeLists.txt
@@ -55,7 +55,7 @@ ly_add_target(
             AZ::AzCore
             AZ::AzFramework
             Gem::CommonFeaturesAtom.Static
-            Gem::PhysX.Static
+            Gem::PhysX5.Static
 )
 
 # Here add ${gem_name} target, it depends on the Private Object library and Public API interface
@@ -110,27 +110,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::AzToolsFramework
     )
 
-    # The ${gem_name}.Editor.Private.Object target is an internal target
-    # which is only to be used by this gems CMakeLists.txt and any subdirectories
-    # Other gems should not use this target
-    ly_add_target(
-        NAME ${gem_name}.Editor.Private.Object STATIC
-        NAMESPACE Gem
-        FILES_CMAKE
-            warehouseautomation_editor_private_files.cmake
-        TARGET_PROPERTIES
-            O3DE_PRIVATE_TARGET TRUE
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Include
-                Source
-        BUILD_DEPENDENCIES
-            PUBLIC
-                AZ::AzToolsFramework
-                Gem::PhysX.Editor.Static
-                $<TARGET_OBJECTS:Gem::${gem_name}.Private.Object>
-    )
-
     ly_add_target(
         NAME ${gem_name}.Editor GEM_MODULE
         NAMESPACE Gem
@@ -146,7 +125,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             PUBLIC
                 Gem::${gem_name}.Editor.API
             PRIVATE
-                Gem::${gem_name}.Editor.Private.Object
+                AZ::AzToolsFramework
+                ${gem_name}.Private.Object
     )
 
     # By default, we will specify that the above target ${gem_name} would be used by
@@ -199,8 +179,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     if(PAL_TRAIT_BUILD_HOST_TOOLS)
         # We are a host platform, see if Editor tests are supported on this platform
         if(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED)
-            # We support ${gem_name}.Editor.Tests on this platform, add ${gem_name}.Editor.Tests target which depends on
-            # private ${gem_name}.Editor.Private.Object target
+            # We support ${gem_name}.Editor.Tests on this platform
             ly_add_target(
                 NAME ${gem_name}.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
                 NAMESPACE Gem
@@ -214,7 +193,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 BUILD_DEPENDENCIES
                     PRIVATE
                         AZ::AzTest
-                        Gem::${gem_name}.Editor.Private.Object
+                        AZ::AzToolsFramework
+                        Gem::PhysX5.Editor.Static
             )
 
             # Add ${gem_name}.Editor.Tests to googletest

diff --git a/Gems/WarehouseAutomation/Code/Platform/Linux/PAL_linux.cmake b/Gems/WarehouseAutomation/Code/Platform/Linux/PAL_linux.cmake
@@ -4,4 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 set(PAL_TRAIT_WAREHOUSEAUTOMATION_SUPPORTED TRUE)
 set(PAL_TRAIT_WAREHOUSEAUTOMATION_TEST_SUPPORTED TRUE)
-set(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED TRUE)
+# Currently there are no tests defined for this project. Once tests are added, set the following trait to TRUE
+set(PAL_TRAIT_WAREHOUSEAUTOMATION_EDITOR_TEST_SUPPORTED FALSE)
diff --git a/Gems/WarehouseAutomation/Code/warehouseautomation_editor_private_files.cmake b/Gems/WarehouseAutomation/Code/warehouseautomation_editor_private_files.cmake
diff --git a/Gems/WarehouseAutomation/gem.json b/Gems/WarehouseAutomation/gem.json
@@ -1,6 +1,6 @@
 {
-    "version": "1.0.0",
     "gem_name": "WarehouseAutomation",
+    "version": "1.1.0",
     "display_name": "Warehouse Automation",
     "license": "Apache-2.0",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -15,18 +15,18 @@
         "WarehouseAutomation"
     ],
     "compatible_engines": [
-        "o3de-sdk>=1.2.0",
-        "o3de>=1.2.0"
+        "o3de-sdk>=4.1.0",
+        "o3de>=4.1.0"
     ],
     "platforms": [
         "Linux"
     ],
     "icon_path": "preview.png",
-    "requirements": "This gem requires ROS 2 gem and PhysX gem.",
+    "requirements": "This gem requires ROS 2 gem and PhysX5 gem.",
     "dependencies": [
-        "ROS2==3.0.0",
-        "PhysX"
+        "ROS2>=3.1.0"
     ],
-    "repo_uri": "https://github.com/o3de/o3de-extras",
-    "restricted": "WarehouseAutomation"
-}
+    "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
+    "restricted": "WarehouseAutomation",
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseautomation-1.1.0-gem.zip"
+}
diff --git a/Templates/Ros2FleetRobotTemplate/Template/Gem/${Name}_files.cmake b/Templates/Ros2FleetRobotTemplate/Template/Gem/${Name}_files.cmake
@@ -14,5 +14,4 @@ set(FILES
     Include/${Name}/${Name}Bus.h
     Source/${Name}SystemComponent.cpp
     Source/${Name}SystemComponent.h
-    enabled_gems.cmake
 )
diff --git a/Templates/Ros2FleetRobotTemplate/Template/Gem/CMakeLists.txt b/Templates/Ros2FleetRobotTemplate/Template/Gem/CMakeLists.txt
@@ -98,6 +98,3 @@ o3de_find_ancestor_project_root(project_path project_name "${CMAKE_CURRENT_SOURC
 if (NOT project_name)
     set(project_name ${Name})
 endif()
-
-# Enable the specified list of gems from GEM_FILE or GEMS list for this specific project:
-ly_enable_gems(PROJECT_NAME ${project_name} GEM_FILE enabled_gems.cmake)
diff --git a/Templates/Ros2FleetRobotTemplate/Template/Gem/enabled_gems.cmake b/Templates/Ros2FleetRobotTemplate/Template/Gem/enabled_gems.cmake
diff --git a/Templates/Ros2FleetRobotTemplate/Template/Registry/physxdebugconfiguration.setreg b/Templates/Ros2FleetRobotTemplate/Template/Registry/physxdebugconfiguration.setreg
@@ -1,7 +1,7 @@
 {
     "Amazon": {
         "Gems": {
-            "PhysX": {
+            "PhysX5": {
                 "Debug": {
                     "PhysXDebugConfiguration": {}
                 }

diff --git a/Templates/Ros2FleetRobotTemplate/Template/Registry/physxdefaultsceneconfiguration.setreg b/Templates/Ros2FleetRobotTemplate/Template/Registry/physxdefaultsceneconfiguration.setreg
@@ -1,7 +1,7 @@
 {
     "Amazon": {
         "Gems": {
-            "PhysX": {
+            "PhysX5": {
                 "DefaultSceneConfiguration": {}
             }
         }

diff --git a/Templates/Ros2FleetRobotTemplate/Template/Registry/physxsystemconfiguration.setreg b/Templates/Ros2FleetRobotTemplate/Template/Registry/physxsystemconfiguration.setreg
@@ -1,7 +1,7 @@
 {
     "Amazon": {
         "Gems": {
-            "PhysX": {
+            "PhysX5": {
                 "PhysXSystemConfiguration": {
                     "CollisionConfig": {
                         "Layers": {

diff --git a/Templates/Ros2FleetRobotTemplate/Template/cmake/EngineFinder.cmake b/Templates/Ros2FleetRobotTemplate/Template/cmake/EngineFinder.cmake
@@ -139,6 +139,10 @@ endforeach()
 
 if(O3DE_MOST_COMPATIBLE_ENGINE_PATH)
     message(STATUS "Selecting engine '${O3DE_MOST_COMPATIBLE_ENGINE_PATH}'")
+    # Make sure PACKAGE_VERSION_COMPATIBLE is set so Findo3de.cmake knows
+    # compatibility was checked
+    set(PACKAGE_VERSION_COMPATIBLE True)
+    set(PACKAGE_VERSION O3DE_MOST_COMPATIBLE_ENGINE_VERSION)
     list(APPEND CMAKE_MODULE_PATH "${O3DE_MOST_COMPATIBLE_ENGINE_PATH}/cmake")
     return()
 endif()

diff --git a/Templates/Ros2FleetRobotTemplate/Template/project.json b/Templates/Ros2FleetRobotTemplate/Template/project.json
@@ -20,8 +20,25 @@
     "restricted": "${Name}",
     "engine_version": "1.0.0",
     "gem_names": [
-        "ProteusRobot",
-        "WarehouseAssets",
-        "ROS2"
+        "Atom",
+        "CameraFramework",
+        "Compression",
+        "DebugDraw",
+        "DiffuseProbeGrid",
+        "EditorPythonBindings",
+        "EMotionFX",
+        "ImGui",
+        "LyShine",
+        "PhysX5",
+        "PrimitiveAssets",
+        "PrefabBuilder",
+        "ProteusRobot>=1.1.0",
+        "ROS2>=3.1.0",
+        "ScriptCanvasPhysics",
+        "ScriptEvents",
+        "StartingPointInput",
+        "TextureAtlas",
+        "WhiteBox",
+        "WarehouseAssets"
     ]
 }
diff --git a/Templates/Ros2FleetRobotTemplate/template.json b/Templates/Ros2FleetRobotTemplate/template.json
@@ -1,6 +1,6 @@
 {
     "template_name": "Ros2FleetRobotTemplate",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "origin": "Open 3D Engine Extras",
     "origin_url": "https://github.com/o3de/o3de-extras",
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
@@ -95,10 +95,6 @@
             "file": "Gem/Source/${Name}SystemComponent.h",
             "isTemplated": true
         },
-        {
-            "file": "Gem/enabled_gems.cmake",
-            "isTemplated": true
-        },
         {
             "file": "Gem/gem.json",
             "isTemplated": true
@@ -355,7 +351,6 @@
             "file": "Examples/ros2_ws/src/o3de_fleet_nav/rviz/nav2_namespaced_view.rviz",
             "isTemplated": false
         }
-
     ],
     "createDirectories": [
         {
@@ -494,5 +489,5 @@
             "dir": "Examples/ros2_ws/src/o3de_fleet_nav/test"
         }
     ],
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2fleetrobottemplate-1.1.0-template.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2fleetrobottemplate-1.2.0-template.zip"
 }
diff --git a/Templates/Ros2ProjectTemplate/Template/Gem/${NameLower}_files.cmake b/Templates/Ros2ProjectTemplate/Template/Gem/${NameLower}_files.cmake
@@ -12,5 +12,4 @@ set(FILES
     Source/${Name}SystemComponent.h
     Source/${Name}SampleComponent.cpp
     Source/${Name}SampleComponent.h
-    enabled_gems.cmake
 )