diff --git a/Controllers/OculusControllerDataProvider.cs b/Controllers/OculusControllerDataProvider.cs index dde2c32..1d9a02f 100644 --- a/Controllers/OculusControllerDataProvider.cs +++ b/Controllers/OculusControllerDataProvider.cs @@ -31,17 +31,6 @@ public OculusControllerDataProvider(string name, uint priority, BaseMixedReality private float deviceRefreshTimer; private OculusApi.Controller lastDeviceList; - /// - public override void Initialize() - { - base.Initialize(); - - if (MixedRealityToolkit.CameraSystem != null) - { - MixedRealityToolkit.CameraSystem.HeadHeight = OculusApi.EyeHeight; - } - } - /// public override void Update() { diff --git a/Controllers/OculusHandControllerDataProvider.cs b/Controllers/OculusHandControllerDataProvider.cs index 1526d76..f93aa7a 100644 --- a/Controllers/OculusHandControllerDataProvider.cs +++ b/Controllers/OculusHandControllerDataProvider.cs @@ -31,17 +31,12 @@ public OculusHandControllerDataProvider(string name, uint priority, OculusHandCo /// /// The minimum required tracking confidence for hands to be registered. /// - public OculusApi.TrackingConfidence MinConfidenceRequired { get; } = OculusApi.TrackingConfidence.Low; + public OculusApi.TrackingConfidence MinConfidenceRequired { get; } /// - public override void Initialize() + public override void Enable() { - base.Initialize(); - - if (MixedRealityToolkit.CameraSystem != null) - { - MixedRealityToolkit.CameraSystem.HeadHeight = OculusApi.EyeHeight; - } + base.Enable(); OculusHandDataConverter.HandMeshingEnabled = HandMeshingEnabled; } diff --git a/Runtime/OculusPlatform.cs.meta b/Runtime/OculusPlatform.cs.meta index b9f7dfb..36b3d8e 100644 --- a/Runtime/OculusPlatform.cs.meta +++ b/Runtime/OculusPlatform.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Providers.meta b/Runtime/Providers.meta new file mode 100644 index 0000000..6c57f8f --- /dev/null +++ b/Runtime/Providers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b2b124285c4ed641bb7f8ff50265b16 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Providers/OculusCameraDataProvider.cs b/Runtime/Providers/OculusCameraDataProvider.cs new file mode 100644 index 0000000..2e7a77d --- /dev/null +++ b/Runtime/Providers/OculusCameraDataProvider.cs @@ -0,0 +1,26 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using XRTK.Definitions.CameraSystem; +using XRTK.Interfaces.CameraSystem; +using XRTK.Providers.CameraSystem; + +namespace XRTK.Oculus.Providers.CameraSystem +{ + public class OculusCameraDataProvider : BaseCameraDataProvider + { + /// + public OculusCameraDataProvider(string name, uint priority, BaseMixedRealityCameraDataProviderProfile profile, IMixedRealityCameraSystem parentService) + : base(name, priority, profile, parentService) + { + } + + /// + protected override void ApplySettingsForDefaultHeadHeight() + { + HeadHeight = OculusApi.EyeHeight; + ResetRigTransforms(); + SyncRigTransforms(); + } + } +} diff --git a/Runtime/Providers/OculusCameraDataProvider.cs.meta b/Runtime/Providers/OculusCameraDataProvider.cs.meta new file mode 100644 index 0000000..89003db --- /dev/null +++ b/Runtime/Providers/OculusCameraDataProvider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7653e967924f2e045a21d8596dc0f7c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: