Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

near pointer interactions using collision #560

Merged
merged 23 commits into from
May 14, 2020

Conversation

StephenHodgson
Copy link
Contributor

@StephenHodgson StephenHodgson commented May 3, 2020

XRTK - Mixed Reality Toolkit Change Request

Overview

Adds near interaction pointer events using a collider referenced by the pointer.

Target of the change:

Is this enhancement for:

  • Core (core framework, interfaces and definitions)

Breaking Changes:

  • MixedRealityInputSystemProfile.PointingRaycastLayerMasks -> MixedRealityInputSystemProfile.PointerRaycastLayerMasks
  • IMixedRealityFocusProvider.FocusLayerMasks -> IMixedRealityFocusProvider.GlobalPointerRaycastLayerMasks
  • IMixedRealityPointer.PrioritizedLayerMasksOverride -> IMixedRealityPointer.PointerRaycastLayerMasksOverride
  • added IMixedRealityPointer.NearInteractionCollider
  • added CollisionExtensions.IsValidCollision(this Collision collision, LayerMask[] prioritizedLayerMasks)

Submodule Changes

@StephenHodgson StephenHodgson added Enhancement New feature or request Breaking Change In Progress PR currently still being developed labels May 3, 2020
@StephenHodgson StephenHodgson linked an issue May 3, 2020 that may be closed by this pull request
2 tasks
@StephenHodgson StephenHodgson mentioned this pull request May 3, 2020
36 tasks
StephenHodgson and others added 20 commits May 3, 2020 18:48
* Update ColliderExtensions.cs

* Update CollisionExtensions.cs
…ision

# Conflicts:
#	Submodules/Oculus
#	Submodules/SDK
@StephenHodgson
Copy link
Contributor Author

@FejZa what are we missing for this again?

@FejZa
Copy link
Contributor

FejZa commented May 13, 2020

Well depends on what your intention with this branch is overall. But from my POV this branch is complete. The collision detection works and the events are firing.

Everything else I do is hands related I guess.

@StephenHodgson StephenHodgson marked this pull request as ready for review May 13, 2020 18:29
@StephenHodgson
Copy link
Contributor Author

Agreed, if we need anything else we'll just open another PR or put it in the other one you're working on

@StephenHodgson StephenHodgson requested a review from FejZa May 13, 2020 18:31
@StephenHodgson StephenHodgson added Ready for review PR finished primary development, open for review and removed In Progress PR currently still being developed labels May 13, 2020
@StephenHodgson StephenHodgson merged commit 2f786d7 into development May 14, 2020
@StephenHodgson StephenHodgson deleted the feature/pointer-near-interaction-collision branch May 14, 2020 15:01
XRTK-Build-Bot pushed a commit that referenced this pull request Dec 25, 2020
* near pointer interactions using collision

* revert

* Removed unused serialization

* updated sdk

* Feature/pni change requests (#577)

* Update ColliderExtensions.cs

* Update CollisionExtensions.cs

* updated submodules

* updated sdk

* updated sdk

Co-authored-by: Dino Fejzagic <dino.f@live.de>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Breaking Change Enhancement New feature or request Ready for review PR finished primary development, open for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Near/Far interactions with BaseControllerPointer
2 participants