Samples: Improve consistency of description panel manipulation (#104)#930
Open
ghazen-ml wants to merge 5 commits intoMixedRealityToolkit:mainfrom
Open
Samples: Improve consistency of description panel manipulation (#104)#930ghazen-ml wants to merge 5 commits intoMixedRealityToolkit:mainfrom
ghazen-ml wants to merge 5 commits intoMixedRealityToolkit:mainfrom
Conversation
ghazen-ml
requested review from
a team,
AMollis,
marlenaklein-msft and
shaynie
as code owners
Contributor
Author
|
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
force-pushed
the
samples_manipulation_consistent
branch
from
a2e96e7 to
a45258b
Compare
Contributor
Author
|
(Rebased on top of latest main) |
Contributor
|
@ghazen-ml , please check on merge conflicts with XRI3 branch before completing this PR. Thank you! |
AMollis
previously approved these changes
Sep 25, 2024
Contributor
AMollis
left a comment
AMollis
left a comment
There was a problem hiding this comment.
I approve pending first making sure there aren't major merge conflicts with XRI3 branch
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. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Allow DescriptionPanel to be consistently grabbed in order to move the main scene content for that sample.
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