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

Commit 1845d44

Browse files
StephenHodgsonStephenHodgson
authored
Camera System Refactor (#153)
* Added base camera data provider and updated references to camera system * updated camera settings * renamed default camera system profile * updated name property * updated service configurations * updated serailization * updated serailization * moved Lumin camera data provider profile to it's package * updated default camera data provider profile * updated camera data provider configurations * fixed lumin camera data provider reference * updated reference to wmr profile * Fixed the hand controller visualizations Position should be in local space * updated camera system settings * removed unused asset file * updated camera system profile serialization * Added Oculus Camera Data Provider * fixed profile runtime platform definitions
1 parent d523658 commit 1845d44

12 files changed

Lines changed: 89 additions & 14 deletions

‎DefaultProfiles/CameraSystem.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DefaultProfiles/DefaultMixedRealityCameraProfile.asset renamed to DefaultProfiles/CameraSystem/DefaultMixedRealityCameraDataProviderProfile.asset

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 50519740e1dd4b5f97f104c7dc8d6ae6, type: 3}
13-
m_Name: DefaultMixedRealityCameraProfile
12+
m_Script: {fileID: 11500000, guid: 00d813fd5a164e19a160f322b2926006, type: 3}
13+
m_Name: DefaultMixedRealityCameraDataProviderProfile
1414
m_EditorClassIdentifier:
15-
isEditable: 0
1615
isCameraPersistent: 1
1716
nearClipPlaneOpaqueDisplay: 0.1
1817
cameraClearFlagsOpaqueDisplay: 1
1918
backgroundColorOpaqueDisplay: {r: 0, g: 0, b: 0, a: 1}
20-
opaqueQualityLevel: 5
21-
nearClipPlaneTransparentDisplay: 0.1
19+
opaqueQualityLevel: 0
20+
nearClipPlaneTransparentDisplay: 0.85
2221
cameraClearFlagsTransparentDisplay: 2
2322
backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0}
2423
transparentQualityLevel: 0

‎DefaultProfiles/CameraSystem/DefaultMixedRealityCameraDataProviderProfile.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DefaultProfiles/CameraSystem/DefaultMixedRealityCameraSystemProfile.asset‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 50519740e1dd4b5f97f104c7dc8d6ae6, type: 3}
13+
m_Name: DefaultMixedRealityCameraSystemProfile
14+
m_EditorClassIdentifier:
15+
configurations:
16+
- instancedType:
17+
reference: XRTK.Providers.CameraSystem.BaseCameraDataProvider, XRTK
18+
name: Default Camera Data Provider
19+
priority: 0
20+
platformEntries:
21+
runtimePlatforms:
22+
- reference: XRTK.Definitions.Platforms.CurrentBuildTargetPlatform, XRTK
23+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
24+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
25+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
26+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
27+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
28+
profile: {fileID: 11400000, guid: c02516a14adf1ff45b2e6feaefd1d090, type: 2}
29+
- instancedType:
30+
reference: XRTK.Lumin.Providers.CameraSystem.LuminCameraDataProvider, XRTK.Lumin
31+
name: Lumin Camera Data Provider
32+
priority: 1
33+
platformEntries:
34+
runtimePlatforms:
35+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
36+
- reference: XRTK.Definitions.Platforms.CurrentBuildTargetPlatform, XRTK
37+
profile: {fileID: 11400000, guid: 10c5453922d4a744595e0415ef57dda4, type: 2}
38+
- instancedType:
39+
reference: XRTK.WindowsMixedReality.Providers.CameraSystem.WindowsMixedRealityCameraDataProvider,
40+
XRTK.WindowsMixedReality
41+
name: Windows Mixed Reality Camera Data Provider
42+
priority: 2
43+
platformEntries:
44+
runtimePlatforms:
45+
- reference: XRTK.Definitions.Platforms.CurrentBuildTargetPlatform, XRTK
46+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
47+
profile: {fileID: 11400000, guid: 57a7de86787ebb74ead8edbc180d4d14, type: 2}
48+
- instancedType:
49+
reference: XRTK.Oculus.Providers.CameraSystem.OculusCameraDataProvider, XRTK.Oculus
50+
name: Oculus Camera Data Provider
51+
priority: 3
52+
platformEntries:
53+
runtimePlatforms:
54+
- reference: XRTK.Oculus.OculusPlatform, XRTK.Oculus
55+
- reference: XRTK.Definitions.Platforms.CurrentBuildTargetPlatform, XRTK
56+
profile: {fileID: 0}
57+
globalCameraProfile: {fileID: 11400000, guid: c02516a14adf1ff45b2e6feaefd1d090,
58+
type: 2}

DefaultProfiles/DefaultMixedRealityCameraProfile.asset.meta renamed to DefaultProfiles/CameraSystem/DefaultMixedRealityCameraSystemProfile.asset.meta

File renamed without changes.

‎DefaultProfiles/DefaultMixedRealityToolkitRootProfile.asset‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ MonoBehaviour:
1515
enableCameraSystem: 1
1616
cameraSystemType:
1717
reference: XRTK.Services.CameraSystem.MixedRealityCameraSystem, XRTK
18-
cameraProfile: {fileID: 11400000, guid: 2b0ab6f5348646cebf8585d46c3a3edc, type: 2}
18+
cameraSystemProfile: {fileID: 11400000, guid: 2b0ab6f5348646cebf8585d46c3a3edc,
19+
type: 2}
1920
enableInputSystem: 1
2021
inputSystemProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
2122
inputSystemType:

‎Features/Input/GazeProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ private IMixedRealityPointer InitializeGazePointer()
384384
MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile != null &&
385385
MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab != null)
386386
{
387-
var cursor = Instantiate(MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab, MixedRealityToolkit.CameraSystem?.CameraRig.PlayspaceTransform);
387+
var cursor = Instantiate(MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab, MixedRealityToolkit.CameraSystem?.MainCameraRig.PlayspaceTransform);
388388
SetGazeCursor(cursor);
389389
}
390390

‎Features/UX/Scripts/Controllers/Hands/BaseHandControllerVisualizer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ private void UpdateHandJointTransforms(HandData handData)
113113
{
114114
var jointTransform = GetOrCreateJointTransform(handJoint);
115115
var jointPose = jointPoses[handJoint];
116-
jointTransform.position = jointPose.Position;
117-
jointTransform.rotation = jointPose.Rotation;
116+
jointTransform.localPosition = jointPose.Position;
117+
jointTransform.localRotation = jointPose.Rotation;
118118
}
119119
}
120120
}

‎Features/UX/Scripts/Controllers/Hands/HandControllerJointsVisualizer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class HandControllerJointsVisualizer : BaseHandControllerVisualizer
3131
[Tooltip("Material tint color for index fingertip.")]
3232
private Color indexFingertipColor = Color.cyan;
3333

34+
/// <inheritdoc />
3435
public override void OnInputChanged(InputEventData<HandData> eventData)
3536
{
3637
base.OnInputChanged(eventData);

‎Features/UX/Scripts/Cursors/TeleportCursor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected override void UpdateCursorTransform()
106106
transform.position = focusDetails.EndPoint;
107107

108108
var cameraTransform = MixedRealityToolkit.CameraSystem != null
109-
? MixedRealityToolkit.CameraSystem.CameraRig.CameraTransform
109+
? MixedRealityToolkit.CameraSystem.MainCameraRig.CameraTransform
110110
: CameraCache.Main.transform;
111111
var forward = cameraTransform.forward;
112112
forward.y = 0f;

0 commit comments

Comments
 (0)