Skip to content

Commit

Permalink
going through the settings
Browse files Browse the repository at this point in the history
  • Loading branch information
fwild committed Sep 3, 2024
1 parent 9d0bcc4 commit a58ad97
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Assets/MirageXR/Tutorial/ArrowHighlightingTutorialStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace MirageXR
public abstract class ArrowHighlightingTutorialStep : TutorialStep
{
protected string instructionText;
protected GameObject arrow;
protected TutorialArrow arrow;

protected Vector3? arrowPositionOffset;
protected Vector3? arrowRotationOffset;
Expand Down Expand Up @@ -52,7 +52,7 @@ protected void SetupArrow()
if (highlightedObject != null)
{
TutorialArrowFactory factory = TutorialArrowFactory.Instance();
//this.arrow = factory.CreateArrow();
this.arrow = factory.CreateArrow(TutorialArrowFactory.ArrowType.DEFAULT);
TutorialArrow arrowScript = arrow.GetComponent<TutorialArrow>();

if (arrowScript is Tutorial3DArrow)
Expand Down
14 changes: 14 additions & 0 deletions Assets/XR/Loaders/MockHMDLoader.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0660e8fc444734757ae6f6c40c2d33a0, type: 3}
m_Name: MockHMDLoader
m_EditorClassIdentifier:
8 changes: 8 additions & 0 deletions Assets/XR/Loaders/MockHMDLoader.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Assets/XR/Settings/MockHMDBuildSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c8bf066bf8a4947a1be502d267edb82f, type: 3}
m_Name: MockHMDBuildSettings
m_EditorClassIdentifier:
renderMode: 1
foveationEnabled: 0
gazeSimulationMode: 0
8 changes: 8 additions & 0 deletions Assets/XR/Settings/MockHMDBuildSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Assets/XR/Settings/Open XR Package Settings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3}
m_Name: MicrosoftHandInteraction Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Microsoft Hand Interaction Profile
version: 0.0.1
featureIdInternal: com.unity.openxr.feature.input.handtracking
Expand Down Expand Up @@ -1808,7 +1808,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3}
m_Name: HandCommonPosesInteraction Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Hand Interaction Poses
version: 0.0.1
featureIdInternal: com.unity.openxr.feature.input.handinteractionposes
Expand Down Expand Up @@ -2044,7 +2044,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3}
m_Name: MicrosoftMotionControllerProfile Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Microsoft Motion Controller Profile
version: 0.0.1
featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller
Expand Down Expand Up @@ -3004,7 +3004,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3}
m_Name: HandTrackingFeaturePlugin Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Hand Tracking
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.handtracking
Expand Down Expand Up @@ -3092,7 +3092,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
m_Name: MotionControllerFeaturePlugin Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Motion Controller Model
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.controller
Expand Down Expand Up @@ -3536,7 +3536,7 @@ MonoBehaviour:
- {fileID: 2223349053056229755}
- {fileID: -6752644166009978575}
m_renderMode: 1
m_depthSubmissionMode: 0
m_depthSubmissionMode: 1
m_optimizeBufferDiscards: 0
m_symmetricProjection: 0
--- !u!114 &4047102087758151018
Expand Down Expand Up @@ -3956,7 +3956,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3}
m_Name: EyeGazeInteraction Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Eye Gaze Interaction Profile
version: 0.0.1
featureIdInternal: com.unity.openxr.feature.input.eyetracking
Expand Down Expand Up @@ -4561,7 +4561,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3f8ec2975f18d5e479159feb34b4dc86, type: 3}
m_Name: MixedRealityFeaturePlugin Standalone
m_EditorClassIdentifier:
m_enabled: 0
m_enabled: 1
nameUi: Mixed Reality Features
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.hololens
Expand Down
3 changes: 2 additions & 1 deletion Assets/XR/Settings/OpenXR Editor Settings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Keys: 010000000e000000
Values:
- featureSets: []
- featureSets:
- com.microsoft.openxr.featureset.wmr
- featureSets: []
m_vulkanAdditionalGraphicsQueue: 0
3 changes: 2 additions & 1 deletion Assets/XR/XRGeneralSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,5 @@ MonoBehaviour:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders: []
m_Loaders:
- {fileID: 11400000, guid: c73c5a5c556b15941bedcb9cf431f61a, type: 2}
1 change: 1 addition & 0 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"com.unity.xr.arfoundation": "5.0.7",
"com.unity.xr.arkit": "5.0.7",
"com.unity.xr.management": "4.4.1",
"com.unity.xr.mock-hmd": "1.4.0-preview.2",
"com.unity.xr.oculus": "4.0.0",
"com.unity.xr.openxr": "1.10.0",
"com.utilities.async": "https://github.com/RageAgainstThePixel/com.utilities.async.git#upm",
Expand Down
9 changes: 9 additions & 0 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,15 @@
},
"url": "https://packages.unity.com"
},
"com.unity.xr.mock-hmd": {
"version": "1.4.0-preview.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.oculus": {
"version": "4.0.0",
"depth": 0,
Expand Down
2 changes: 2 additions & 0 deletions ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ EditorBuildSettings:
type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: b3a3cc9ae17858f4a9346913737e2188,
type: 2}
xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: a148c5c03c6464fcf9211037664a662a,
type: 2}
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ PlayerSettings:
defaultScreenHeight: 768
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_StereoRenderingPath: 1
m_ActiveColorSpace: 0
m_SpriteBatchVertexThreshold: 300
m_MTRendering: 1
Expand Down

0 comments on commit a58ad97

Please sign in to comment.