diff --git a/LICENSE.md b/LICENSE.md index 8a02c57d..2d3cc744 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ MIT License Copyright (c) 2019 Microsoft Corporation -Copyright (c) 2020 XRTK +Copyright (c) 2021 XRTK Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Profiles~/Contollers/HandController/WindowsMixedRealityHandControllerDataProviderProfile.asset b/Profiles~/Contollers/HandController/WindowsMixedRealityHandControllerDataProviderProfile.asset index 28c0ea1d..f9becec0 100644 --- a/Profiles~/Contollers/HandController/WindowsMixedRealityHandControllerDataProviderProfile.asset +++ b/Profiles~/Contollers/HandController/WindowsMixedRealityHandControllerDataProviderProfile.asset @@ -16,6 +16,7 @@ MonoBehaviour: controllerMappingProfiles: - {fileID: 11400000, guid: f296956538cc1d146bc7a7ebab8505b9, type: 2} - {fileID: 11400000, guid: 3f8ea7a404a0ae14fa71a41b2ed725e3, type: 2} + gripThreshold: 0.8 renderingMode: 1 handPhysicsEnabled: 0 useTriggers: 0 diff --git a/Runtime/Providers/Controllers/WindowsMixedRealityHandControllerDataProvider.cs b/Runtime/Providers/Controllers/WindowsMixedRealityHandControllerDataProvider.cs index f8e75894..1bb849af 100644 --- a/Runtime/Providers/Controllers/WindowsMixedRealityHandControllerDataProvider.cs +++ b/Runtime/Providers/Controllers/WindowsMixedRealityHandControllerDataProvider.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using System; +using XRTK.Services; using XRTK.Attributes; using XRTK.Definitions.Platforms; using XRTK.Interfaces.InputSystem; @@ -17,7 +18,6 @@ using Windows.Perception; using Windows.UI.Input.Spatial; using XRTK.Definitions.Devices; -using XRTK.Services; using XRTK.WindowsMixedReality.Extensions; using XRTK.Definitions.Controllers.Hands; using XRTK.Definitions.Utilities; @@ -40,7 +40,13 @@ public WindowsMixedRealityHandControllerDataProvider(string name, uint priority, : base(name, priority, profile, parentService) { handDataProvider = new WindowsMixedRealityHandDataConverter(); - postProcessor = new HandDataPostProcessor(TrackedPoses) + + var globalSettingsProfile = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile; + var isGrippingThreshold = profile.GripThreshold != globalSettingsProfile.GripThreshold + ? profile.GripThreshold + : globalSettingsProfile.GripThreshold; + + postProcessor = new HandDataPostProcessor(TrackedPoses, isGrippingThreshold) { PlatformProvidesPointerPose = true }; diff --git a/package.json b/package.json index 0681c2c5..92608be9 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ "mixed", "reality" ], - "version": "0.2.1", + "version": "0.2.2", "unity": "2019.4", "license": "MIT", "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { - "com.xrtk.core": "0.2.1", + "com.xrtk.core": "0.2.3", "com.unity.xr.windowsmr.metro": "4.2.3" }, "profiles": [