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

--Articulated Object Attributes/Managers support #2178

Merged
merged 52 commits into from
Aug 16, 2023
Merged

Conversation

jturner65
Copy link
Contributor

@jturner65 jturner65 commented Aug 7, 2023

Motivation and Context

This PR adds support for articulated object configurations as Attributes, and their management via an AttributeManager, in the same way that Object Attributes, Stage Attributes, etc, are managed.

We allowed for articulated object json files already, to describe habitat-specific fields as well as certain overrides, but they were not integrated into the Metadata system and so were of limited usefulness.

This is currently a WIP. This PR is now ready to go!

The handling of configs, either loaded directly if specified with .json extension, or built on the fly if specified filename is the source URDF file, currently works, and these configs are being used explicitly during AO instantiation to reference the URDF file and build the articulated objects.

How Has This Been Tested

All existing c++ and python tests pass.

More tests will be added to test the AO Attributes and Managers' functionality directly.

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@jturner65 jturner65 requested review from aclegg3 and 0mdc August 7, 2023 20:06
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Aug 7, 2023
@jturner65 jturner65 force-pushed the AO_AttrMgr_Main branch 6 times, most recently from 0785836 to 501f3d7 Compare August 9, 2023 19:35
@jturner65 jturner65 changed the title --[WIP] Articulated Object Attributes/Managers support --Articulated Object Attributes/Managers support Aug 15, 2023
@jturner65 jturner65 marked this pull request as ready for review August 15, 2023 21:45
@jturner65
Copy link
Contributor Author

There's a couple linking errors in a few of the tests that I have to chase down, but functionally this is complete. Yay!

Copy link
Contributor

@aclegg3 aclegg3 left a comment

Choose a reason for hiding this comment

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

Thanks! Looks good overall. Noted some minor typos and small refactor requests.

src/esp/bindings/AttributesBindings.cpp Outdated Show resolved Hide resolved
src/esp/metadata/attributes/ArticulatedObjectAttributes.h Outdated Show resolved Hide resolved
src/esp/metadata/attributes/ArticulatedObjectAttributes.h Outdated Show resolved Hide resolved
src/esp/metadata/attributes/SceneInstanceAttributes.h Outdated Show resolved Hide resolved
src/esp/bindings/PhysicsWrapperManagerBindings.cpp Outdated Show resolved Hide resolved
src/esp/bindings/PhysicsWrapperManagerBindings.cpp Outdated Show resolved Hide resolved
src/esp/physics/bullet/BulletPhysicsManager.cpp Outdated Show resolved Hide resolved
src/tests/AttributesManagersTest.cpp Outdated Show resolved Hide resolved
src/tests/AttributesManagersTest.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@aclegg3 aclegg3 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@jturner65 jturner65 merged commit 3a309a5 into main Aug 16, 2023
1 check passed
@jturner65 jturner65 deleted the AO_AttrMgr_Main branch August 16, 2023 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants