5.0.1 compat

Author: Bvallon-sl

ZEDCamera/Assets/Editor/Scripts/RenderingPipelineDefines.cs

@@ -53,10 +53,10 @@ static void UpdateDefines()
     static PipelineType GetPipeline()
     {
 #if UNITY_2019_1_OR_NEWER
-        if (GraphicsSettings.renderPipelineAsset != null)
+        if (GraphicsSettings.defaultRenderPipeline != null)
         {
             // SRP
-            var srpType = GraphicsSettings.renderPipelineAsset.GetType().ToString();
+            var srpType = GraphicsSettings.defaultRenderPipeline.GetType().ToString();
             if (srpType.Contains("HDRenderPipelineAsset"))
             {
                 return PipelineType.HDPipeline;

ZEDCamera/Assets/SDK/Helpers/Scripts/Utilities/UpgradePluginToSRP.cs

@@ -5,9 +5,9 @@ public static class UpgradePluginToSRP
 {
     public static bool UpgradeCameraToSRP(GameObject zedCam)
     {
-        var SRP = GraphicsSettings.renderPipelineAsset;
+        var SRP = GraphicsSettings.defaultRenderPipeline;
 
-        if (GraphicsSettings.renderPipelineAsset != null)
+        if (GraphicsSettings.defaultRenderPipeline != null)
         {
             var SRPString = SRP.GetType().ToString();
             if (SRPString.Contains("UniversalRenderPipelineAsset"))
@@ -64,9 +64,9 @@ public static bool UpgradeCameraToSRP(GameObject zedCam)
 
     public static bool UpgradeGreenScreenToSRP(GameObject greenScreen)
     {
-        var SRP = GraphicsSettings.renderPipelineAsset;
+        var SRP = GraphicsSettings.defaultRenderPipeline;
 
-        if (GraphicsSettings.renderPipelineAsset != null)
+        if (GraphicsSettings.defaultRenderPipeline != null)
         {
             var SRPString = SRP.GetType().ToString();
             if (SRPString.Contains("UniversalRenderPipelineAsset"))
@@ -115,9 +115,9 @@ public static bool UpgradeGreenScreenToSRP(GameObject greenScreen)
 
     public static bool UpgradePlanetariumToSRP(GameObject planetarium)
     {
-        var SRP = GraphicsSettings.renderPipelineAsset;
+        var SRP = GraphicsSettings.defaultRenderPipeline;
 
-        if (GraphicsSettings.renderPipelineAsset != null)
+        if (GraphicsSettings.defaultRenderPipeline != null)
         {
             var SRPString = SRP.GetType().ToString();
             if (SRPString.Contains("UniversalRenderPipelineAsset"))

ZEDCamera/Assets/SDK/Helpers/Scripts/Utilities/ZEDSupportFunctions.cs

@@ -31,7 +31,7 @@ public static bool hasXRDevice()
                 if (xRLoader.name == "OculusLoader" || xRLoader.name == "OpenVRLoader")
                 {
                     var xrDisplaySubsystems = new List<XRDisplaySubsystem>();
-                    SubsystemManager.GetInstances<XRDisplaySubsystem>(xrDisplaySubsystems);
+                    SubsystemManager.GetSubsystems<XRDisplaySubsystem>(xrDisplaySubsystems);
                     foreach (var xrDisplay in xrDisplaySubsystems)
                     {
                         if (xrDisplay.running)

ZEDCamera/Assets/SDK/Plugins/x86_64/sl_unitywrapper.dll

@@ -86,8 +86,8 @@ void FixedUpdate ()
             }
             else if (posdiff.magnitude < moveDeadzoneMeters / 2f) //Too close. Slow down extra fast. 
             {
-                _rb.velocity *= 0.9f;
-                if (_rb.velocity.magnitude < 0.05f) _rb.velocity = Vector3.zero;
+                _rb.linearVelocity *= 0.9f;
+                if (_rb.linearVelocity.magnitude < 0.05f) _rb.linearVelocity = Vector3.zero;
             }
         }
         else //Not gradual move. 

ZEDCamera/Assets/Samples~/Mixed Reality Calibration/Scripts/BellyMenu.cs

@@ -16,7 +16,7 @@ public class ForceTrackingSpaceType : MonoBehaviour
     void Start()
     {
         List<XRInputSubsystem> subsystems = new List<XRInputSubsystem>();
-        SubsystemManager.GetInstances<XRInputSubsystem>(subsystems);
+        SubsystemManager.GetSubsystems<XRInputSubsystem>(subsystems);
         for (int i = 0; i < subsystems.Count; i++)
         {
             subsystems[i].TrySetTrackingOriginMode(TrackingOriginModeFlags.Floor);

ZEDCamera/Assets/Samples~/Mixed Reality Calibration/Scripts/ForceTrackingSpaceType.cs

@@ -83,8 +83,8 @@ public void SetMySpawner(BunnySpawner spawner)
     /// </summary>
     public void GetHit(bool hit)
     {
-        GetComponent<Rigidbody>().drag = 0f;
-        GetComponent<Rigidbody>().angularDrag = 0.5f;
+        GetComponent<Rigidbody>().linearDamping = 0f;
+        GetComponent<Rigidbody>().angularDamping = 0.5f;
         StartCoroutine(HitDelay(hit));
     }
 
@@ -126,8 +126,8 @@ private void FixedUpdate()
         if (IsMoving)
         {
             //Look for our next position based on our current velocity.
-            Vector3 predictedPos = centerpoint.position + (rb.velocity * (Time.deltaTime * 2.5f));
-            transform.rotation = Quaternion.LookRotation(rb.velocity.normalized);
+            Vector3 predictedPos = centerpoint.position + (rb.linearVelocity * (Time.deltaTime * 2.5f));
+            transform.rotation = Quaternion.LookRotation(rb.linearVelocity.normalized);
 
             //Collision check with the real world at that next position.
             foreach (ZEDManager manager in ZEDManager.GetInstances()) //Check all active cameras. 
@@ -144,7 +144,7 @@ private void FixedUpdate()
                     {
                         IsMoving = false; //Not moving anymore, so update our state.
                         bunnyspawner.SpawnUI(predictedPos); //Start spawning the UI on our current location.
-                        rb.velocity = Vector3.Reflect(rb.velocity / 2, transform.forward); //Bounce off the surface we hit 
+                        rb.linearVelocity = Vector3.Reflect(rb.linearVelocity / 2, transform.forward); //Bounce off the surface we hit 
                     }
 
                     break; //If it hit the real world in one camera's view, no need to check the other cameras. 

ZEDCamera/Assets/Samples~/Plane Detection/Scripts/Bunny.cs

@@ -66,7 +66,7 @@ private void FixedUpdate()
 
         velocity = (destination - rb.transform.position) * sensitivity;
 
-        rb.velocity = velocity;
+        rb.linearVelocity = velocity;
     }
 
     /// <summary>
@@ -82,19 +82,19 @@ private void OnTriggerEnter(Collider other)
         {
             if (other.GetComponent<Rigidbody>() && !colBunny.IsMoving)
             {
-                if (rb.velocity.y <= -2)
+                if (rb.linearVelocity.y <= -2)
                 {
                     colBunny.anim.SetTrigger("Squeeze");
                     colBunny.GetHit(hit: false);
                 }
-                else if (rb.velocity.magnitude > 2f)
+                else if (rb.linearVelocity.magnitude > 2f)
                 {
                     //Send a call to GetHit() which delays for X seconds the Bunny's detection with the real world.
                     //Since the Bunny is already on the floor, it might return true for collision the moment the baseball bat touches it.
                     colBunny.GetHit(hit: true);
 
                     //Assign our velocity with some changes. Halving the velocity makes it feel more natural when hitting the bunny. 
-                    other.GetComponent<Rigidbody>().velocity = rb.velocity / 2;
+                    other.GetComponent<Rigidbody>().linearVelocity = rb.linearVelocity / 2;
                 }
             }
         }

ZEDCamera/Assets/Samples~/Plane Detection/Scripts/CapsuleFollower.cs

@@ -143,7 +143,7 @@ void Update()
                 launcher.transform.localRotation = Quaternion.Euler(-offsetAngleY * Mathf.Rad2Deg, -offsetAngleX * Mathf.Rad2Deg, 0);
                 projectiles[countsphere % SPHERE_NB].GetComponent<BallTrigger>().ResetValues();
                 Rigidbody rigidBody = projectiles[countsphere % SPHERE_NB].GetComponent<Rigidbody>();
-                rigidBody.velocity = Vector3.zero;
+                rigidBody.linearVelocity = Vector3.zero;
                 rigidBody.isKinematic = false;
                 rigidBody.useGravity = true;
 

ZEDCamera/Assets/Samples~/Spatial Mapping/Scripts/BallLauncher.cs

@@ -24,11 +24,11 @@ public void ResetValues()
 
     void OnTriggerEnter(Collider other)
     {
-        if (hasDamaged || body.velocity.magnitude < minVelocityDammage) return;
+        if (hasDamaged || body.linearVelocity.magnitude < minVelocityDammage) return;
         if (other.gameObject.name.Contains("ZomBunny"))
         {
             hasDamaged = true;
-            other.gameObject.GetComponent<EnemyBehavior>().Dammage(dammage * body.velocity.magnitude);
+            other.gameObject.GetComponent<EnemyBehavior>().Dammage(dammage * body.linearVelocity.magnitude);
         }
     }
 }