Updated plugin to work with AR Foundation 2.0

neogeek · neogeek · commit 057d65161d7e · 2019-05-17T00:59:21.000-04:00
diff --git a/CandyCoded.ARFoundationComponents.asmdef b/CandyCoded.ARFoundationComponents.asmdef
@@ -2,7 +2,8 @@
     "name": "CandyCoded.ARFoundationComponents",
     "references": [
         "CandyCoded",
-        "Unity.XR.ARFoundation"
+        "Unity.XR.ARFoundation",
+        "Unity.XR.ARSubsystems"
     ],
     "optionalUnityReferences": [],
     "includePlatforms": [],
@@ -11,5 +12,6 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": []
 }
diff --git a/Scripts/ARDistanceFromPlane.cs b/Scripts/ARDistanceFromPlane.cs
@@ -12,6 +12,7 @@ public class DistanceUpdateEvent : UnityEvent<bool, float>
     }
 
     [RequireComponent(typeof(ARSessionOrigin))]
+    [RequireComponent(typeof(ARRaycastManager))]
     [RequireComponent(typeof(ARPlaneManager))]
     public class ARDistanceFromPlane : MonoBehaviour
     {
@@ -20,21 +21,24 @@ public class ARDistanceFromPlane : MonoBehaviour
 
         public ARSessionOrigin sessionOrigin { get; private set; }
 
+        public ARRaycastManager raycastManager { get; private set; }
+
         public ARPlaneManager planeManager { get; private set; }
 
         private void Awake()
         {
 
             sessionOrigin = gameObject.GetComponent<ARSessionOrigin>();
+            raycastManager = gameObject.GetComponent<ARRaycastManager>();
             planeManager = gameObject.GetComponent<ARPlaneManager>();
 
         }
 
         private void Start()
         {
 
-            if (ARSubsystemManager.systemState == ARSystemState.None ||
-                ARSubsystemManager.systemState == ARSystemState.Unsupported)
+            if (ARSession.state == ARSessionState.None ||
+                ARSession.state == ARSessionState.Unsupported)
             {
 
                 enabled = false;
@@ -51,7 +55,7 @@ private void Update()
                 return;
             }
 
-            var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var pose);
+            var planeVisible = ARFoundationExtensions.IsLookingAtPlane(raycastManager, planeManager, out var pose);
 
             var distanceFromPlane = sessionOrigin.camera.transform.position - pose.position;
 
diff --git a/Scripts/ARFoundationExtensions.cs b/Scripts/ARFoundationExtensions.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Experimental.XR;
 using UnityEngine.XR.ARFoundation;
+using UnityEngine.XR.ARSubsystems;
 
 namespace CandyCoded.ARFoundationComponents
 {
@@ -11,7 +11,7 @@ public static class ARFoundationExtensions
 
         public static Vector2 CenterOfScreen => new Vector2(Screen.width, Screen.height) / 2;
 
-        public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
+        public static bool RaycastToPlane(Vector2 position, ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
         {
 
             var hits = new List<ARRaycastHit>();
@@ -20,7 +20,7 @@ public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigi
 
             plane = null;
 
-            if (!sessionOrigin.Raycast(position, hits, TrackableType.PlaneWithinPolygon))
+            if (!raycastManager.Raycast(position, hits, TrackableType.Planes))
             {
                 return false;
             }
@@ -29,34 +29,44 @@ public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigi
 
             pose = hit.pose;
 
-            plane = planeManager.TryGetPlane(hit.trackableId);
+            foreach (var trackable in planeManager.trackables)
+            {
+
+                if (trackable.trackableId.Equals(hit.trackableId))
+                {
+
+                    plane = trackable;
+
+                }
+
+            }
 
             return true;
 
         }
 
-        public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
+        public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
         {
 
-            return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out pose, out plane);
+            return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out pose, out plane);
 
         }
 
-        public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose)
+        public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose)
         {
 
-            return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out pose, out var plane);
+            return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out pose, out var plane);
 
         }
 
-        public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager)
+        public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager)
         {
 
-            return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out var pose, out var plane);
+            return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out var pose, out var plane);
 
         }
 
-        public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
+        public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)
         {
 
             pose = Pose.identity;
@@ -70,21 +80,21 @@ public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager
 
             var touch = Input.GetTouch(0);
 
-            return touch.phase == TouchPhase.Began && RaycastToPlane(touch.position, sessionOrigin, planeManager, out pose, out plane);
+            return touch.phase == TouchPhase.Began && RaycastToPlane(touch.position, raycastManager, planeManager, out pose, out plane);
 
         }
 
-        public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose)
+        public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose)
         {
 
-            return HasTouchedPlane(sessionOrigin, planeManager, out pose, out var plane);
+            return HasTouchedPlane(raycastManager, planeManager, out pose, out var plane);
 
         }
 
-        public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager)
+        public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager)
         {
 
-            return HasTouchedPlane(sessionOrigin, planeManager, out var pose, out var plane);
+            return HasTouchedPlane(raycastManager, planeManager, out var pose, out var plane);
 
         }
 
diff --git a/Scripts/ARLightEstimation.cs b/Scripts/ARLightEstimation.cs
@@ -8,8 +8,17 @@ namespace CandyCoded.ARFoundationComponents
     public class ARLightEstimation : MonoBehaviour
     {
 
+        [SerializeField]
+        private ARCameraManager _cameraManager;
+
 #pragma warning disable CS0109
         public new Light light { get; private set; }
+
+        public new ARCameraManager cameraManager
+        {
+            get => _cameraManager;
+            set => _cameraManager = value;
+        }
 #pragma warning restore CS0109
 
         private void Awake()
@@ -22,8 +31,8 @@ private void Awake()
         private void Start()
         {
 
-            if (ARSubsystemManager.systemState == ARSystemState.None ||
-                ARSubsystemManager.systemState == ARSystemState.Unsupported)
+            if (ARSession.state == ARSessionState.None ||
+                ARSession.state == ARSessionState.Unsupported)
             {
 
                 enabled = false;
@@ -65,14 +74,28 @@ private void FrameChanged(ARCameraFrameEventArgs args)
         private void OnEnable()
         {
 
-            ARSubsystemManager.cameraFrameReceived += FrameChanged;
+            if (cameraManager == null)
+            {
+
+                return;
+
+            }
+
+            cameraManager.frameReceived += FrameChanged;
 
         }
 
         private void OnDisable()
         {
 
-            ARSubsystemManager.cameraFrameReceived -= FrameChanged;
+            if (cameraManager == null)
+            {
+
+                return;
+
+            }
+
+            cameraManager.frameReceived -= FrameChanged;
 
         }
 
diff --git a/Scripts/ARPlaceObjectOnPlane.cs b/Scripts/ARPlaceObjectOnPlane.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.Experimental.XR;
 using UnityEngine.XR.ARFoundation;
+using UnityEngine.XR.ARSubsystems;
 
 namespace CandyCoded.ARFoundationComponents
 {
@@ -54,7 +54,7 @@ public void PlaceObjectOnPlane(Pose pose, ARPlane plane)
             objectToPlaceGameObject.transform.position = pose.position + new Vector3(0, verticalOffset, 0);
             objectToPlaceGameObject.transform.rotation = pose.rotation;
 
-            if (plane.boundedPlane.Alignment == PlaneAlignment.Horizontal)
+            if (plane.alignment.Equals(PlaneAlignment.HorizontalUp | PlaneAlignment.HorizontalDown))
             {
 
                 objectToPlaceGameObject.transform.LookAt(new Vector3(
diff --git a/Scripts/ARPlaneEvents.cs b/Scripts/ARPlaneEvents.cs
@@ -19,6 +19,7 @@ public class PlaneTouchedEvent : UnityEvent<Pose, ARPlane>
     }
 
     [RequireComponent(typeof(ARSessionOrigin))]
+    [RequireComponent(typeof(ARRaycastManager))]
     [RequireComponent(typeof(ARPlaneManager))]
     public class ARPlaneEvents : MonoBehaviour
     {
@@ -31,21 +32,24 @@ public class ARPlaneEvents : MonoBehaviour
 
         public ARSessionOrigin sessionOrigin { get; private set; }
 
+        public ARRaycastManager raycastManager { get; private set; }
+
         public ARPlaneManager planeManager { get; private set; }
 
         private void Awake()
         {
 
             sessionOrigin = gameObject.GetComponent<ARSessionOrigin>();
+            raycastManager = gameObject.GetComponent<ARRaycastManager>();
             planeManager = gameObject.GetComponent<ARPlaneManager>();
 
         }
 
         private void Start()
         {
 
-            if (ARSubsystemManager.systemState == ARSystemState.None ||
-                ARSubsystemManager.systemState == ARSystemState.Unsupported)
+            if (ARSession.state == ARSessionState.None ||
+                ARSession.state == ARSessionState.Unsupported)
             {
 
                 enabled = false;
@@ -62,7 +66,7 @@ private void Update()
                 return;
             }
 
-            var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var lookingAtPose, out var lookingAtPlane);
+            var planeVisible = ARFoundationExtensions.IsLookingAtPlane(raycastManager, planeManager, out var lookingAtPose, out var lookingAtPlane);
 
             PlaneUpdated?.Invoke(planeVisible, lookingAtPose, lookingAtPlane);
 
@@ -71,7 +75,7 @@ private void Update()
                 return;
             }
 
-            if (ARFoundationExtensions.HasTouchedPlane(sessionOrigin, planeManager, out var touchPose, out var touchPlane))
+            if (ARFoundationExtensions.HasTouchedPlane(raycastManager, planeManager, out var touchPose, out var touchPlane))
             {
 
                 PlaneTouchedWithTouchPosition?.Invoke(touchPose, touchPlane);
diff --git a/Scripts/ARShowPlacementMarkerOnPlane.cs b/Scripts/ARShowPlacementMarkerOnPlane.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
-using UnityEngine.Experimental.XR;
 using UnityEngine.XR.ARFoundation;
+using UnityEngine.XR.ARSubsystems;
 
 namespace CandyCoded.ARFoundationComponents
 {
@@ -55,7 +55,7 @@ public void ShowPlacementMarkerOnPlane(bool planeVisible, Pose pose, ARPlane pla
                 placementMarkerGameObject.transform.position = pose.position + new Vector3(0, verticalOffset, 0);
                 placementMarkerGameObject.transform.rotation = pose.rotation;
 
-                if (plane.boundedPlane.Alignment == PlaneAlignment.Horizontal)
+                if (plane.alignment.Equals(PlaneAlignment.HorizontalUp | PlaneAlignment.HorizontalDown))
                 {
 
                     placementMarkerGameObject.transform.LookAt(new Vector3(
diff --git a/Scripts/CustomEditor/AutoPopulateScene.cs b/Scripts/CustomEditor/AutoPopulateScene.cs
@@ -65,6 +65,8 @@ private static void SetupARFoundationGameObjects()
 
             var sessionOrigin = GameObject.Find("AR Session Origin");
 
+            sessionOrigin.AddOrGetComponent<ARRaycastManager>();
+
             var planeManager = sessionOrigin.AddOrGetComponent<ARPlaneManager>();
 
             planeManager.planePrefab = defaultPlanePrefab;
@@ -76,6 +78,13 @@ private static void SetupARFoundationComponentsGameObjects()
 
             var sessionOrigin = GameObject.Find("AR Session Origin");
 
+            var camera = GameObject.Find("AR Camera");
+            var cameraManager = camera.AddOrGetComponent<ARCameraManager>();
+
+            var light = GameObject.Find("Directional Light");
+            var lightEstimation = light.AddOrGetComponent<ARLightEstimation>();
+            lightEstimation.cameraManager = cameraManager;
+
             var planeEvents = sessionOrigin.AddOrGetComponent<ARPlaneEvents>();
             var placeObjectsOnPlane = sessionOrigin.AddOrGetComponent<ARPlaceObjectOnPlane>();
 
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "com.candycoded.arfoundation-components",
     "displayName": "ARFoundation-Components",
-    "version": "1.0.0",
-    "unity": "2018.3",
+    "version": "2.0.0",
+    "unity": "2019.1",
     "description": "Generic components for use with ARFoundation",
     "keywords": [
         "components",
@@ -12,7 +12,7 @@
         "arkit"
     ],
     "dependencies": {
-        "com.candycoded.candycoded": "https://github.com/CandyCoded/CandyCoded.git#v1.1.0",
-        "com.unity.xr.arfoundation": "1.0.0-preview.22"
+        "com.candycoded.candycoded": "https://github.com/CandyCoded/CandyCoded.git#v1.1.8",
+        "com.unity.xr.arfoundation": "2.1.0-preview.2"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class DistanceUpdateEvent : UnityEvent<bool, float>`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`[RequireComponent(typeof(ARSessionOrigin))]`
	`15`	`+ [RequireComponent(typeof(ARRaycastManager))]`
`15`	`16`	`[RequireComponent(typeof(ARPlaneManager))]`
`16`	`17`	`public class ARDistanceFromPlane : MonoBehaviour`
`17`	`18`	`{`
`@@ -20,21 +21,24 @@ public class ARDistanceFromPlane : MonoBehaviour`
`20`	`21`
`21`	`22`	`public ARSessionOrigin sessionOrigin { get; private set; }`
`22`	`23`
	`24`	`+ public ARRaycastManager raycastManager { get; private set; }`
	`25`	`+`
`23`	`26`	`public ARPlaneManager planeManager { get; private set; }`
`24`	`27`
`25`	`28`	`private void Awake()`
`26`	`29`	`{`
`27`	`30`
`28`	`31`	`sessionOrigin = gameObject.GetComponent<ARSessionOrigin>();`
	`32`	`+ raycastManager = gameObject.GetComponent<ARRaycastManager>();`
`29`	`33`	`planeManager = gameObject.GetComponent<ARPlaneManager>();`
`30`	`34`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`private void Start()`
`34`	`38`	`{`
`35`	`39`
`36`		`- if (ARSubsystemManager.systemState == ARSystemState.None \|\|`
`37`		`- ARSubsystemManager.systemState == ARSystemState.Unsupported)`
	`40`	`+ if (ARSession.state == ARSessionState.None \|\|`
	`41`	`+ ARSession.state == ARSessionState.Unsupported)`
`38`	`42`	`{`
`39`	`43`
`40`	`44`	`enabled = false;`
`@@ -51,7 +55,7 @@ private void Update()`
`51`	`55`	`return;`
`52`	`56`	`}`
`53`	`57`
`54`		`- var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var pose);`
	`58`	`+ var planeVisible = ARFoundationExtensions.IsLookingAtPlane(raycastManager, planeManager, out var pose);`
`55`	`59`
`56`	`60`	`var distanceFromPlane = sessionOrigin.camera.transform.position - pose.position;`
`57`	`61`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using UnityEngine;`
`3`		`-using UnityEngine.Experimental.XR;`
`4`	`3`	`using UnityEngine.XR.ARFoundation;`
	`4`	`+using UnityEngine.XR.ARSubsystems;`
`5`	`5`
`6`	`6`	`namespace CandyCoded.ARFoundationComponents`
`7`	`7`	`{`
`@@ -11,7 +11,7 @@ public static class ARFoundationExtensions`
`11`	`11`
`12`	`12`	`public static Vector2 CenterOfScreen => new Vector2(Screen.width, Screen.height) / 2;`
`13`	`13`
`14`		`- public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
	`14`	`+ public static bool RaycastToPlane(Vector2 position, ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`var hits = new List<ARRaycastHit>();`
`@@ -20,7 +20,7 @@ public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigi`
`20`	`20`
`21`	`21`	`plane = null;`
`22`	`22`
`23`		`- if (!sessionOrigin.Raycast(position, hits, TrackableType.PlaneWithinPolygon))`
	`23`	`+ if (!raycastManager.Raycast(position, hits, TrackableType.Planes))`
`24`	`24`	`{`
`25`	`25`	`return false;`
`26`	`26`	`}`
`@@ -29,34 +29,44 @@ public static bool RaycastToPlane(Vector3 position, ARSessionOrigin sessionOrigi`
`29`	`29`
`30`	`30`	`pose = hit.pose;`
`31`	`31`
`32`		`- plane = planeManager.TryGetPlane(hit.trackableId);`
	`32`	`+ foreach (var trackable in planeManager.trackables)`
	`33`	`+ {`
	`34`	`+`
	`35`	`+ if (trackable.trackableId.Equals(hit.trackableId))`
	`36`	`+ {`
	`37`	`+`
	`38`	`+ plane = trackable;`
	`39`	`+`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ }`
`33`	`43`
`34`	`44`	`return true;`
`35`	`45`
`36`	`46`	`}`
`37`	`47`
`38`		`- public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
	`48`	`+ public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
`39`	`49`	`{`
`40`	`50`
`41`		`- return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out pose, out plane);`
	`51`	`+ return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out pose, out plane);`
`42`	`52`
`43`	`53`	`}`
`44`	`54`
`45`		`- public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose)`
	`55`	`+ public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose)`
`46`	`56`	`{`
`47`	`57`
`48`		`- return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out pose, out var plane);`
	`58`	`+ return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out pose, out var plane);`
`49`	`59`
`50`	`60`	`}`
`51`	`61`
`52`		`- public static bool IsLookingAtPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager)`
	`62`	`+ public static bool IsLookingAtPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager)`
`53`	`63`	`{`
`54`	`64`
`55`		`- return RaycastToPlane(CenterOfScreen, sessionOrigin, planeManager, out var pose, out var plane);`
	`65`	`+ return RaycastToPlane(CenterOfScreen, raycastManager, planeManager, out var pose, out var plane);`
`56`	`66`
`57`	`67`	`}`
`58`	`68`
`59`		`- public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
	`69`	`+ public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose, out ARPlane plane)`
`60`	`70`	`{`
`61`	`71`
`62`	`72`	`pose = Pose.identity;`
`@@ -70,21 +80,21 @@ public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager`
`70`	`80`
`71`	`81`	`var touch = Input.GetTouch(0);`
`72`	`82`
`73`		`- return touch.phase == TouchPhase.Began && RaycastToPlane(touch.position, sessionOrigin, planeManager, out pose, out plane);`
	`83`	`+ return touch.phase == TouchPhase.Began && RaycastToPlane(touch.position, raycastManager, planeManager, out pose, out plane);`
`74`	`84`
`75`	`85`	`}`
`76`	`86`
`77`		`- public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager, out Pose pose)`
	`87`	`+ public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager, out Pose pose)`
`78`	`88`	`{`
`79`	`89`
`80`		`- return HasTouchedPlane(sessionOrigin, planeManager, out pose, out var plane);`
	`90`	`+ return HasTouchedPlane(raycastManager, planeManager, out pose, out var plane);`
`81`	`91`
`82`	`92`	`}`
`83`	`93`
`84`		`- public static bool HasTouchedPlane(ARSessionOrigin sessionOrigin, ARPlaneManager planeManager)`
	`94`	`+ public static bool HasTouchedPlane(ARRaycastManager raycastManager, ARPlaneManager planeManager)`
`85`	`95`	`{`
`86`	`96`
`87`		`- return HasTouchedPlane(sessionOrigin, planeManager, out var pose, out var plane);`
	`97`	`+ return HasTouchedPlane(raycastManager, planeManager, out var pose, out var plane);`
`88`	`98`
`89`	`99`	`}`
`90`	`100`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using UnityEngine.Events;`
`3`		`-using UnityEngine.Experimental.XR;`
`4`	`3`	`using UnityEngine.XR.ARFoundation;`
	`4`	`+using UnityEngine.XR.ARSubsystems;`
`5`	`5`
`6`	`6`	`namespace CandyCoded.ARFoundationComponents`
`7`	`7`	`{`
`@@ -54,7 +54,7 @@ public void PlaceObjectOnPlane(Pose pose, ARPlane plane)`
`54`	`54`	`objectToPlaceGameObject.transform.position = pose.position + new Vector3(0, verticalOffset, 0);`
`55`	`55`	`objectToPlaceGameObject.transform.rotation = pose.rotation;`
`56`	`56`
`57`		`- if (plane.boundedPlane.Alignment == PlaneAlignment.Horizontal)`
	`57`	`+ if (plane.alignment.Equals(PlaneAlignment.HorizontalUp \| PlaneAlignment.HorizontalDown))`
`58`	`58`	`{`
`59`	`59`
`60`	`60`	`objectToPlaceGameObject.transform.LookAt(new Vector3(`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public class PlaneTouchedEvent : UnityEvent<Pose, ARPlane>`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`[RequireComponent(typeof(ARSessionOrigin))]`
	`22`	`+ [RequireComponent(typeof(ARRaycastManager))]`
`22`	`23`	`[RequireComponent(typeof(ARPlaneManager))]`
`23`	`24`	`public class ARPlaneEvents : MonoBehaviour`
`24`	`25`	`{`
`@@ -31,21 +32,24 @@ public class ARPlaneEvents : MonoBehaviour`
`31`	`32`
`32`	`33`	`public ARSessionOrigin sessionOrigin { get; private set; }`
`33`	`34`
	`35`	`+ public ARRaycastManager raycastManager { get; private set; }`
	`36`	`+`
`34`	`37`	`public ARPlaneManager planeManager { get; private set; }`
`35`	`38`
`36`	`39`	`private void Awake()`
`37`	`40`	`{`
`38`	`41`
`39`	`42`	`sessionOrigin = gameObject.GetComponent<ARSessionOrigin>();`
	`43`	`+ raycastManager = gameObject.GetComponent<ARRaycastManager>();`
`40`	`44`	`planeManager = gameObject.GetComponent<ARPlaneManager>();`
`41`	`45`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`private void Start()`
`45`	`49`	`{`
`46`	`50`
`47`		`- if (ARSubsystemManager.systemState == ARSystemState.None \|\|`
`48`		`- ARSubsystemManager.systemState == ARSystemState.Unsupported)`
	`51`	`+ if (ARSession.state == ARSessionState.None \|\|`
	`52`	`+ ARSession.state == ARSessionState.Unsupported)`
`49`	`53`	`{`
`50`	`54`
`51`	`55`	`enabled = false;`
`@@ -62,7 +66,7 @@ private void Update()`
`62`	`66`	`return;`
`63`	`67`	`}`
`64`	`68`
`65`		`- var planeVisible = ARFoundationExtensions.IsLookingAtPlane(sessionOrigin, planeManager, out var lookingAtPose, out var lookingAtPlane);`
	`69`	`+ var planeVisible = ARFoundationExtensions.IsLookingAtPlane(raycastManager, planeManager, out var lookingAtPose, out var lookingAtPlane);`
`66`	`70`
`67`	`71`	`PlaneUpdated?.Invoke(planeVisible, lookingAtPose, lookingAtPlane);`
`68`	`72`
`@@ -71,7 +75,7 @@ private void Update()`
`71`	`75`	`return;`
`72`	`76`	`}`
`73`	`77`
`74`		`- if (ARFoundationExtensions.HasTouchedPlane(sessionOrigin, planeManager, out var touchPose, out var touchPlane))`
	`78`	`+ if (ARFoundationExtensions.HasTouchedPlane(raycastManager, planeManager, out var touchPose, out var touchPlane))`
`75`	`79`	`{`
`76`	`80`
`77`	`81`	`PlaneTouchedWithTouchPosition?.Invoke(touchPose, touchPlane);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using UnityEngine;`
`2`		`-using UnityEngine.Experimental.XR;`
`3`	`2`	`using UnityEngine.XR.ARFoundation;`
	`3`	`+using UnityEngine.XR.ARSubsystems;`
`4`	`4`
`5`	`5`	`namespace CandyCoded.ARFoundationComponents`
`6`	`6`	`{`
`@@ -55,7 +55,7 @@ public void ShowPlacementMarkerOnPlane(bool planeVisible, Pose pose, ARPlane pla`
`55`	`55`	`placementMarkerGameObject.transform.position = pose.position + new Vector3(0, verticalOffset, 0);`
`56`	`56`	`placementMarkerGameObject.transform.rotation = pose.rotation;`
`57`	`57`
`58`		`- if (plane.boundedPlane.Alignment == PlaneAlignment.Horizontal)`
	`58`	`+ if (plane.alignment.Equals(PlaneAlignment.HorizontalUp \| PlaneAlignment.HorizontalDown))`
`59`	`59`	`{`
`60`	`60`
`61`	`61`	`placementMarkerGameObject.transform.LookAt(new Vector3(`