Porting Samples Bulk Update #11647
Closed
Porting Samples Bulk Update #11647
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
Removed scripts from MRTK2 version which are not needed to demonstrate this functionality.
The previous material would turn black on one side depending what angle you looked at it from.
Using MRTKLineVisual and BezierDataProvider. Note that the MRTK2 version of the LineExamples sample scene had more examples because more data providers were implemented. Additionally, the MRTKLineVisual ties the lines to an Interactor, unlike the MRTK2 scripts.
…mand to reset the experience
… font size of dialog panels larger.
MRH3-15 DwellExample
- Add documentation for the eye based navigation sample
- Refactoring the visualizer sample scene - Removed InputPointerVisualizer which was unused in the sample - Removed InputPointerVisualer code from UserInputPlayback - Moved the inheritance base file logging functionality of UserInputRecorder into FileInputLogger
- Removed InputPointerVisualizer, ParticleHeatmap, and ParticleHeapmapParticleData Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com>
- Added Pause/Resume functionality - Add documentation to eye gaze visualizer classes
- Remove unreferenced function - Add documentation - Fix audio source references for object selection and deselection in Target Positioning scene - Update function visibility
- Add DisableOnStart script for dialog that needed to be disabled at runtime - Add documentation for PanZoom StatefulInteractables
- Removed creation of a subfolder in FileInputLogger - Note: MusicLibrary permission needs to be granted in PlayerSettings
- Removed duplicate EyeCalibrationChecker
…ple-Feedback MRH3-62 Eye Tracking Examples Feedback
Changing the name allowed removing "Demos" from the namespace (otherwise it conflicted with the script in the EyeTracking folder).
Had to update a number of prefabs and a scene in order to avoid using the FormerlySerializedAs attribute.
Miscellaneous feedback
shaynie
added a commit
that referenced
this pull request
Jul 18, 2023
* Add TextToSpeechExamples to MRTK3 * Code cleanup * Add SpeechInputExample for MRTK3 * Add DiagnosticsDemo profile visualizer. It requires this package https://github.com/microsoft/VisualProfiler-Unity. * Add MRTK2 Dwell example. Does not compile. * Add scene description panel prefab * Example of using dwell to press buttons Removed scripts from MRTK2 version which are not needed to demonstrate this functionality. * Add .idea/ to gitignore * Move DwellExample to Scenes folder * Move content of DwellExample closer to user start location * Change background material for DwellExample UIs The previous material would turn black on one side depending what angle you looked at it from. * Add ClippingInstancedExamples example * Example scene of bezier curve line from far interactor Using MRTKLineVisual and BezierDataProvider. Note that the MRTK2 version of the LineExamples sample scene had more examples because more data providers were implemented. Additionally, the MRTKLineVisual ties the lines to an Interactor, unlike the MRTK2 scripts. * (WIP) Created the scene and set up the toggles to disable and enable the pointers * Add TextPrefabExamples * Add SurfaceMagnetismSpatialAwarenessExample * Add ManipulationHandlerExample * Setup Hololens and VR modes, hooked up the toggles and buttons * Fixed the toggles not changing their visual state; added a speech command to reset the experience * Fixed the reticle not hiding after disabling a pointer * Tweaked seeitsayit labels; adjusted how subsystems are detected * Added a few comments * Removed unsused prefabs from the scene * Moved scene and script to different directories * Remove unused meta files. * Moved scene and script to different directories. * Moved scene to different directory * Add solverexample * Adjust the positions of dialog panels and custom tracked target. Make font size of dialog panels larger. * (WIP) Added the initial scene and scripts * Remove missing script references from CustomTrackedTarget GameObject * Added Eye Tracking Demo empty root and basic setup scenes - Ported Basic Setup from MRTK 2.8.3 - Cubes are highlighted by users gazing their eyes over each cube Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com> * Polish the Basic Setup scene - Added EyeCalibration prefab - Added ColorTap scripts to Cubes and attached to StatefulInteractable events - Added MockSpatialCursor that tracks users eye gaze movements - Changed text to MRTK dialog - Changed table visual * Migration of the TargetSelection scene * Port Eye Gaze Tracking Visualizer example from MRTK 2.8.3 to MTRK 3. * Port Eye Gaze Navigation examples from MRTK 2.8.3 to MTRK 3. Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com> * - Add example audio samples - Move EyeTracking scenes to separate folder - Added SelectEnter/SelectExit actions to BasicSetup scene * Fix typo Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com> * EyeTracking Samples Target Selection fixes - Require focus for voice activation - Add gaze dwell selection for all objects * Port TargetPositioning example from MTRK 2.8 to MRTK 3 * Feedback for TargetSelection scene - Add explode selection keyword to the gems - Disable gaze dwell selection for pink, orange, and green gems * Remove empty base eye tracking sample scenes * Move description panel back to 1 unit from camera on Z axis * Fixed description typo: Graphics Tools/Standard * Add missing text prefabs. * MRH3-13 Navigation Scene Feedback - Fix zooming with hand and pinch gestures - Removed unneeded code - Move LateUpdate method into ProcessInteractable * MRH3-13 Eye Tracking Samples - Add hand gesture movements to scene 3 (target positioning) * MRH3-13 Eye Tracking Samples - Target Positioning scene - Add event callbacks for hand grab selection gestures * MRH3-13 Eye Tracking Samples - Target Positioning scene - Fix interactions for voice events * Removed some APIs that are not present in MRTK3 anymore * Added a Gaze input section; moved the touchable logo closer to the camera * MRH-13 Eye Tracking Samples - Target Positioning - Update UWP code regions to fix UWP builds * Tweaked the positioning/size of the cube, removed remaining missing APIs * Added examples for the MRTK3 APIs; adjusted the scale/position a bit more; tweaked the description * Addressed code style issues in DisablePointers * Added HandMenu to a few scenes; made content movable in SpeechInputExamples and TextToSpeechExamples; minor code style tweaks in TextToSpeechHandler * Use DescriptionPanel prefab in DwellExample * Delete SceneDescriptionPanelRev prefab Use DescriptionPanel prefab instead. * Update backplate for buttons in DwellExample * Remove CanvasRenderers that are no longer necessary * Add HandMenu to DwellExample * Set host transform on DescriptionPanel's backplate * MRH3 Microsoft Feedback - Change namespace from Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking to Microsoft.MixedReality.Toolkit.Examples - Change variable naming to lower camel case - Rename EyeTrackingDemoUtils to EyeTrackingUtilities - Rename FaceUserEx to FaceUser - Rename TriggerZonePlaceObjsWithin to ObjectGoalZone - Expand class and variable name abbreviations - Add class summaries - Remove unreferenced functions * Renamed files and code that contained references to 'pointers' instead of 'interactors' * MRH3 Microsoft Feedback - Reserialize example scenes and prefabs - Remove FormelySerializedAs attributes * MRH3 Microsoft Feedback - Remove modified MRTK materials for the target positioning example * MRH3 Microsoft Feedback - Rename MockSpatialCursor prefab to EyeTrackingCursor - Rename TargetType prefabs to EyeTracking_Target * MRH3 Microsoft Feedback - Remove extra lights from the target selection scene - Change sound effects to MRTK3 included assets - Remove unused GlobalEvents in KeywordRecognitionHandler - Removed audio assets from MTRK 2 * MRH3 Microsoft Feedback - Change scene information text objects to use DescriptionPanel prefabs * MRH3-62 Eye Tracking Examples Feedback - Add documentation for the basic example scene scripts - Add documentation for the target selection scene scripts - Add documentation for the eye gaze visualizer scene scripts - Add missing component menus to eye tracking scene scripts - Update variable naming to lower camel case - Some refactoring of the eye gaze visualizer log classes * MRH3 Feedback - Remove Font Assets - Change TextPrefabExamples scene to use Selawk fonts from the Extended Assets package - Removed Selawk fonts from Unity project #11647 (comment) * MRH3 Feedback - Remove Font Assets - Remove Selawik font materials * MRH3 Feedback - ClippingInstance Examples - Change ObjectManipulator on DescriptionPanel to SceneContent #11647 (comment) * MRH3 Feedback - Remove LineExamples scene #11647 (comment) * - Remove SurfaceMagnetismSpatialAwarenessExample scene #11647 (comment) * MRH3 Feedback - Remove Font Assets - Remove TextMeshPro shaders #11647 (comment) * Apply font prefab overrides to prefabs * MRH3-62 Eye Tracking Examples Feedback - Add documentation for the eye based navigation sample * MRH3-62 Eye Tracking Examples Feedback - Refactoring the visualizer sample scene - Removed InputPointerVisualizer which was unused in the sample - Removed InputPointerVisualer code from UserInputPlayback - Moved the inheritance base file logging functionality of UserInputRecorder into FileInputLogger * MRH3-62 Eye Tracking Examples Feedback - Removed InputPointerVisualizer, ParticleHeatmap, and ParticleHeapmapParticleData Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com> * MRH3-62 Eye Tracking Examples Feedback - Added Pause/Resume functionality - Add documentation to eye gaze visualizer classes * - Rename EyeTrackingTarget variables to lower camel cases - Remove unreferenced function - Add documentation - Fix audio source references for object selection and deselection in Target Positioning scene - Update function visibility * - Fix properties for eye tracking targets in target selection scene - Add DisableOnStart script for dialog that needed to be disabled at runtime - Add documentation for PanZoom StatefulInteractables * - Fix UserInputPlayback in UWP - Removed creation of a subfolder in FileInputLogger - Note: MusicLibrary permission needs to be granted in PlayerSettings * Add missing meta file * Set host transform for DescriptionPanel * Make placeholder text in DwellExample more descriptive * Style: add brackets to conditionals * Remove "Demos" from namespace * Style: remove excess newlines * Use UIBackplate for placards so they don't look like clipping planes * Rename one of the KeywordRecognitionHandlers and other minor styling Changing the name allowed removing "Demos" from the namespace (otherwise it conflicted with the script in the EyeTracking folder). * Style: remove underscore from field name Had to update a number of prefabs and a scene in order to avoid using the FormerlySerializedAs attribute. * Checkpoint working on sample scenes * More example scene polish * Add description panel prefab and rename EyeTrackingTargetPositioningExample scene * Add description panel prefab and rename EyeTrackingVisualizerExample * Rename EyeTrackingTargetSelectionExample scene. Delete unnecessary dialog in EyeTrackingBasicSetupExample scene. Switch to DescriptionPanel prefabs. * Add backing panels to text in DisableInteractorsExample scene * ClippingInstancedExamples scene work * Merge SolverExamples and SolverExamples2 scenes. Clean up. * Remove the SolverExamples2 scene after merging it with SolverExamples * Resize next button, add hand menu to BoundsControlRuntimeExample * Add summary blocks to BoundsControlRuntimeExamples.cs and remove unnecessary scope braces * Make TextToSpeechExamples scene easier to use * Add text backgrounds to SpeechInputExamples scene * Remove canvasrenderer instances * Code validation fixes * Address PR feedback * Restore missing word in summary * Remove the BoundsControlRuntimeExample scene and script until #11714 is fixed. * Address more PR feedback * Add missing EyeCalibrationChecker script in prefab --------- Co-authored-by: Thai Hoa Vo <thai.hoa.vo@unity3d.com> Co-authored-by: David Rusk <david.rusk@unity3d.com> Co-authored-by: Vicky Voinova <vicky.voinova@unity3d.com> Co-authored-by: Amelia Mesdag <Amelia.Mesdag@unity3d.com>
|
@drusk-unity thank you! We've committed these changes and more with the following. |
6 tasks
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.
Overview
This is a bulk update of work that has been done porting sample scenes to MRTK3. It addresses the issues mentioned in the next section.
Changes
Priority 2
#11484
#11486
#11488
#11491
Priority 3:
#11485
#11492
#11499
#11510
#11512
#11513
#11515
#11502