Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update PhysX5 references for robots related files #665

Merged
merged 5 commits into from
Feb 8, 2024

Conversation

spham-amzn
Copy link
Contributor

@spham-amzn spham-amzn commented Feb 1, 2024

What does this PR do?

This updates all the robot related project templates and gems (ROS2) to reference 'PhysX5' instead of 'PhysX' for simulation, now that both gems will be available at the same time (without the need of a cmake flag when creating the project from source). (Refer to o3de/o3de#17436 ).
Update templates that relate to ROS2 to tag version 3.1.0

How was this PR tested?

From a source build, created projects from the following templates:

  • Ros2FleetRobotTemplate
  • Ros2ProjectTemplate
  • Ros2RoboticManipulationTemplate

From the installer (SDK) build performed the same project creation workflows above

Built and launch rVIZ for each of the templates above.

RFC: o3de/sig-simulation#85

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
@spham-amzn spham-amzn requested review from a team as code owners February 1, 2024 23:35
repo.json Outdated Show resolved Hide resolved
Copy link
Contributor

@AMZN-alexpete AMZN-alexpete left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the repo.json changes will break existing older versions of the ros2 gem for anyone who has added this remote repo (not canonical). I left some comments related to how to update it. Mostly stuff like bumping gem versions, using the cli. Also, it looks like both those templates are using the older (now removed) enabled_gems.cmake file. Not sure if you want to upgrade those templates in this PR though.

  - Updated gems and template versioning info
  - Minor fixes
* Update dependencies to updated versions of gems
* Fix unnnecessary target with empty files (WarehouseAutomation.Editor.Private.Object) causing the following error:
  - CMake can not determine linker language for target: WarehouseAutomation.Editor.Private.Object
* Disable test target for the arehouse editor since there are no tests defined
* Removed 'enabled_gems.cmake'
  - Removed file from the ROS related templates and updated its EngineFinder.cmake accordingly
  - Moved dependencies to the template's project.json

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
repo.json Outdated Show resolved Hide resolved
…ompatibility

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
@spham-amzn spham-amzn merged commit 2f9a8a7 into o3de:development Feb 8, 2024
2 checks passed
adamkrawczyk pushed a commit to RobotecAI/o3de-extras that referenced this pull request Apr 10, 2024
* Update PhysX5 references for robots related files
* Update repo.json
  - Updated gems and template versioning info
  - Minor fixes
* Update dependencies to updated versions of gems
* Fix unnnecessary target with empty files (WarehouseAutomation.Editor.Private.Object) causing the following error:
  - CMake can not determine linker language for target: WarehouseAutomation.Editor.Private.Object
* Disable test target for the arehouse editor since there are no tests defined
* Removed 'enabled_gems.cmake'
  - Removed file from the ROS related templates and updated its EngineFinder.cmake accordingly
  - Moved dependencies to the template's project.json

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Apr 25, 2024
It casued compilation error on engine-centric build.
It is manually cherrypicked from PR o3de#665.

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Apr 25, 2024
It casued compilation error on engine-centric build.
It is manually cherrypicked from PR o3de#665.

Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants