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

Disable pointers from code #5920

Merged
merged 54 commits into from
Sep 12, 2019
Merged

Disable pointers from code #5920

merged 54 commits into from
Sep 12, 2019

Commits on Sep 6, 2019

  1. first version of the api, prototype basically

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    0a68ac2 View commit details
    Browse the repository at this point in the history

  2. SetHandRay in utils, move to focus provider

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    188c528 View commit details
    Browse the repository at this point in the history

  3. Hook up rest of pointer types, demo is working to toggle all types

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    fef7e97 View commit details
    Browse the repository at this point in the history

  4. Ensure that gaze pointer turns off in HL1 when we set the pointer off.

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    95d8531 View commit details
    Browse the repository at this point in the history

  5. Rename PointerBehaviors

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    3b66ef6 View commit details
    Browse the repository at this point in the history

  6. Set pointer behavior by type instead of hard coded bools

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    eb686a0 View commit details
    Browse the repository at this point in the history

  7. Missing commit from previous

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    c944582 View commit details
    Browse the repository at this point in the history

  8. Turn off poke pointer visual when poke pointer is not enabled.

    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    e814149 View commit details
    Browse the repository at this point in the history

  9. Functions that enable grabbing custom behavior state, to get my toggl… 

    …e buttons to show up
    Julia Schwarz committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    fc50a66 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Add example for turning pointers on and off

    Julia Schwarz committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    21330b4 View commit details
    Browse the repository at this point in the history

  2. fix rays shooting through when grabbing cube

    Julia Schwarz committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    a236c8a View commit details
    Browse the repository at this point in the history

  3. Comments

    Julia Schwarz committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    510cab1 View commit details
    Browse the repository at this point in the history

  4. Documentation and related fixes 

    * rename to TurnPointersOnOff
* move TurnPointersOnOff to namespace
    Julia Schwarz committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    b4c1501 View commit details
    Browse the repository at this point in the history

  5. Tests, not passing yet.

    Julia Schwarz committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    11573b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Add tests for hand ray turn on / off

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    08f228e View commit details
    Browse the repository at this point in the history

  2. Code cleanup

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0ab9ae1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/mrtk_development' into issue/4… 

    …954_enabledisablepointers
    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    e025783 View commit details
    Browse the repository at this point in the history

  4. Make hololens 1, hololens 2 text bigger

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    32a1083 View commit details
    Browse the repository at this point in the history

  5. Tests for grab, poke

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    75de4b3 View commit details
    Browse the repository at this point in the history

  6. Layout adjustements on the button panel

    @cre8ivepark
    cre8ivepark committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    9f400c3 View commit details
    Browse the repository at this point in the history

  7. Fix bug: no pointer was showing up when articulated hand mode was GGV

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0a25a09 View commit details
    Browse the repository at this point in the history

  8. Fix ggv right getting disabled when hand is near grabbable by applyin… 

    …g custom behaviors before focused, near / far.
    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    3b383e7 View commit details
    Browse the repository at this point in the history

  9. Rename assets, remove pointerdebug

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    076f895 View commit details
    Browse the repository at this point in the history

  10. Voice command to reset demo

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    b3802b1 View commit details
    Browse the repository at this point in the history

  11. Use object references for toggles, not searching for strings. Fixs co… 

    …uple bugs found from example, add IsToggle in Interactable.
    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    dc777f0 View commit details
    Browse the repository at this point in the history

  12. Simplify ApplyCustomerPointerBehaviors, fix tests

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    602be35 View commit details
    Browse the repository at this point in the history

  13. Rename to AlwaysOff, AlwaysOn, Default

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    521df0b View commit details
    Browse the repository at this point in the history

  14. Rename example to DisablePointers

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0b9ea79 View commit details
    Browse the repository at this point in the history

  15. CR comments from troy (mostly cleanup)

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    79aa6ae View commit details
    Browse the repository at this point in the history

  16. Update sample code to match enum

    Julia Schwarz committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    d93b8f8 View commit details
    Browse the repository at this point in the history

  17. Update Documentation/Architecture/InputSystem/ControllersPointersAndF… 

    …ocus.md

Co-Authored-By: Will <wiwei@microsoft.com>
    @wiwei
    Julia Schwarz and wiwei committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    372ae2a View commit details
    Browse the repository at this point in the history

  18. Update Documentation/Architecture/InputSystem/ControllersPointersAndF… 

    …ocus.md

Co-Authored-By: Will <wiwei@microsoft.com>
    @wiwei
    Julia Schwarz and wiwei committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    10c22fe View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. CR comments from will re: docs, comments

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    e5d17da View commit details
    Browse the repository at this point in the history

  2. WIP moving to 'IPointerPreferences' interface

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    4ffd4fd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'issue/4954_enabledisablepointers' of https://github.com… 

    …/julenka/MixedRealityToolkit-Unity into issue/4954_enabledisablepointers
    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    66d2494 View commit details
    Browse the repository at this point in the history

  4. fix incorrect isassignablefrom param order

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    e5d96d9 View commit details
    Browse the repository at this point in the history

  5. Fix tabs

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    2df3ddf View commit details
    Browse the repository at this point in the history

  6. Fix setting of gaze pointer to set both ggv and gaze pointer. Tests p… 

    …ass!
    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    5dfee70 View commit details
    Browse the repository at this point in the history

  7. Troy documentation comments

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    d13ee04 View commit details
    Browse the repository at this point in the history

  8. Add util to set pointer behavior for all input types

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    ae8c0a6 View commit details
    Browse the repository at this point in the history

  9. Split OpenVR and Windows MR

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    b2069cc View commit details
    Browse the repository at this point in the history

  10. doccomments

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    2c6dcc9 View commit details
    Browse the repository at this point in the history

  11. Add separate hand, motion controller rays

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    c8e2be5 View commit details
    Browse the repository at this point in the history

  12. Add 'watch' buttons to disable / enable right and left hand rays

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    7ed4a0e View commit details
    Browse the repository at this point in the history

  13. Cleanup before preparing for another reviews

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    eb2c810 View commit details
    Browse the repository at this point in the history

  14. Remove the buttons that go on wrist to disable pointers by handedness… 

    … -- they caused hands to overlap, weren't working so well.
    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    78fe665 View commit details
    Browse the repository at this point in the history

  15. Fix incorrect references

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    bba73d2 View commit details
    Browse the repository at this point in the history

  16. fix empty doccomments

    Julia Schwarz committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    56dbcc2 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Will CR comments

    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    5b7d8de View commit details
    Browse the repository at this point in the history

  2. Ensure that instantiating custom mediators is back compatible by supp… 

    …orting constructor with no args.
    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    631d7b1 View commit details
    Browse the repository at this point in the history

  3. CR comments from will

    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    3b8d5d3 View commit details
    Browse the repository at this point in the history

  4. docs fix

    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    2f62a62 View commit details
    Browse the repository at this point in the history

  5. Use try / catch when constructing mediator

    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    fc7e25d View commit details
    Browse the repository at this point in the history

  6. IsToggle => IsToggleButton

    Julia Schwarz committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    11832be View commit details
    Browse the repository at this point in the history