Cherry-picks development -> stabilization #745
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jhanca-robotecai
changed the title
jhanca-robotecai
force-pushed
the
jh/cherries_from_dev
branch
from
fcce637
to
1018d2a
Compare
Signed-off-by: Jan Hanca <[email protected]>
* Update ROS2 Related prefabs Signed-off-by: Mateusz Wasilewski <[email protected]>
…plate (o3de#700) Signed-off-by: Steve Pham <[email protected]>
* Update engine version in ROS2 Gem * Update ROS2 gem.json links * Update Proteus, RosRobotSample and WarehouseAutomation o3de version --------- Signed-off-by: Jan Hanca <[email protected]>
…ervice (o3de#704) * Added option to spawn entities with WGS84 coords using existing ros service * Added field to enable/disable support for spawning entities using WGS84 --------- Signed-off-by: Patryk Antosz <[email protected]>
Signed-off-by: Michał Pełka <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
* Modified clock design, added new time source * Added one clock class with different time sources * Added ROS 2 time source * Added options to Registry to choose time source and enable/disable time publishing * updated documentation --------- Signed-off-by: Patryk Antosz <[email protected]> Co-authored-by: Michał Pełka <[email protected]> Co-authored-by: Steve Pham <[email protected]>
- Add and tested `SensorConfigurationRequestBus` - Added helper functions to discover ROS 2 Sensors in runtime - Moved ROS 2 Sensors types to `ROS2SensorTypesIds.h` Signed-off-by: Michał Pełka <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Paulina Kubera <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Paulina Kubera <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
directly on XR Swapchain Attachments by adding
XR_SWAPCHAIN_USAGE_TRANSFER_DST_BIT usage flag
to the XrSwapchainCreateInfo.
Also, matched Swapchain attachment usage flags
as done by Atom Vulkan library in
/o3de/Gems/Atom/RHI/VulkanCode\Source\RHI\SwapChain.cpp
```cpp
createInfo.imageUsage = VK_IMAGE_USAGE_TRANSFER_DST_BIT |
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT |
VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
```
The whole XR Swapchain creation usage flags changed from:
```cpp
swapchainCreateInfo.usageFlags = XR_SWAPCHAIN_USAGE_SAMPLED_BIT |
XR_SWAPCHAIN_USAGE_COLOR_ATTACHMENT_BIT;
```
to:
```cpp
swapchainCreateInfo.usageFlags = XR_SWAPCHAIN_USAGE_SAMPLED_BIT |
XR_SWAPCHAIN_USAGE_COLOR_ATTACHMENT_BIT |
XR_SWAPCHAIN_USAGE_TRANSFER_SRC_BIT |
XR_SWAPCHAIN_USAGE_TRANSFER_DST_BIT |
XR_SWAPCHAIN_USAGE_INPUT_ATTACHMENT_BIT_KHR;
```
The changes, in addition to enabling direct MSAA Resolve into the
Swapchain, also enables the usage of Swapchain attachments as inputs of
Vulkan subpasses.
Signed-off-by: galibzon <[email protected]>
Signed-off-by: Michał Pełka <[email protected]> Co-authored-by: Jan Hanca <[email protected]>
Signed-off-by: Paulina Kubera <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Paulina Kubera <[email protected]> Co-authored-by: Steve Pham <[email protected]>
Signed-off-by: Jan Hanca <[email protected]>
* Fix ROSBot prefab: wheelbase and track * Fix project.json in templates * Bump RosRobotSample patch version Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Kacper Dąbrowski <[email protected]> Co-authored-by: Kacper Dąbrowski <[email protected]>
…ints (o3de#734) Signed-off-by: Paulina Kubera <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Co-authored-by: Adam Dabrowski <[email protected]>
jhanca-robotecai
force-pushed
the
jh/cherries_from_dev
branch
from
1018d2a
to
6673693
Compare
|
I had to force-push to fix DCO, it should be fine now. |
adamdbrw
approved these changes
Aug 13, 2024
byrcolin
added
the
sig/platform
michalpelka
approved these changes
Aug 20, 2024
arturkamieniecki
approved these changes
Aug 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The development in the
o3de-extrasrepository did not follow the agreement made foro3de, in which all code had been targetting thestabilizationbranch. Therefore, the vast majority of the fixes and features that were implemented after the split are not available in thestabilizationbranch. This PR cherry-picks the commits from thedevelopmentbranch.The list of PRs that were cherry-picked from
developmenttostabilization:assetHintto match O3DE >=2310)The list of PRs that were NOT cherry-picked from
developmenttostabilization:I am aware some features were cherry-picked alongside bug fixes, but there is enough time to fix any issues that can be brought up with this PR before the release.
We use #704, #707, #714, #726, and #738 extensively in projects for our clients; we believe this part is well-tested by us.
#720, #733, and #726 are very small changes that should not bring any issues. The only large PR, #734, implements the features for Robot Importer that were recently discussed on Discord and that are valuable for the community, hence worth adding to the scope of this PR. Any problems in this code might result in importing the robot incorrectly (instead of skipping some parts of the import), but should not result in any crash.
How was this PR tested?
A sample project was built and run with no issues; diff between this branch and the
developmentbranch was analyzed.