Update README to with links to the new repo site

.gitignore

@@ -2,3 +2,4 @@ Samples
 Samples.meta
 package.json
 package.json.meta
+Samples~.meta

README.md

@@ -4,21 +4,21 @@ You can import the Humanoid Control Free package in Unity directly with the Pack
 
 See [Unity: Installing from a Git URL](https://docs.unity3d.com/Manual/upm-ui-giturl.html)
 
-Use the link from 'Clone with HTTP' (for example: https://gitlab.passervr.com/passer/unity/humanoidcontrol4_free.git)
+Use the link from 'Clone with HTTP' (for example: https://git.passer.life/HumanoidControl/HumanoidControl_Free.git)
 In this way you can always retrieve the latest version by pressing the `Update` button in the Package Manager.
 
-Optionally, you can use a tag to retrieve a specific version. For example:http://gitlab.passervr.com/passer/unity/humanoidcontrol4_free.git#4.1.0.
+Optionally, you can use a tag to retrieve a specific version. For example:https://git.passer.life/HumanoidControl/HumanoidControl_Free.git#4.1.0.
 This will give you a stable version which does not change. Updating can be done by retrieving the package with a link to a new release.
 
 ChangeLog and Releases
 ======================
-All releases with UnityPackages and links for the Unity Package Manager: [Releases](https://gitlab.passervr.com/passer/unity/humanoidcontrol4_free/-/releases).
+All releases with UnityPackages and links for the Unity Package Manager: [Tags page](https://git.passer.life/HumanoidControl/HumanoidControl_Free/tags).
 
-An RSS/Atom feed with all releases can be found on the [Tags page](http://gitlab.passervr.com/passer/unity/humanoidcontrol4_free/-/tags). Click on the _Tags feed_ icon in the top-right corner to retrieve the feed.
+An RSS/Atom feed with all releases can be found on the [Tags page](https://git.passer.life/HumanoidControl/HumanoidControl_Free/tags). Click on the _RSS Feed_ icon in the top-right corner to retrieve the feed.
 
 Documentation
 =============
-For the latest version of the documentation, see [PasserVR HumanoidControl Documentation](https://passervr.com/apis/HumanoidControl/Unity/index.html)
+For the latest version of the documentation, see [PasserVR HumanoidControl Documentation](https://docs.humanoidcontrol.com/)
 
 Video
 =====

Runtime/HumanoidControl/Scripts/Extensions/Oculus/OculusHandSkeleton.cs

@@ -86,7 +86,7 @@ namespace Passer.Tracking {
             }
 
             if (OculusDevice.GetHandState(OculusDevice.Step.Render, isLeft ? OculusDevice.Hand.HandLeft : OculusDevice.Hand.HandRight, ref handState)) {
-                if (handState.Status == 0) {
+                if ((handState.Status & OculusDevice.HandStatus.HandTracked) == 0) {
                     status = Tracker.Status.Present;
                     DisableRenderer();
                     return;

Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXR.cs

@@ -52,7 +52,11 @@ namespace Passer.Tracking {
                 if (_hmd != null)
                     return _hmd;
 
+#if UNITY_6000_0_OR_NEWER
+                _hmd = FindAnyObjectByType<UnityXRHmd>();
+#else
                 _hmd = FindObjectOfType<UnityXRHmd>();
+#endif
                 return _hmd;
             }
         }
@@ -135,7 +139,7 @@ namespace Passer.Tracking {
             Object.DestroyImmediate(plane.gameObject);
         }
 
-        #endregion Hmd
+#endregion Hmd
 
         #region Controller
 
@@ -238,7 +242,7 @@ namespace Passer.Tracking {
 
         #endregion
 
-        #endregion Manage
+#endregion Manage
 
         #region Init
 

Runtime/HumanoidControl/Scripts/Interaction/HandInteraction.cs

@@ -32,7 +32,11 @@ namespace Passer.Humanoid {
 
             inputModule = humanoid.GetComponent<InteractionModule>();
             if (inputModule == null) {
+#if UNITY_6000_0_OR_NEWER
+                inputModule = Object.FindAnyObjectByType<InteractionModule>();
+#else
                 inputModule = Object.FindObjectOfType<InteractionModule>();
+#endif
                 if (inputModule == null) {
                     inputModule = humanoid.gameObject.AddComponent<InteractionModule>();
                 }
@@ -825,7 +829,11 @@ namespace Passer.Humanoid {
             Rigidbody objRigidbody = RigidbodyDisabled.UnparentRigidbody(handPalm, grabbedObject.transform);
             if (objRigidbody != null && !objRigidbody.isKinematic) {
                 if (handRigidbody != null) {
+#if UNITY_6000_0_OR_NEWER
+                    objRigidbody.linearVelocity = handRigidbody.linearVelocity;
+#else
                     objRigidbody.velocity = handRigidbody.velocity;
+#endif
                     objRigidbody.angularVelocity = handRigidbody.angularVelocity;
                 }
                 HumanoidNetworking.ReenableNetworkSync(objRigidbody.gameObject);
@@ -853,7 +861,11 @@ namespace Passer.Humanoid {
                 //grabbedRigidbody.centerOfMass = handTarget.storedCOM;
 
                 if (grabbedRigidbody.isKinematic == false) {
+#if UNITY_6000_0_OR_NEWER
+                    grabbedRigidbody.linearVelocity = handRigidbody.linearVelocity;
+#else
                     grabbedRigidbody.velocity = handRigidbody.velocity;
+#endif
                     grabbedRigidbody.angularVelocity = handRigidbody.angularVelocity;
                 }
 

Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs

@@ -53,8 +53,13 @@ namespace Passer.Humanoid {
                     handTarget.handRigidbody = handTarget.hand.bone.transform.gameObject.AddComponent<Rigidbody>();
             }
             handTarget.handRigidbody.mass = 1;
+#if UNITY_6000_0_OR_NEWER
+            handTarget.handRigidbody.linearDamping = 0;
+            handTarget.handRigidbody.angularDamping = 10;
+#else
             handTarget.handRigidbody.drag = 0;
             handTarget.handRigidbody.angularDrag = 10;
+#endif
             handTarget.handRigidbody.useGravity = false;
             handTarget.handRigidbody.isKinematic = true;
             handTarget.handRigidbody.interpolation = RigidbodyInterpolation.None;

Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs

@@ -1718,7 +1718,11 @@ namespace Passer.Humanoid {
 
         public static List<HumanoidControl> FindLocalHumanoids() {
             List<HumanoidControl> humanoidList = new List<HumanoidControl>();
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] foundHumanoids = UnityEngine.Object.FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] foundHumanoids = UnityEngine.Object.FindObjectsOfType<HumanoidControl>();
+#endif
             for (int i = 0; i < foundHumanoids.Length; i++) {
                 if (!foundHumanoids[i].isRemote) {
                     humanoidList.Add(foundHumanoids[i]);
@@ -1728,7 +1732,11 @@ namespace Passer.Humanoid {
         }
 
         public static IHumanoidNetworking GetLocalHumanoidNetworking() {
+#if UNITY_6000_0_OR_NEWER
+            HumanoidPlayer[] humanoidNetworkings = UnityEngine.Object.FindObjectsByType<HumanoidPlayer>(FindObjectsSortMode.None);
+#else
             HumanoidPlayer[] humanoidNetworkings = UnityEngine.Object.FindObjectsOfType<HumanoidPlayer>();
+#endif
             foreach (IHumanoidNetworking humanoidNetworking in humanoidNetworkings) {
                 if (humanoidNetworking.isLocal)
                     return humanoidNetworking;

Runtime/HumanoidControl/Scripts/Networking/NetworkingStatusUI.cs

@@ -6,18 +6,19 @@ namespace Passer {
         protected NetworkingStarter networkingStarter;
         protected UnityEngine.UI.Text textcomponent;
 
-        void Start() {
+        protected void Start() {
+#if UNITY_6000_0_OR_NEWER            
+            networkingStarter = Object.FindAnyObjectByType<NetworkingStarter>();
+#else
             networkingStarter = FindObjectOfType<NetworkingStarter>();
+#endif
             textcomponent = GetComponent<UnityEngine.UI.Text>();
         }
 
-        void Update() {
+        protected void Update() {
 #if hNW_UNET || hNW_PHOTON
            if (networkingStarter == null)
                 return;
-
-            //if (textcomponent != null)
-//                textcomponent.text = networkingStarter.networkingStatus.ToString();
 #endif
         }
     }

Runtime/HumanoidControl/Scripts/Physics/HandPhysics.cs

@@ -227,7 +227,11 @@ namespace Passer.Humanoid {
 
                 //Compensate for absolute rigidbody speed (specifically when on a moving platform)
                 if (handRigidbody != null) {
+#if UNITY_6000_0_OR_NEWER
+                    Vector3 residualVelocity = handRigidbody.linearVelocity - velocityTowardsTarget;
+#else
                     Vector3 residualVelocity = handRigidbody.velocity - velocityTowardsTarget;
+#endif
                     damper += residualVelocity * 10;
                 }
             }
@@ -552,7 +556,11 @@ namespace Passer.Humanoid {
 
             Vector3 velocityTarget = (positionDelta * velocityMagic) * Time.fixedDeltaTime;
             if (float.IsNaN(velocityTarget.x) == false)
+#if UNITY_6000_0_OR_NEWER
+                handRigidbody.linearVelocity = Vector3.MoveTowards(handRigidbody.linearVelocity, velocityTarget, MaxVelocityChange);
+#else
                 handRigidbody.velocity = Vector3.MoveTowards(handRigidbody.velocity, velocityTarget, MaxVelocityChange);
+#endif
 
             rotationDelta.ToAngleAxis(out angle, out axis);
 

Runtime/HumanoidControl/Scripts/Physics/RigidbodyData.cs

@@ -15,8 +15,13 @@ namespace Passer {
 
         public RigidbodyData(Rigidbody rb) {
             mass = rb.mass;
+#if UNITY_6000_0_OR_NEWER
+            drag = rb.linearDamping;
+            angularDrag = rb.angularDamping;
+#else
             drag = rb.drag;
             angularDrag = rb.angularDrag;
+#endif
             useGravity = rb.useGravity;
             isKinematic = rb.isKinematic;
             interpolation = rb.interpolation;
@@ -28,8 +33,13 @@ namespace Passer {
 
         public void CopyToRigidbody(Rigidbody rb) {
             rb.mass = mass;
+#if UNITY_6000_0_OR_NEWER
+            rb.linearDamping = drag;
+            rb.angularDamping = angularDrag;
+#else
             rb.drag = drag;
             rb.angularDrag = angularDrag;
+#endif
             rb.useGravity = useGravity;
             rb.isKinematic = isKinematic;
             rb.interpolation = interpolation;

Runtime/HumanoidControl/Scripts/Resources/HumanoidTargetsRig.prefab

@@ -5,7 +5,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 100010, guid: 0ef46fdec482c674c8bd176e0b18d448, type: 3}
@@ -60,8 +59,9 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: 0ef46fdec482c674c8bd176e0b18d448, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0ef46fdec482c674c8bd176e0b18d448, type: 3}

Runtime/HumanoidControl/Scripts/Targets/FootTarget.cs

@@ -649,7 +649,11 @@ namespace Passer.Humanoid {
 
         private HumanoidControl GetHumanoid() {
             // This does not work for prefabs
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
 
             for (int i = 0; i < humanoids.Length; i++) {
                 if ((humanoids[i].leftFootTarget != null && humanoids[i].leftFootTarget.transform == this.transform) ||
@@ -829,7 +833,7 @@ namespace Passer.Humanoid {
             toes.MatchTargetToAvatar();
         }
 
-        #endregion
+#endregion
 
         #region Update
 

Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs

@@ -1163,7 +1163,11 @@ namespace Passer.Humanoid {
 
         private HumanoidControl GetHumanoid() {
             // This does not work for prefabs
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
 
             for (int i = 0; i < humanoids.Length; i++) {
                 if ((humanoids[i].leftHandTarget != null && humanoids[i].leftHandTarget.transform == this.transform) ||
@@ -1195,8 +1199,13 @@ namespace Passer.Humanoid {
                     handRigidbody = hand.bone.transform.gameObject.AddComponent<Rigidbody>();
             }
             handRigidbody.mass = 1;
+#if UNITY_6000_0_OR_NEWER
+            handRigidbody.linearDamping = 0;
+            handRigidbody.angularDamping = 10;
+#else
             handRigidbody.drag = 0;
             handRigidbody.angularDrag = 10;
+#endif
             handRigidbody.useGravity = false;
             handRigidbody.isKinematic = true;
             handRigidbody.interpolation = RigidbodyInterpolation.None;

Runtime/HumanoidControl/Scripts/Targets/HeadTarget.cs

@@ -750,7 +750,11 @@ namespace Passer.Humanoid {
 
         private HumanoidControl GetHumanoid() {
             // This does not work for prefabs
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
 
             for (int i = 0; i < humanoids.Length; i++) {
                 if (humanoids[i].headTarget != null && humanoids[i].headTarget.transform == this.transform)
@@ -876,7 +880,7 @@ namespace Passer.Humanoid {
 #endif
         }
 
-        #endregion
+#endregion
 
         #region Update
 
@@ -1218,15 +1222,6 @@ namespace Passer.Humanoid {
             }
         }
 
-        public void DisableVR() {
-            UnityEngine.XR.XRSettings.LoadDeviceByName("None");
-        }
-
-        public void EnableVR() {
-            // Just oculus for now
-            UnityEngine.XR.XRSettings.LoadDeviceByName("Oculus");
-        }
-
         #endregion
     }
 }

Runtime/HumanoidControl/Scripts/Targets/HipsTarget.cs

@@ -461,7 +461,11 @@ namespace Passer.Humanoid {
 
         private HumanoidControl GetHumanoid() {
             // This does not work for prefabs
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
 
             for (int i = 0; i < humanoids.Length; i++) {
                 if (humanoids[i].hipsTarget != null && humanoids[i].hipsTarget.transform == this.transform)
@@ -615,7 +619,7 @@ namespace Passer.Humanoid {
         }
 
 
-        #endregion
+#endregion
 
         #region Update
 

Runtime/HumanoidControl/Scripts/Tools/MenuManager.cs

@@ -51,7 +51,11 @@ namespace Passer {
         /// </summary>
         /// <returns>The found humanoid, null if no local humanoid has been found</returns>
         protected HumanoidControl FindHumanoid() {
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
             HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
             for (int i = 0; i < humanoids.Length; i++) {
                 if (humanoids[i].isRemote == false)
                     return humanoids[i];

Runtime/HumanoidControl/Scripts/Tools/Redrop.cs

@@ -12,18 +12,18 @@ namespace Passer {
         private Vector3 startPosition;
         private Quaternion startRotation;
 
-        void Start() {
+        protected void Start() {
             startPosition = transform.position;
             startRotation = transform.rotation;
         }
 
-        void Update() {
+        protected void Update() {
             if (groundCollider == null && transform.position.y < 0) {
                 MoveToStart();
             }
         }
 
-        private void OnCollisionEnter(Collision collision) {
+        protected void OnCollisionEnter(Collision collision) {
             if (collision.collider == groundCollider) {
                 MoveToStart();
             }
@@ -34,7 +34,11 @@ namespace Passer {
             if (thisRigidbody != null) {
                 thisRigidbody.MovePosition(new Vector3(startPosition.x, startPosition.y + 0.1F, startPosition.z));
                 thisRigidbody.MoveRotation(startRotation);
+#if UNITY_6000_0_OR_NEWER
+                thisRigidbody.linearVelocity = Vector3.zero;
+#else
                 thisRigidbody.velocity = Vector3.zero;
+#endif
                 thisRigidbody.angularVelocity = Vector3.zero;
             }
         }

Runtime/Sites/Scripts/HandInterface.cs

@@ -1,6 +1,4 @@
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
-using UnityEngine;
 
 namespace Passer.Humanoid {
 
@@ -9,7 +7,11 @@ namespace Passer.Humanoid {
 		protected HandTarget handTarget;
 
 		protected void Start() {
+#if UNITY_6000_0_OR_NEWER
+			HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
 			HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
             if (humanoids.Length != 1)
 				return;
 

Runtime/Sites/Scripts/HumanoidInterface.cs

@@ -29,7 +29,11 @@ namespace Passer.Humanoid {
         private void Awake() {
             HumanoidControl humanoidInScene = GetComponentInParent<HumanoidControl>();
             if (humanoidInScene == null) {
+#if UNITY_6000_0_OR_NEWER
+                HumanoidControl[] humanoids = FindObjectsByType<HumanoidControl>(FindObjectsSortMode.None);
+#else
                 HumanoidControl[] humanoids = FindObjectsOfType<HumanoidControl>();
+#endif
                 foreach (HumanoidControl humanoid in humanoids) {
                     if (humanoid.isRemote == false)
                         this.humanoid = humanoid;

Runtime/Sites/Scripts/MouseCursor.cs

@@ -21,7 +21,11 @@ namespace Passer {
         }
 
         private void OnSceneLoad(Scene scene, LoadSceneMode mode) {
+#if UNITY_6000_0_OR_NEWER
+            Canvas[] canvases = FindObjectsByType<Canvas>(FindObjectsSortMode.None);
+#else
             Canvas[] canvases = FindObjectsOfType<Canvas>();
+#endif
             foreach (Canvas canvas in canvases)
                 canvas.worldCamera = Camera.main;
         }

Runtime/Sites/Scripts/Site.cs

@@ -43,7 +43,11 @@ namespace Passer {
 #if UNITY_EDITOR
             UnityEngine.SceneManagement.SceneManager.sceneLoaded += OnSceneLoad;
 
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl humanoid = FindAnyObjectByType<HumanoidControl>();
+#else
             HumanoidControl humanoid = FindObjectOfType<HumanoidControl>();
+#endif
             if (humanoid == null) {
                 string visitorScenePath = HumanoidPreferences.visitorSceneName;
                 if (!string.IsNullOrEmpty(visitorScenePath)) {
@@ -57,17 +61,29 @@ namespace Passer {
 
         private void OnSceneLoad(Scene _, LoadSceneMode _1) {
 #if UNITY_EDITOR
+#if UNITY_6000_0_OR_NEWER
+            SiteNavigator[] siteNavigators = FindObjectsByType<SiteNavigator>(FindObjectsSortMode.None);
+#else
             SiteNavigator[] siteNavigators = FindObjectsOfType<SiteNavigator>();
+#endif
             foreach (SiteNavigator siteNavigator in siteNavigators) {
                 siteNavigator.startScene = null;
                 siteNavigator.startSite = null;
             }
 
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl pawn = FindAnyObjectByType<HumanoidControl>();
+#else
             HumanoidControl pawn = FindObjectOfType<HumanoidControl>();
+#endif
             if (pawn == null)
                 return;
 
+#if UNITY_6000_0_OR_NEWER
+            HumanoidSpawnPoint[] spawnPoints = FindObjectsByType<HumanoidSpawnPoint>(FindObjectsSortMode.None);
+#else
             HumanoidSpawnPoint[] spawnPoints = FindObjectsOfType<HumanoidSpawnPoint>();
+#endif
             foreach (HumanoidSpawnPoint spawnPoint in spawnPoints) {
                 if (spawnPoint.isFree)
                     pawn.transform.position = spawnPoint.transform.position;

Runtime/Sites/Scripts/StartScene.cs

@@ -16,7 +16,11 @@ namespace Passer {
 
 			UnityEngine.SceneManagement.SceneManager.sceneLoaded += OnSceneLoad;
 
+#if UNITY_6000_0_OR_NEWER
+			HumanoidControl pawn = FindAnyObjectByType<HumanoidControl>();
+#else
 			HumanoidControl pawn = FindObjectOfType<HumanoidControl>();
+#endif
             if (pawn == null) {
 				UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName);
 			}
@@ -26,7 +30,11 @@ namespace Passer {
 
 		private void OnSceneLoad(UnityEngine.SceneManagement.Scene _, LoadSceneMode _1) {
 #if UNITY_EDITOR
+#if UNITY_6000_0_OR_NEWER
+			SiteNavigator siteNavigator = FindAnyObjectByType<SiteNavigator>();
+#else
 			SiteNavigator siteNavigator = FindObjectOfType<SiteNavigator>();
+#endif
             if (siteNavigator != null) {
 				siteNavigator.startScene = thisSceneName;
 			}

Runtime/Tools/Physics/HybridPhysics.cs

@@ -229,7 +229,11 @@ namespace Passer {
                 damper = -velocityTowardsTarget * damping;
 
                 //Compensate for absolute rigidbody speed (specifically when on a moving platform)
+#if UNITY_6000_0_OR_NEWER
+                Vector3 residualVelocity = thisRigidbody.linearVelocity - velocityTowardsTarget;
+#else
                 Vector3 residualVelocity = thisRigidbody.velocity - velocityTowardsTarget;
+#endif
                 damper += residualVelocity * 10;
             }
             lastDistanceToTarget = distanceToTarget;

Runtime/Tools/Physics/RigidbodyDisabled.cs

@@ -30,8 +30,13 @@ namespace Passer {
 
         public void CopyFromRigidbody(Rigidbody rb) {
             mass = rb.mass;
+#if UNITY_6000_0_OR_NEWER
+            drag = rb.linearDamping;
+            angularDrag = rb.angularDamping;
+#else
             drag = rb.drag;
             angularDrag = rb.angularDrag;
+#endif
             useGravity = rb.useGravity;
             isKinematic = rb.isKinematic;
             interpolation = rb.interpolation;
@@ -44,8 +49,13 @@ namespace Passer {
 
         public void CopyToRigidbody(Rigidbody rb) {
             rb.mass = mass;
+#if UNITY_6000_0_OR_NEWER
+            rb.linearDamping = drag;
+            rb.angularDamping = angularDrag;
+#else
             rb.drag = drag;
             rb.angularDrag = angularDrag;
+#endif
             rb.useGravity = useGravity;
             rb.isKinematic = isKinematic;
             rb.interpolation = interpolation;

Runtime/Tools/Scripts/HumanoidSpawnPoint.cs

@@ -46,13 +46,17 @@ namespace Passer.Humanoid {
             }
         }
 
-        private void Awake() {
+        protected void Awake() {
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl humanoid = Object.FindAnyObjectByType<HumanoidControl>();
+#else
             HumanoidControl humanoid = FindObjectOfType<HumanoidControl>();
+#endif
             if (humanoid == null)
                 return;
 
-            Vector3 humanoidXZ = new Vector3(humanoid.transform.position.x, 0, humanoid.transform.position.z);
+            Vector3 humanoidXZ = new(humanoid.transform.position.x, 0, humanoid.transform.position.z);
-            Vector3 thisXZ = new Vector3(this.transform.position.x, 0, this.transform.position.z);
+            Vector3 thisXZ = new(this.transform.position.x, 0, this.transform.position.z);
             float distance = Vector3.Distance(humanoidXZ, thisXZ);
             if (distance < radius || isFree)
                 humanoid.transform.MoveTo(this.transform.position);

Runtime/Tools/Scripts/InteractionModule.cs

@@ -121,8 +121,10 @@ namespace Passer {
 
                     focusing = true;
                     return;
-
                 }
+                else
+                    ProcessFocus();
+
                 if (!clicking) { // first activation
                     touchedObject = data.pointerCurrentRaycast.gameObject;
                     if (touchedObject == null) // object is a 3D object, as we do not use Physicsraycaster, use the focusObject
@@ -254,7 +256,11 @@ namespace Passer {
             if (pointers == null)
                 pointers = new InteractionPointer[maxInteractions]; // 0 = left index, 1 = right index, 2 = head, 3 = controller
 
+#if UNITY_6000_0_OR_NEWER
+            EventSystem eventSystem = FindAnyObjectByType<EventSystem>();
+#else
             EventSystem eventSystem = GameObject.FindObjectOfType<EventSystem>();
+#endif
             if (eventSystem == null)
                 eventSystem = humanoid.gameObject.AddComponent<EventSystem>();
 
@@ -344,7 +350,7 @@ namespace Passer {
 
             pointer.ProcessTouch();
         }
-        #endregion
+#endregion
 
         public Vector3 GetFocusPoint(int inputDeviceID) {
             return pointers[inputDeviceID].focusPosition;
@@ -528,18 +534,15 @@ namespace Passer {
             if (Camera.main == null || pointer.type != PointerType.Touch)
                 return;
 
-            //if (eventSystem == null)
-            //    eventSystem = Object.FindObjectOfType<EventSystem>();
-            //if (eventSystem == null)
-            //    return;
-
             pointer.data.position = Camera.main.WorldToScreenPoint(pointer.pointerTransform.position);
+            float distanceToPointer = Vector3.Distance(Camera.main.transform.position, pointer.pointerTransform.position);
 
             System.Collections.Generic.List<RaycastResult> m_RaycastResultCache = new System.Collections.Generic.List<RaycastResult>();
             eventSystem.RaycastAll(pointer.data, m_RaycastResultCache);
-            RaycastResult raycastResult = FindFirstRaycast(m_RaycastResultCache);
+            RaycastResult raycastResult = FindFirstRaycast(m_RaycastResultCache, distanceToPointer);
             m_RaycastResultCache.Clear();
 
+
             if (raycastResult.gameObject != null) {
                 if (pointer.type == PointerType.Touch) {
                     float distance = DistanceTipToTransform(pointer.pointerTransform, raycastResult.gameObject.transform);
@@ -559,9 +562,12 @@ namespace Passer {
             }
         }
 
-        private new RaycastResult FindFirstRaycast(System.Collections.Generic.List<RaycastResult> raycastResults) {
+        private RaycastResult FindFirstRaycast(System.Collections.Generic.List<RaycastResult> raycastResults, float pointerDistance) {
             foreach (RaycastResult result in raycastResults) {
-                if (result.isValid && result.worldPosition != Vector3.zero) {
+                float resultDistance = Vector3.Distance(Camera.main.transform.position, result.worldPosition);
+                if (result.isValid &&
+                    result.worldPosition != Vector3.zero &&
+                    Mathf.Abs(resultDistance - pointerDistance) < 0.02F) {
                     return result;
                 }
             }
@@ -580,7 +586,6 @@ namespace Passer {
         }
 
         private float DistanceTipToTransform(Transform fingerTip, Transform transform) {
-            //Debug.DrawLine(fingerTip.position, transform.position);
             return (-transform.InverseTransformPoint(fingerTip.position).z * transform.lossyScale.z) - 0.01F;
         }
     }

Runtime/Tools/Scripts/InteractionPointer.cs

@@ -224,7 +224,11 @@ namespace Passer {
         protected virtual void Awake() {
             Transform rootTransform = this.transform.root;
 
+#if UNITY_6000_0_OR_NEWER
+            interactionModule = FindAnyObjectByType<InteractionModule>();
+#else
             interactionModule = FindObjectOfType<InteractionModule>();
+#endif
             if (interactionModule == null)
                 interactionModule = CreateInteractionModule();
             EventSystem eventSystem = interactionModule.GetComponent<EventSystem>();
@@ -585,7 +589,11 @@ namespace Passer {
             if (rayType != RayType.Gravity)
                 return;
 
+#if UNITY_6000_0_OR_NEWER
+            rigidbody.linearVelocity = transform.forward * speed;
+#else
             rigidbody.velocity = transform.forward * speed;
+#endif
         }
 
         public void LaunchPrefab(GameObject prefab) {

Runtime/Tools/Scripts/Socket.cs

@@ -694,7 +694,11 @@ namespace Passer {
             Humanoid.HumanoidNetworking.ReenableNetworkSync(objRigidbody.gameObject);
 
             if (thisRigidbody != null) {
+#if UNITY_6000_0_OR_NEWER
+                objRigidbody.linearVelocity = thisRigidbody.linearVelocity;
+#else
                 objRigidbody.velocity = thisRigidbody.velocity;
+#endif
                 objRigidbody.angularVelocity = thisRigidbody.angularVelocity;
             }
 
@@ -761,7 +765,7 @@ namespace Passer {
             }
         }
 
-        #endregion Rigidbody
+#endregion Rigidbody
 
         #region Static Object
 
@@ -807,7 +811,7 @@ namespace Passer {
 
         #endregion Static Object
 
-        #endregion Release
+#endregion Release
 
         #region Start
 

Runtime/Tools/Scripts/Spawner.cs

@@ -54,7 +54,11 @@ namespace Passer {
             if (spawnPoints != null && spawnPoints.Length > 0)
                 return;
 
+#if UNITY_6000_0_OR_NEWER
+            spawnPoints = FindObjectsByType<SpawnPoint>(FindObjectsSortMode.None);
+#else
             spawnPoints = FindObjectsOfType<SpawnPoint>();
+#endif
             if (spawnPoints.Length == 0) {
                 SpawnPoint thisSpawnPoint = this.gameObject.AddComponent<SpawnPoint>();
                 spawnPoints = new SpawnPoint[] { thisSpawnPoint };

Runtime/Visitors/Scripts/UI/SiteDetailsUI.cs

@@ -1,6 +1,4 @@
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.UI;
 
 namespace Passer {
@@ -18,7 +16,7 @@ namespace Passer {
             this.site = site;
         }
 
-        private void OnEnable() {
+        protected void OnEnable() {
             if (site == null)
                 return;
 
@@ -28,7 +26,11 @@ namespace Passer {
         }
 
         private void GoToSite() {
+#if UNITY_6000_0_OR_NEWER
+            SiteNavigator siteNavigator = FindAnyObjectByType<SiteNavigator>();
+#else
             SiteNavigator siteNavigator = FindObjectOfType<SiteNavigator>();
+#endif
             if (siteNavigator == null) {
                 Debug.LogError("Could not find a site navigator");
                 return;

Runtime/Visitors/Scripts/UI/SitesUI.cs

@@ -150,7 +150,11 @@ namespace Passer {
         }
 
         protected void ShowSite(VisitorSites.Site site, int position) {
+#if UNITY_6000_0_OR_NEWER
+            SiteNavigator siteNavigator = FindAnyObjectByType<SiteNavigator>();
+#else
             SiteNavigator siteNavigator = FindObjectOfType<SiteNavigator>();
+#endif
             if (siteNavigator == null)
                 Debug.LogError("Could not find a site navigator");
 
@@ -210,7 +214,7 @@ namespace Passer {
         }
 
 
-        #endregion
+#endregion
 
         public void AddSite(string siteName, string siteLocation) {
             //Debug.Log("Add site " + siteName);
@@ -233,7 +237,11 @@ namespace Passer {
         }
 
         private void GoToSite(VisitorSites.Site site) {
+#if UNITY_6000_0_OR_NEWER
+            SiteNavigator siteNavigator = FindAnyObjectByType<SiteNavigator>();
+#else
             SiteNavigator siteNavigator = FindObjectOfType<SiteNavigator>();
+#endif
             if (siteNavigator == null) {
                 Debug.LogError("Could not find a site navigator");
                 return;

Runtime/Visitors/Scripts/VisitorPossessions.cs

@@ -406,7 +406,11 @@ namespace Passer {
             if (avatarIndex < 0 || avatarIndex > avatars.Count)
                 return;
 
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl humanoid = FindAnyObjectByType<HumanoidControl>();
+#else
             HumanoidControl humanoid = FindObjectOfType<HumanoidControl>();
+#endif
             if (humanoid == null)
                 return;
 
@@ -420,7 +424,11 @@ namespace Passer {
         }
 
         private static IEnumerator RetrieveAvatarAsync(Possession possession) {
+#if UNITY_6000_0_OR_NEWER
+            HumanoidControl humanoid = FindAnyObjectByType<HumanoidControl>();
+#else
             HumanoidControl humanoid = FindObjectOfType<HumanoidControl>();
+#endif
             if (humanoid == null)
                 yield break;
 

Samples~.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5839d837476eba44da4cf96d22142f50
+guid: 86153051f48cf8c488177d8f1b7aedaa
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Samples~/GroceryStore/Materials/Characters/URP.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df1bff1867e6b5e42a3d0019e53e5550
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_ClassicShoes_URP.mat

@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MakeHuman_ClassicShoes_URP
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 15f9cf581a5a2254aa6edfdfbe4bd52d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 15f9cf581a5a2254aa6edfdfbe4bd52d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.9019608}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.9019608}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &4097587806943858480
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_ClassicShoes_URP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00d69c994b1a86745864920089aba4e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Jeans_URP.mat

@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3850664422947448376
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MakeHuman_Jeans_URP
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 150de288aed9a7c4ba456c9450b98189, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 150de288aed9a7c4ba456c9450b98189, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.95686275}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.95686275}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Jeans_URP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 731d624f2e3c1d2488ed97fadc4bdceb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Longsleeve_URP.mat

@@ -0,0 +1,140 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1893634801375650055
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MakeHuman_Longsleeve_URP
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: b87fdb557dfa8d041813fdf2814265f9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 5fc47733312fa6e4192ea4b74d4fe710, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: b87fdb557dfa8d041813fdf2814265f9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.12
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.12
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.2}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.2}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Longsleeve_URP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: accc8d449e971a341b8b5ad32b0ba19c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Skin_URP.mat

@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MakeHuman_Skin_URP
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 278c00b683cc457458bf8db9ba698239, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 10, y: 10}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 278c00b683cc457458bf8db9ba698239, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.775}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.775}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &5771129071352200887
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9

Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Skin_URP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce08b92c0a6a4224d8df78eff1db7d93
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Prefabs/Characters/MakeHuman_simple_TP_URP.prefab

@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7338513305112486102
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 100156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_Name
+      value: MakeHuman_simple_TP_URP
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400156, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700000, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: ce08b92c0a6a4224d8df78eff1db7d93, type: 2}
+    - target: {fileID: 13700002, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 00d69c994b1a86745864920089aba4e6, type: 2}
+    - target: {fileID: 13700004, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 731d624f2e3c1d2488ed97fadc4bdceb, type: 2}
+    - target: {fileID: 13700006, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: accc8d449e971a341b8b5ad32b0ba19c, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d00d05e5d77de9f438f68e5f5367a627, type: 3}

Samples~/GroceryStore/Prefabs/Characters/MakeHuman_simple_TP_URP.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4695857d04e1e734faab072549aa786f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/GroceryStore/Prefabs/Humanoid_URP.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87a7104f748dc43478eb8f4d2fe740cb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: possessions
+  assetBundleVariant: 

Samples~/VisitorsAndSites/Visitors/HumanoidVisitor DesktopSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HumanoidVisitor DesktopSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 0
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 0
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 500
+  m_PVREnvironmentSampleCount: 500
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 0
+  m_PVRFilteringMode: 2
+  m_PVRDenoiserTypeDirect: 0
+  m_PVRDenoiserTypeIndirect: 0
+  m_PVRDenoiserTypeAO: 0
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

Samples~/VisitorsAndSites/Visitors/HumanoidVisitor DesktopSettings.lighting.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6e0423238c61cc34ca60a50acb0505eb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: