Skip to content

Commit 7bfc823

Browse files
authored
Fixing Oculus Deployment Issue, whitespace error (#10584)
* Fixing Oculus Deployment Issue, whitespace error * fixing whitespace in the other direction * Oculus documentation fixes
1 parent e9fb7f9 commit 7bfc823

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Editor/OculusXRSDKHandtrackingConfigurationChecker.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ internal static void ReconcileOculusIntegrationDefine(bool oculusIntegrationPres
211211
}
212212

213213
/// <summary>
214-
/// Adds warnings to the nowarn line in the csc.rsp file located at the root of assets. Warning 414, 618 and 649 are added to the nowarn line because if
214+
/// Adds warnings to the nowarn line in the csc.rsp file located at the root of assets. Warning 618 is added to the nowarn line because if
215215
/// the MRTK source is from the repo, warnings are converted to errors. Warnings are not converted to errors if the MRTK source is from the unity packages.
216-
/// Warning 414, 618 and 649 are logged when Oculus Integration is imported into the project, 414 is an unsued variable warning,
217-
/// 618 is the obsolete warning and 649 is a null on start warning.
216+
/// Warning 618 is logged when building the project as of Oculus Integration 39.0 https://developer.oculus.com/downloads/package/unity-integration/39.0
217+
/// 618 is the obsolete property/function warning
218218
/// </summary>
219219
static void UpdateCSC()
220220
{
@@ -228,9 +228,9 @@ static void UpdateCSC()
228228
List<string> warningNumbers = new List<string>();
229229

230230
// List of new warning numbers to add to the csc file
231-
// Empty as of Oculus Integration 39.0 https://developer.oculus.com/downloads/package/unity-integration/39.0
232231
List<string> warningNumbersToAdd = new List<string>()
233232
{
233+
"618"
234234
};
235235

236236
if (!File.Exists(cscFilePath))

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public override void Initialize()
5151
#if !UNITY_2020_1_OR_NEWER
5252
UnityEngine.Debug.Log(@"Detected a potential deployment issue for the Oculus Quest. In order to use hand tracking with the Oculus Quest, download the Oculus Integration Package from the Unity Asset Store and run the Integration tool before deploying.
5353
The tool can be found under <i>Mixed Reality > Toolkit > Utilities > Oculus > Integrate Oculus Integration Unity Modules</i>");
54-
// Add a note about abandoning Oculus XRSDK if on 2020+, use open xr instead please
5554
#endif
5655
}
5756
#endif

Assets/MRTK/SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public virtual void Reset()
508508
IsFocusLocked = false;
509509
}
510510

511-
#endregion IMixedRealityPointer Implementation
511+
#endregion IMixedRealityPointer Implementation
512512

513513
#region IEquality Implementation
514514

@@ -556,7 +556,7 @@ public override int GetHashCode()
556556
}
557557
}
558558

559-
#endregion IEquality Implementation
559+
#endregion IEquality Implementation
560560

561561
#region IMixedRealitySourcePoseHandler Implementation
562562

@@ -592,7 +592,7 @@ public override void OnSourceLost(SourceStateEventData eventData)
592592
}
593593
}
594594

595-
#endregion IMixedRealitySourcePoseHandler Implementation
595+
#endregion IMixedRealitySourcePoseHandler Implementation
596596

597597
#region IMixedRealityInputHandler Implementation
598598

@@ -679,6 +679,6 @@ public override void OnInputDown(InputEventData eventData)
679679
}
680680
}
681681

682-
#endregion IMixedRealityInputHandler Implementation
682+
#endregion IMixedRealityInputHandler Implementation
683683
}
684684
}

0 commit comments

Comments
 (0)