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

Samples: Improve consistency of description panel manipulation (#104) #930

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

ghazen-ml
Copy link
Contributor

@ghazen-ml ghazen-ml commented Sep 24, 2024

  • Allow DescriptionPanel to be consistently grabbed in order to move the main scene content for that sample.

    • Update the DescriptionPanel prefab to include ObjectManipulator, UGUIInputAdapterDraggable, ConstraintManager and a BoxCollider.
  • Update all scenes that reference DescriptionPanel to remove component duplication.

  • Reference the parent "MixedRealitySceneContent" game object as the host transform when DescriptionPanels are moved.

  • Removed some inconsistencies around game objects named "MixedRealitySceneContent", "SceneContent", "Content", "Examples", "Scene Content" to all be "MixedRealitySceneContent".

  • Add a rotation constraint to LegacyConstraintExamples scene content such that the content is always gravity aligned even after being moved via the description panel.

Fixes #104

@ghazen-ml
Copy link
Contributor Author

ghazen-ml commented Sep 24, 2024

Fixes #104

I tried all affected scenes in Editor and on a Magic Leap 2 device

…RealityToolkit#104)

* Allow DescriptionPanel to be consistently grabbed in order to move
  the main scene content for that sample.

  - Update the DescriptionPanel prefab to include ObjectManipulator,
    UGUIInputAdapterDraggable, ConstraintManager and a BoxCollider.

* Update all scenes that reference DescriptionPanel to remove
  component duplication.

* Reference the parent "MixedRealitySceneContent" game object as the
  host transform when DescriptionPanels are moved.

* Removed some inconsistencies around game objects named
  "MixedRealitySceneContent", "SceneContent", "Content", "Examples",
  "Scene Content" to all be "MixedRealitySceneContent".

* Add a rotation constraint to LegacyConstraintExamples scene content
  such that the content is always gravity aligned even after being
  moved via the description panel.
@ghazen-ml ghazen-ml force-pushed the samples_manipulation_consistent branch from a2e96e7 to a45258b Compare September 24, 2024 18:53
@ghazen-ml
Copy link
Contributor Author

(Rebased on top of latest main)

@AMollis
Copy link
Contributor

AMollis commented Sep 25, 2024

@ghazen-ml , please check on merge conflicts with XRI3 branch before completing this PR. Thank you!

Copy link
Contributor

@AMollis AMollis left a comment

Choose a reason for hiding this comment

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

I approve pending first making sure there aren't major merge conflicts with XRI3 branch

@ghazen-ml
Copy link
Contributor Author

Unfortunately there do appear to be conflicts in each modified scene file. One option could be to instead make this change on the XRI3 branch and leave it there, or I could resolve the merge conflicts by re-applying the changes to each scene semi-manually.

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.

Fix Example scenes - Cannot move some scene description panels
3 participants