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.

Sign up for GitHub

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

Jump to bottom

HITL: Make skinning support optional. #1791

Merged
merged 5 commits into from
Feb 21, 2024
Merged

HITL: Make skinning support optional. #1791

merged 5 commits into from
Feb 21, 2024

Conversation

0mdc
Copy link
Contributor

@0mdc 0mdc commented Feb 5, 2024 •
edited
Loading

Motivation and Context

This changeset makes skinning transmission optional.

  • If self._hitl_config.networking.active_features.skinning is disabled, rig keyframe data is removed before transmission.
  • Otherwise, rig keyframe data is consolidated along with other data.

See: 0mdc/siro_hitl_unity_client#4

How Has This Been Tested

Tested locally along with the Unity app.

Types of changes

  • [Development]

Checklist

  • My code follows the code style of this project.
  • I have updated the documentation if required.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes if required.

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Feb 5, 2024
@0mdc 0mdc mentioned this pull request Feb 5, 2024
Closed
henrysamer
henrysamer approved these changes Feb 6, 2024
View reviewed changes
Copy link
Contributor

@henrysamer henrysamer left a comment

Choose a reason for hiding this comment

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

Tested locally, looks good!
Note: Might need to perform another pre-commit before before adding/committing to ensure ci test passes.

@0mdc 0mdc changed the title HITL: Send skinning keyframe data to client. HITL: Make skinning support optional. Feb 17, 2024
@0mdc 0mdc requested a review from aclegg3 February 17, 2024 19:30
@0mdc 0mdc marked this pull request as ready for review February 17, 2024 19:32
@0mdc 0mdc mentioned this pull request Feb 17, 2024
Merged
eundersander
eundersander approved these changes Feb 20, 2024
View reviewed changes
Copy link
Contributor

@eundersander eundersander left a comment

Choose a reason for hiding this comment

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

I left some comments, otherwise LGTM

habitat-hitl/habitat_hitl/config/hitl_defaults.yaml Outdated Show resolved Hide resolved
examples/hitl/pick_throw_vr/config/pick_throw_vr.yaml Show resolved Hide resolved
habitat-hitl/habitat_hitl/_internal/networking/keyframe_utils.py Outdated Show resolved Hide resolved
eundersander
eundersander reviewed Feb 20, 2024
View reviewed changes
Copy link
Contributor

@eundersander eundersander left a comment

Choose a reason for hiding this comment

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

For the case that skinning is disabled, are you doing anything to prevent this code from running on the client? https://github.com/0mdc/siro_hitl_unity_client/pull/4/files#diff-f071a636013728b2ff66c2068fe1e9cee3afc61b5af1534a2b6278794e8db51cR281

@0mdc
Copy link
Contributor Author

0mdc commented Feb 21, 2024

@eundersander

For the case that skinning is disabled, are you doing anything to prevent this code from running on the client?

Yes.

Skinned meshes with a creationInfo.rigId != ID_UNDEFINED will automatically get the GfxReplaySkinnedMesh component. However, it is inactive until a matching and valid RigCreation keyframe is received.

@0mdc 0mdc merged commit 9ecdc82 into main Feb 21, 2024
3 of 4 checks passed
@0mdc 0mdc deleted the hitl-skinning-replay branch February 21, 2024 19:06
henrysamer pushed a commit that referenced this pull request Feb 21, 2024
@0mdc @henrysamer
HITL: Make skinning support optional. (#1791)
fdcb131 
* Pass skinning keyframe data to the client.

* Add configuration to activate or deactivate skinning.

* Formatting fix.

* Add checks for rig removal from keyframes.

* Refactoring. Remove conditional consolidation of rigs.
dannymcy pushed a commit to dannymcy/habitat-lab that referenced this pull request Jul 8, 2024
@0mdc
HITL: Make skinning support optional. (facebookresearch#1791)
162491a 
* Pass skinning keyframe data to the client.

* Add configuration to activate or deactivate skinning.

* Formatting fix.

* Add checks for rig removal from keyframes.

* Refactoring. Remove conditional consolidation of rigs.
HHYHRHY pushed a commit to SgtVincent/habitat-lab that referenced this pull request Aug 31, 2024
@0mdc
HITL: Make skinning support optional. (facebookresearch#1791)
137e440 
* Pass skinning keyframe data to the client.

* Add configuration to activate or deactivate skinning.

* Formatting fix.

* Add checks for rig removal from keyframes.

* Refactoring. Remove conditional consolidation of rigs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eundersander eundersander eundersander approved these changes

@henrysamer henrysamer henrysamer approved these changes

@aclegg3 aclegg3 Awaiting requested review from aclegg3

Assignees
No one assigned
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@0mdc @eundersander @henrysamer @facebook-github-bot