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
Add the concept of global settings to the SdfAssetBuilder #457
Merged
mbalfour-amzn
merged 10 commits into
o3de:development
from
aws-lumberyard-dev:mbalfour/asset_builder_global_settings
Aug 11, 2023
Merged
Add the concept of global settings to the SdfAssetBuilder #457
mbalfour-amzn
merged 10 commits into
o3de:development
from
aws-lumberyard-dev:mbalfour/asset_builder_global_settings
Aug 11, 2023
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
Changing the setting will cause all affected assets to reprocess. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
lemonade-dm
reviewed
Aug 10, 2023
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h
Outdated
Show resolved
Hide resolved
lemonade-dm
reviewed
Aug 10, 2023
lemonade-dm
reviewed
Aug 10, 2023
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp
Outdated
Show resolved
Hide resolved
spham-amzn
reviewed
Aug 10, 2023
spham-amzn
reviewed
Aug 10, 2023
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp
Outdated
Show resolved
Hide resolved
lemonade-dm
reviewed
Aug 10, 2023
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp
Outdated
Show resolved
Hide resolved
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Make LoadSettings take in a settings registry. Move the AP settings into the scene setreg file for better settings locality. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
lemonade-dm
reviewed
Aug 10, 2023
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h
Outdated
Show resolved
Hide resolved
lemonade-dm
approved these changes
Aug 10, 2023
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
spham-amzn
approved these changes
Aug 10, 2023
arturkamieniecki
pushed a commit
to RobotecAI/o3de-extras
that referenced
this pull request
Aug 18, 2023
* Add global settings for "UseArticulations". Changing the setting will cause all affected assets to reprocess. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Enable support for dae and obj files when the ROS2 Gem is enabled. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Update Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Update Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Update Gems/ROS2/Registry/sceneassetimporter.setreg Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Update Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * PR feedback. Make LoadSettings take in a settings registry. Move the AP settings into the scene setreg file for better settings locality. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Update Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * PR feedback - make global settings registry the default. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --------- Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
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.
This PR changes the SdfAssetBuilder to read in global builder settings from a setreg file to apply as the defaults when building all assets. Changes to the settings in the setreg file will cause all affected assets to rebuild the next time the AP is run. Currently, the only global setting that exists is "UseArticulations", but other settings can be added easily.
The mechanism used for rebuilding the assets is the builder "fingerprint". Any time the fingerprint changes, the builder will rebuild all of its assets. The global settings are read in from the setreg file and then serialized back out into a JSON string that is used as the fingerprint. Changes to the settings changes the fingerprint string, which triggers the rebuild.
This PR also has a separate change to the ROS2 Gem to enable .dae and .obj files in the Scene Builder by default. These are common file types for robotics, so we want the scene builder to attempt to convert them. Note that enabling them also requires a change to the AssetProcessor settings to list the .assetinfo files for those new types - that setting is used to ensure that the asset reprocesses whenever its .assetinfo file changes.