diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Demos/ExampleUsage.cs b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Demos/ExampleUsage.cs index 4babfe63..88844712 100644 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Demos/ExampleUsage.cs +++ b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Demos/ExampleUsage.cs @@ -1,10 +1,8 @@ -using Unity.VisualScripting; using UnityEngine; //include the namespace so we can access accessory tracking using Apple.visionOS.AccessoryTracking; using Apple.visionOS.SpatialController; using UnityEngine.Events; -using UnityEditor; using System.Text; public class ExampleUsage : MonoBehaviour diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/AccessoryTrackingHelper.cs b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/AccessoryTrackingHelper.cs index 798acf6b..f22b486f 100644 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/AccessoryTrackingHelper.cs +++ b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/AccessoryTrackingHelper.cs @@ -1,17 +1,12 @@ using UnityEngine; -using Unity.Mathematics; -using System; using AOT; using System.Collections.Generic; using UnityEngine.Events; -using Unity.VisualScripting; -using UnityEngine.UI; using TMPro; namespace Apple.visionOS.AccessoryTracking { using SpatialController; - using Unity.PolySpatial; public class AccessoryTrackingHelper : MonoBehaviour { @@ -50,13 +45,9 @@ public enum LocationOption { origin, aim, grip, gripSurface }; [SerializeField] private LocationOption RightLocation = LocationOption.origin; public TMP_Text RightControllerText; - [Header("Controller Events")] public UnityEvent ControllerConnectedEvent; public UnityEvent ControllerDisconnectedEvent; - - [Header("A Reference To The Volume Camera")] - public GameObject _volumeCamera; /// /// An array of accessories that have been polled @@ -119,27 +110,6 @@ void Awake() worldOriginAxis.transform.position = new Vector3(0, 0, 0); } - /// find the Volume Camera in the scene - _volumeCamera = GameObject.Find("VolumeCamera"); - //confirm the volume camera object we found is not null - if (_volumeCamera != null) - { - //confirm we have the correct object and script - var volumeCameraScript = GetComponent(); - if (volumeCameraScript != null) - { - //find a reference to the volume camera so we can make sure we aren't in bounded - //bounded is not supported at this moment - if (volumeCameraScript.WindowConfiguration.Mode == VolumeCamera.PolySpatialVolumeCameraMode.Bounded) - { - Debug.LogWarning("Apple - Accessory Tracking Plugin does not support Bounded: " + volumeCameraScript.WindowConfiguration.Mode.ToString()); - } - } - else - { - Debug.LogWarning("Apple - Accessory Tracking Plugin unable to determine what mode app is in. Bounded not supported."); - } - } } void OnDisable() diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/apple.accessorytracking.asmdef b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/apple.accessorytracking.asmdef index dcc2582b..9d0324a1 100644 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/apple.accessorytracking.asmdef +++ b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/Apple/Scripts/apple.accessorytracking.asmdef @@ -4,8 +4,6 @@ "references": [ "Apple.Core", "Unity.Mathematics", - "Unity.VisualScripting", - "Unity.PolySpatial", "Unity.TextMeshPro" ], "includePlatforms": [ diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/package.json b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/package.json index 353e1979..11c3dc64 100644 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/package.json +++ b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/Apple.SpatialController/package.json @@ -24,9 +24,6 @@ }, "dependencies": { "com.apple.unityplugin.core": "3.1.8", - "com.unity.polyspatial": "2.3.1", - "com.unity.polyspatial.xr": "2.3.1", - "com.unity.xr.arfoundation": "6.1.1", "com.unity.xr.visionos": "2.3.1", "com.unity.mathematics": "1.3.2", "com.unity.textmeshpro": "5.0.0" diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset deleted file mode 100644 index 12e75008..00000000 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset +++ /dev/null @@ -1,69 +0,0 @@ -%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: e2b12afd4d27418a9cfb2823fe2b9ff3, type: 3} - m_Name: XRSimulationRuntimeSettings - m_EditorClassIdentifier: - m_EnvironmentLayer: 30 - m_EnvironmentScanParams: - m_MinimumRescanTime: 0.1 - m_DeltaCameraDistanceToRescan: 0.025 - m_DeltaCameraAngleToRescan: 4 - m_RaysPerCast: 10 - m_MaximumHitDistance: 12 - m_MinimumHitDistance: 0.05 - m_PlaneFindingParams: - m_MinimumPlaneUpdateTime: 0.13 - m_MinPointsPerSqMeter: 30 - m_MinSideLength: 0.11 - m_InLayerMergeDistance: 0.2 - m_CrossLayerMergeDistance: 0.05 - m_CheckEmptyArea: 0 - m_AllowedEmptyAreaCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_PointUpdateDropoutRate: 0.4 - m_NormalToleranceAngle: 15 - m_VoxelSize: 0.1 - m_TrackedImageDiscoveryParams: - m_TrackingUpdateInterval: 0.09 - m_EnvironmentProbeDiscoveryParams: - m_MinUpdateTime: 0.2 - m_MaxDiscoveryDistance: 3 - m_DiscoveryDelayTime: 1 - m_CubemapFaceSize: 16 - m_AnchorDiscoveryParams: - m_MinTimeUntilUpdate: 0.2 - m_BoundingBoxDiscoveryParams: - m_TrackingUpdateInterval: 0.09 - m_UseXRay: 1 - m_FlipXRayDirection: 0 diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta deleted file mode 100644 index 91f8223d..00000000 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0b80ffe129d2745e782a92110c9cbdfe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset deleted file mode 100644 index a219d73d..00000000 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset +++ /dev/null @@ -1,24 +0,0 @@ -%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: b2f528b98f844ed8b6b2d5fdf90b40e6, type: 3} - m_Name: XRSimulationPreferences - m_EditorClassIdentifier: - m_HasInputActionUpgrade: 1 - m_EnvironmentPrefab: {fileID: 0} - m_FallbackEnvironmentPrefab: {fileID: 7576867131100388943, guid: c7b92c392902f4043a03a64032c02fe1, type: 3} - m_UnlockInputActionReference: {fileID: -6503468053843192148, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} - m_MoveInputActionReference: {fileID: -8435123576461090514, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} - m_LookInputActionReference: {fileID: -2447619311606779944, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} - m_SprintInputActionReference: {fileID: -5750007214975788477, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} - m_LookSpeed: 1 - m_MoveSpeed: 1 - m_MoveSpeedModifier: 3 diff --git a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta b/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta deleted file mode 100644 index e5a004c2..00000000 --- a/plug-ins/Apple.SpatialController/Apple.SpatialController_Unity/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d863199515ff466ba04d1c02ab038f7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: