Update README to with links to the new repo site

Added URP prefabs and materials
Fix wrong UNITY version in #if
2025-04-16 08:45:51 +02:00 · 2024-11-28 14:02:03 +01:00 · 2024-11-28 13:01:55 +01:00 · 2024-11-28 12:58:15 +01:00 · 2024-11-28 12:57:52 +01:00 · 2024-11-28 12:36:48 +01:00
167 changed files with 45225 additions and 37842 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+Samples
+Samples.meta
+package.json
+package.json.meta
+Samples~.meta
--- a/Editor/HumanoidControl/Pose/Pose_Editor.cs
+++ b/Editor/HumanoidControl/Pose/Pose_Editor.cs
@ -236,7 +236,13 @@ namespace Passer.Humanoid {
                if (bones[i] == null || bones[i].bone == null || bones[i].bone.transform == null)
                    continue;

+#if UNITY_2022_1_OR_NEWER
+                Handles.FreeMoveHandle(bones[i].bone.transform.position, 0.002F, Vector3.zero, DotHandleCapSaveID);
+#else
                Handles.FreeMoveHandle(bones[i].bone.transform.position, bones[i].bone.transform.rotation, 0.002F, Vector3.zero, DotHandleCapSaveID);
+#endif
+
+
                controlIds[i] = lastControlID;
                boneIds[i] = bones[i].boneId;
            }
@ -317,6 +323,6 @@ namespace Passer.Humanoid {
            return;
        }

-        #endregion
+#endregion
    }
 }
--- a/README.md
+++ b/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
 =====
--- a/Runtime/HumanoidControl/GameControllerInputSettings.zip
+++ b/Runtime/HumanoidControl/GameControllerInputSettings.zip
--- a/Runtime/HumanoidControl/GameControllerInputSettings.zip.meta
+++ b/Runtime/HumanoidControl/GameControllerInputSettings.zip.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ddd35f516c607da4ab4f97b210606169
-timeCreated: 1453468358
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Runtime/HumanoidControl/Prefabs/Networking/Characters/EmptyCharacter.prefab
+++ b/Runtime/HumanoidControl/Prefabs/Networking/Characters/EmptyCharacter.prefab
--- a/Runtime/HumanoidControl/Prefabs/Networking/NetworkingStatusCanvas.prefab
+++ b/Runtime/HumanoidControl/Prefabs/Networking/NetworkingStatusCanvas.prefab
@ -1,27 +1,16 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1547744635115364}
-  m_IsPrefabParent: 1
 --- !u!1 &1102845541656492
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 224080167443833264}
  - component: {fileID: 222382479412892260}
  - component: {fileID: 114935358240423544}
-  - component: {fileID: 114123306642843232}
  m_Layer: 0
  m_Name: Text
  m_TagString: Untagged
@ -29,91 +18,53 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1547744635115364
-GameObject:
+--- !u!224 &224080167443833264
+RectTransform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224268792594220398}
-  - component: {fileID: 223133106560874972}
-  - component: {fileID: 114215111648024090}
-  - component: {fileID: 114000307814322182}
-  m_Layer: 0
-  m_Name: NetworkingStatusCanvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &114000307814322182
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1547744635115364}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
--- !u!114 &114123306642843232
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1102845541656492}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d7994b261fec79c4a9a1c329820642f3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!114 &114215111648024090
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1547744635115364}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 224268792594220398}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &222382479412892260
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1102845541656492}
+  m_CullTransparentMesh: 1
 --- !u!114 &114935358240423544
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1102845541656492}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
    m_FontSize: 14
@ -128,17 +79,51 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: New Text
--- !u!222 &222382479412892260
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1102845541656492}
+--- !u!1 &1547744635115364
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224268792594220398}
+  - component: {fileID: 223133106560874972}
+  - component: {fileID: 114215111648024090}
+  - component: {fileID: 114000307814322182}
+  m_Layer: 0
+  m_Name: NetworkingStatusCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &224268792594220398
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1547744635115364}
+  m_LocalRotation: {x: -0.0000015646192, y: -0.0000072655666, z: -0.0000067270753, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.5}
+  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 224080167443833264}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223133106560874972
 Canvas:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1547744635115364}
  m_Enabled: 1
  serializedVersion: 3
@ -150,45 +135,49 @@ Canvas:
  m_OverrideSorting: 0
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
--- !u!224 &224080167443833264
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1102845541656492}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 224268792594220398}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224268792594220398
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+--- !u!114 &114215111648024090
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1547744635115364}
-  m_LocalRotation: {x: -0.0000015646192, y: -0.0000072655666, z: -0.0000067270753,
-    w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.5}
-  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
-  m_Children:
-  - {fileID: 224080167443833264}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &114000307814322182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1547744635115364}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
--- a/Runtime/HumanoidControl/Prefabs/Networking/Resources/RemoteHumanoid.prefab
+++ b/Runtime/HumanoidControl/Prefabs/Networking/Resources/RemoteHumanoid.prefab
--- a/Runtime/HumanoidControl/Scripts/Extensions/Oculus/OculusHandSkeleton.cs
+++ b/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;
--- a/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Left
+++ b/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Left
@ -1,84 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1103073703406032}
-  m_IsPrefabParent: 1
--- !u!1 &1103073703406032
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4808734570168326}
-  - component: {fileID: 33781626903072926}
-  - component: {fileID: 23539047341558740}
-  m_Layer: 0
-  m_Name: Left Quest Controller
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4808734570168326
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1103073703406032}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23539047341558740
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1103073703406032}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: dc3b3568b7c54234f9d6a9f7297c3425, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!33 &33781626903072926
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1103073703406032}
-  m_Mesh: {fileID: 4300000, guid: a533ecc148345874ca68507932792b9e, type: 3}
--- a/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Right
+++ b/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Right
@ -1,84 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1038420493408916}
-  m_IsPrefabParent: 1
--- !u!1 &1038420493408916
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4210319229959686}
-  - component: {fileID: 33256649974969318}
-  - component: {fileID: 23472074526415768}
-  m_Layer: 0
-  m_Name: Right Quest Controller
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4210319229959686
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1038420493408916}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23472074526415768
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1038420493408916}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: dc3b3568b7c54234f9d6a9f7297c3425, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!33 &33256649974969318
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1038420493408916}
-  m_Mesh: {fileID: 4300000, guid: 6d5af71f44006e9478341b87a6c2867b, type: 3}
--- a/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Right
+++ b/Runtime/HumanoidControl/Scripts/Extensions/Oculus/Resources/Right
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f78c353d457baeb44987e0ae9bc0a529
-timeCreated: 1562924724
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Runtime/HumanoidControl/Scripts/Extensions/UnityXR/UnityXR.cs
+++ b/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

--- a/Runtime/HumanoidControl/Scripts/HumanoidControl.cs
+++ b/Runtime/HumanoidControl/Scripts/HumanoidControl.cs
@ -2140,6 +2140,8 @@ namespace Passer.Humanoid {
        /// Correct floating avatars when user is taller than the avatar
        /// </summary>
        public bool floatCorrection = false;
+        public bool floatReverting = false;
+        private float floatCorrectionDistance = 0.0F;

        protected void CheckGrounded() {
            Vector3 footBase = GetHumanoidPosition();
@ -2179,8 +2181,24 @@ namespace Passer.Humanoid {
            if (floatCorrection) {
                float leftFootBoneDistance = leftFootTarget.foot.bone.transform.position.y - leftFootTarget.foot.target.transform.position.y;
                float rightFootBoneDistance = rightFootTarget.foot.bone.transform.position.y - rightFootTarget.foot.target.transform.position.y;
-                if (leftFootBoneDistance > 0.02F && rightFootBoneDistance > 0.02F)
-                    AdjustTrackingHeight(-0.01F);
+                if (leftFootBoneDistance > 0.02F && rightFootBoneDistance > 0.02F) {
+                    float correction = -0.01F;
+                    AdjustTrackingHeight(correction);
+                    floatCorrectionDistance += correction;
+                    Debug.Log($"{floatCorrectionDistance} {leftFootBoneDistance} {rightFootBoneDistance}");
+                }
+            }
+            if (floatReverting && floatCorrectionDistance < 0) {
+                float leftFootDistance = leftFootTarget.upperLeg.bone.transform.position.y - leftFootTarget.foot.bone.transform.position.y;
+                float leftBendingDistance = (leftFootTarget.upperLeg.bone.length + leftFootTarget.lowerLeg.bone.length) - leftFootDistance;
+                float rightFootDistance = rightFootTarget.upperLeg.bone.transform.position.y - rightFootTarget.foot.bone.transform.position.y;
+                float rightBendingDistance = (rightFootTarget.upperLeg.bone.length + rightFootTarget.lowerLeg.bone.length) - rightFootDistance;
+                if (leftBendingDistance > 0.02 && rightBendingDistance > 0.02) {
+                    float correction = +0.01F;
+                    AdjustTrackingHeight(correction);
+                    floatCorrectionDistance += correction;
+                    Debug.Log($"{floatCorrectionDistance} {leftBendingDistance} {rightBendingDistance}");
+                }
            }
        }

--- a/Runtime/HumanoidControl/Scripts/Interaction/HandInteraction.cs
+++ b/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>();
                }
@ -673,23 +677,22 @@ namespace Passer.Humanoid {

        protected virtual bool GrabRigidbodyParenting(Rigidbody objRigidbody) {
            GameObject obj = objRigidbody.gameObject;
-            if (handRigidbody == null) {
+            if (handRigidbody == null)
                Debug.LogError("Hand no longer has a rigidbody...");
-            }

-            RigidbodyDisabled.ParentRigidbody(handRigidbody, objRigidbody);
            if (handRigidbody != null)
-                handRigidbody.mass = objRigidbody.mass;                
-
+                handRigidbody.mass = objRigidbody.mass;

            HumanoidNetworking.DisableNetworkSync(objRigidbody.gameObject);
            if (!humanoid.isRemote)
                HumanoidNetworking.TakeOwnership(objRigidbody.gameObject);

-            if (Application.isPlaying)
-                Object.Destroy(objRigidbody);
-            else
-                Object.DestroyImmediate(objRigidbody, true);
+            RigidbodyDisabled.ParentRigidbody(handRigidbody, objRigidbody);
+
+            //if (Application.isPlaying)
+            //    Object.Destroy(objRigidbody);
+            //else
+            //    Object.DestroyImmediate(objRigidbody, true);
            grabbedObject = obj;

            return true;
@ -826,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,8 +860,14 @@ namespace Passer.Humanoid {
                }
                //grabbedRigidbody.centerOfMass = handTarget.storedCOM;

-                grabbedRigidbody.velocity = handRigidbody.velocity;
-                grabbedRigidbody.angularVelocity = handRigidbody.angularVelocity;
+                if (grabbedRigidbody.isKinematic == false) {
+#if UNITY_6000_0_OR_NEWER
+                    grabbedRigidbody.linearVelocity = handRigidbody.linearVelocity;
+#else
+                    grabbedRigidbody.velocity = handRigidbody.velocity;
+#endif
+                    grabbedRigidbody.angularVelocity = handRigidbody.angularVelocity;
+                }

                if (grabbedHandle != null)
                    LetGoHandle(grabbedHandle);
--- a/Runtime/HumanoidControl/Scripts/Movements/HandMovements.cs
+++ b/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;
--- a/Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs
+++ b/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;
--- a/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerPunVoice.cs
+++ b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerPunVoice.cs
@ -1,9 +0,0 @@
-using UnityEngine;
-
-namespace Passer.Humanoid {
-
-#if !hPUNVOICE2
-    public partial class HumanoidPlayerPunVoice : MonoBehaviour {
-    }
-#endif
-}
--- a/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerPunVoice.cs.meta
+++ b/Runtime/HumanoidControl/Scripts/Networking/HumanoidPlayerPunVoice.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c48e8d9c90f89154daf3a86de9a5f2ad
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Runtime/HumanoidControl/Scripts/Networking/NetworkingStatusUI.cs
+++ b/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
        }
    }
--- a/Runtime/HumanoidControl/Scripts/Networking/PhotonPun/HumanoidPlayerPun.cs
+++ b/Runtime/HumanoidControl/Scripts/Networking/PhotonPun/HumanoidPlayerPun.cs
@ -1,5 +1,5 @@
-using UnityEngine;
-#if hNW_PHOTON
+#if hNW_PHOTON
+using UnityEngine;
 using System.Collections.Generic;
 #endif
 #if hPHOTON2
@ -7,6 +7,7 @@ using Photon.Realtime;
 using Photon.Pun;
 #endif

+
 namespace Passer.Humanoid {
    using Pawn;

--- a/Runtime/HumanoidControl/Scripts/Networking/PhotonPun/HumanoidPlayerPunVoice.cs
+++ b/Runtime/HumanoidControl/Scripts/Networking/PhotonPun/HumanoidPlayerPunVoice.cs
@ -6,7 +6,7 @@ using Photon.Pun;
 namespace Passer.Humanoid {

 #if !hPUNVOICE2
-    public partial class HumanoidPlayerPunVoice : MonoBehaviour {
+    public class HumanoidPlayerPunVoice : MonoBehaviour {
 #else
    public class HumanoidPlayerPunVoice : MonoBehaviourPunCallbacks {
 #endif    
--- a/Runtime/HumanoidControl/Scripts/Physics/HandPhysics.cs
+++ b/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);

--- a/Runtime/HumanoidControl/Scripts/Physics/RigidbodyData.cs
+++ b/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;
--- a/Runtime/HumanoidControl/Scripts/Resources/HumanoidTargetsRig.prefab
+++ b/Runtime/HumanoidControl/Scripts/Resources/HumanoidTargetsRig.prefab
--- a/Runtime/HumanoidControl/Scripts/Resources/HumanoidTargetsRig.prefab.meta
+++ b/Runtime/HumanoidControl/Scripts/Resources/HumanoidTargetsRig.prefab.meta
@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 94cc904628763c548944b198ccc94346
-timeCreated: 1486644658
-licenseType: Free
-NativeFormatImporter:
+guid: 3cec17721dc9fb0499bab2210c9bf0ac
+PrefabImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Runtime/HumanoidControl/Scripts/Resources/Models.meta
+++ b/Runtime/HumanoidControl/Scripts/Resources/Models.meta
@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 02da7ec8c993b874381f34377f818316
+guid: 6abcb3631639c01478d992ecbd8dc39a
 folderAsset: yes
-timeCreated: 1486643408
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Runtime/HumanoidControl/Scripts/Resources/Models/HumanoidTargets.fbx
+++ b/Runtime/HumanoidControl/Scripts/Resources/Models/HumanoidTargets.fbx
--- a/Runtime/HumanoidControl/Scripts/Targets/FootTarget.cs
+++ b/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

--- a/Runtime/HumanoidControl/Scripts/Targets/HandTarget.cs
+++ b/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;
--- a/Runtime/HumanoidControl/Scripts/Targets/HeadTarget.cs
+++ b/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
    }
 }
--- a/Runtime/HumanoidControl/Scripts/Targets/HipsTarget.cs
+++ b/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

--- a/Runtime/HumanoidControl/Scripts/Tools/FlashLight.cs
+++ b/Runtime/HumanoidControl/Scripts/Tools/FlashLight.cs
@ -1,33 +1,36 @@
 using System.Collections;
 using UnityEngine;

-public class FlashLight : MonoBehaviour {
+namespace Passer {

-    protected Light thisLight;
+    public class FlashLight : MonoBehaviour {

-    public float duration = 0.1F;
+        protected Light thisLight;

-    protected virtual void Awake() {
-        thisLight = GetComponent<Light>();
+        public float duration = 0.1F;
+
+        protected virtual void Awake() {
+            thisLight = GetComponent<Light>();
+        }
+
+        public void Flash() {
+            Flash(duration);
+        }
+
+        public void Flash(float duration) {
+            if (thisLight == null)
+                return;
+
+            StartCoroutine(FlashRoutine(thisLight, duration));
+        }
+
+        protected IEnumerator FlashRoutine(Light light, float duration) {
+            if (light == null)
+                yield return null;
+
+            light.enabled = true;
+            yield return new WaitForSeconds(duration);
+            light.enabled = false;
+        }
    }
-
-    public void Flash() {
-        Flash(duration);
-    }
-
-    public void Flash(float duration) {
-        if (thisLight == null)
-            return;
-
-        StartCoroutine(FlashRoutine(thisLight, duration));
-    }
-
-    protected IEnumerator FlashRoutine(Light light, float duration) {
-        if (light == null)
-            yield return null;
-
-        light.enabled = true;
-        yield return new WaitForSeconds(duration);
-        light.enabled = false;
-    }
-}
+}
--- a/Runtime/HumanoidControl/Scripts/Tools/Hit.cs
+++ b/Runtime/HumanoidControl/Scripts/Tools/Hit.cs
@ -1,8 +1,12 @@
 using UnityEngine;

-public class Hit : MonoBehaviour {
+namespace Passer {

-    public void HitMe() {
-        Debug.Log("AU!");
+    public class Hit : MonoBehaviour {
+
+        public void HitMe() {
+            Debug.Log("AU!");
+        }
    }
-}
+
+}
--- a/Runtime/HumanoidControl/Scripts/Tools/MenuManager.cs
+++ b/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];
--- a/Runtime/HumanoidControl/Scripts/Tools/Redrop.cs
+++ b/Runtime/HumanoidControl/Scripts/Tools/Redrop.cs
@ -1,39 +1,47 @@
 using UnityEngine;

-public class Redrop : MonoBehaviour {
+namespace Passer {

-    // Script which is to be replaced by CollisionEventHandler
+    public class Redrop : MonoBehaviour {

-    public Collider groundCollider;
+        // Script which is to be replaced by CollisionEventHandler

-    private Rigidbody thisRigidbody;
-    private Vector3 startPosition;
-    private Quaternion startRotation;
+        public Collider groundCollider;

-    void Start() {
-        startPosition = transform.position;
-        startRotation = transform.rotation;
-    }
+        private Rigidbody thisRigidbody;
+        private Vector3 startPosition;
+        private Quaternion startRotation;

-    void Update() {
-        if (groundCollider == null && transform.position.y < 0) {
-            MoveToStart();
+        protected void Start() {
+            startPosition = transform.position;
+            startRotation = transform.rotation;
+        }
+
+        protected void Update() {
+            if (groundCollider == null && transform.position.y < 0) {
+                MoveToStart();
+            }
+        }
+
+        protected void OnCollisionEnter(Collision collision) {
+            if (collision.collider == groundCollider) {
+                MoveToStart();
+            }
+        }
+
+        private void MoveToStart() {
+            thisRigidbody = transform.GetComponent<Rigidbody>();
+            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;
+            }
        }
    }

-    private void OnCollisionEnter(Collision collision) {
-        if (collision.collider == groundCollider) {
-            MoveToStart();
-        }
-    }
-
-    private void MoveToStart() {
-        thisRigidbody = transform.GetComponent<Rigidbody>();
-        if (thisRigidbody != null) {
-            thisRigidbody.MovePosition(new Vector3(startPosition.x, startPosition.y + 0.1F, startPosition.z));
-            thisRigidbody.MoveRotation(startRotation);
-            thisRigidbody.velocity = Vector3.zero;
-            thisRigidbody.angularVelocity = Vector3.zero;
-        }
-    }
-}
+}
--- a/Runtime/HumanoidControl/Scripts/Tools/SceneLoader.cs
+++ b/Runtime/HumanoidControl/Scripts/Tools/SceneLoader.cs
@ -4,31 +4,42 @@ using UnityEngine.SceneManagement;
 using UnityEditor;
 using UnityEditor.SceneManagement;

+namespace Passer {

-[InitializeOnLoad]
-public class SceneLoader {
-    static SceneLoader() {
-        EditorSceneManager.sceneOpened += SceneOpened;
-    }
-
-    private static void SceneOpened(Scene scene, OpenSceneMode mode) {
-        if ((scene.name == "ObjectTable Pawn" ||
-            scene.name == "ObjectTable Pawn VR" ||
-            scene.name == "ObjectTable Humanoid") &&
-            EditorSceneManager.loadedSceneCount == 1) {
-
-            //Debug.Log("Additive opening ObjectTable scene");
-            EditorSceneManager.OpenScene("Assets/PawnControl/Demo/Environments/ObjectTable.unity", OpenSceneMode.Additive);
-        }
-        else if ((scene.name == "ShootingRange Pawn" ||
-            scene.name == "ShootingRange Pawn VR" ||
-            scene.name == "ShootingRange Humanoid") &&
-            EditorSceneManager.loadedSceneCount == 1) {
-
-            //Debug.Log("Additive opening ShootingRange scene");
-            EditorSceneManager.OpenScene("Assets/PawnControl/Demo/Environments/ShootingRange.unity", OpenSceneMode.Additive);
+    [InitializeOnLoad]
+    public class SceneLoader {
+        static SceneLoader() {
+            EditorSceneManager.sceneOpened += SceneOpened;
        }

+        private static void SceneOpened(Scene scene, OpenSceneMode mode) {
+            if ((scene.name == "ObjectTable Pawn" ||
+                scene.name == "ObjectTable Pawn VR" ||
+                scene.name == "ObjectTable Humanoid")
+#if UNITY_2022_2_OR_NEWER
+                && UnityEngine.SceneManagement.SceneManager.loadedSceneCount == 1
+#else
+                && EditorSceneManager.loadedSceneCount == 1
+#endif
+                ) {
+                //Debug.Log("Additive opening ObjectTable scene");
+                EditorSceneManager.OpenScene("Assets/PawnControl/Demo/Environments/ObjectTable.unity", OpenSceneMode.Additive);
+            }
+            else if ((scene.name == "ShootingRange Pawn" ||
+                scene.name == "ShootingRange Pawn VR" ||
+                scene.name == "ShootingRange Humanoid")
+#if UNITY_2022_2_OR_NEWER
+                && UnityEngine.SceneManagement.SceneManager.loadedSceneCount == 1
+#else
+                && EditorSceneManager.loadedSceneCount == 1
+#endif
+                ) { 
+                //Debug.Log("Additive opening ShootingRange scene");
+                EditorSceneManager.OpenScene("Assets/PawnControl/Demo/Environments/ShootingRange.unity", OpenSceneMode.Additive);
+            }
+
+        }
    }
+
 }
 #endif
--- a/Runtime/Sites/Scripts/HandInterface.cs
+++ b/Runtime/Sites/Scripts/HandInterface.cs
@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;

 namespace Passer.Humanoid {

@ -9,8 +7,12 @@ 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>();
-			if (humanoids.Length != 1)
+#endif
+            if (humanoids.Length != 1)
 				return;

 			handTarget = isLeft ? humanoids[0].leftHandTarget : humanoids[0].rightHandTarget;
--- a/Runtime/Sites/Scripts/HumanoidInterface.cs
+++ b/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;
@ -197,7 +201,7 @@ namespace Passer.Humanoid {
            SiteNavigator siteNavigator = humanoid.GetComponentInChildren<SiteNavigator>();
            siteNavigator.GoBack();
        }
-#endif 
+#endif
    }

 }
--- a/Runtime/Sites/Scripts/MouseCursor.cs
+++ b/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;
        }
--- a/Runtime/Sites/Scripts/RigidbodyTools.cs
+++ b/Runtime/Sites/Scripts/RigidbodyTools.cs
@ -1,6 +1,6 @@
 using UnityEngine;

-//namespace Passer {
+namespace Passer {

 	public static class RigidbodyTools {
 		public static void DestroyGameObject(this Rigidbody rigidbody) {
@ -8,4 +8,4 @@
        }
 	}

-//}
+}
--- a/Runtime/Sites/Scripts/Site.cs
+++ b/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;
--- a/Runtime/Sites/Scripts/SiteNavigator.cs
+++ b/Runtime/Sites/Scripts/SiteNavigator.cs
@ -87,7 +87,7 @@ namespace Passer {
                UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode(startScene, new LoadSceneParameters(LoadSceneMode.Additive));
                currentSite = new HistoryEntry() {
                    siteName = "directload",
-                    siteLocation = "passervr.com/sites/start",
+                    siteLocation = "serrarens.nl/sites/start",
                    scenePath = "",
                    assetBundle = currentAssetBundle,
                };
@ -248,7 +248,7 @@ namespace Passer {

            UnityEngine.UI.Text text = dialogObj.AddComponent<UnityEngine.UI.Text>();
            text.text = dialogText;
-            text.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
+            text.font = Resources.GetBuiltinResource<Font>("LegacyRuntime.ttf");
            text.resizeTextForBestFit = true;
            text.alignment = TextAnchor.MiddleCenter;

--- a/Runtime/Sites/Scripts/StartScene.cs
+++ b/Runtime/Sites/Scripts/StartScene.cs
@ -16,8 +16,12 @@ namespace Passer {

 			UnityEngine.SceneManagement.SceneManager.sceneLoaded += OnSceneLoad;

+#if UNITY_6000_0_OR_NEWER
+			HumanoidControl pawn = FindAnyObjectByType<HumanoidControl>();
+#else
 			HumanoidControl pawn = FindObjectOfType<HumanoidControl>();
-			if (pawn == null) {
+#endif
+            if (pawn == null) {
 				UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName);
 			}
 			DontDestroyOnLoad(this.gameObject);
@ -26,8 +30,12 @@ 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>();
-			if (siteNavigator != null) {
+#endif
+            if (siteNavigator != null) {
 				siteNavigator.startScene = thisSceneName;
 			}
 #endif
--- a/Runtime/Tools/Input/ControllerDebugger.cs
+++ b/Runtime/Tools/Input/ControllerDebugger.cs
@ -1,66 +1,68 @@
 using UnityEngine;
 using System.Collections;

-using Passer;
+namespace Passer {

-public class ControllerDebugger : MonoBehaviour {
+    public class ControllerDebugger : MonoBehaviour {

-    [System.Serializable]
-    public struct ControllerSideDebugger {
-        public float stickHorizontal;
-        public float stickVertical;
-        public bool stickButton;
-        public bool stickTouch;
+        [System.Serializable]
+        public struct ControllerSideDebugger {
+            public float stickHorizontal;
+            public float stickVertical;
+            public bool stickButton;
+            public bool stickTouch;

-        public float touchpadHorizontal;
-        public float touchpadVertical;
-        public bool touchpadButton;
-        public bool touchpadTouch;
+            public float touchpadHorizontal;
+            public float touchpadVertical;
+            public bool touchpadButton;
+            public bool touchpadTouch;

-        public bool[] buttons;
+            public bool[] buttons;

-        public float bumper;
-        public float trigger;
+            public float bumper;
+            public float trigger;

-        public bool option;
+            public bool option;
+        }
+
+        public ControllerSideDebugger left;
+        public ControllerSideDebugger right;
+
+        private Controller controller;
+
+        private void Start() {
+            controller = Controllers.GetController(0);
+
+            left.buttons = new bool[4];
+            right.buttons = new bool[4];
+        }
+
+        private void Update() {
+            UpdateSide(ref left, controller.left);
+            UpdateSide(ref right, controller.right);
+        }
+
+        void UpdateSide(ref ControllerSideDebugger sideDebugger, ControllerSide controllerSide) {
+            sideDebugger.stickHorizontal = controllerSide.stickHorizontal;
+            sideDebugger.stickVertical = controllerSide.stickVertical;
+            sideDebugger.stickButton = controllerSide.stickButton;
+            sideDebugger.stickTouch = controllerSide.stickTouch;
+
+            sideDebugger.touchpadHorizontal = controllerSide.touchpadHorizontal;
+            sideDebugger.touchpadVertical = controllerSide.touchpadVertical;
+            sideDebugger.touchpadButton = controllerSide.touchpadPress;
+            sideDebugger.touchpadTouch = controllerSide.touchpadTouch;
+
+            sideDebugger.buttons[0] = controllerSide.buttons[0];
+            sideDebugger.buttons[1] = controllerSide.buttons[1];
+            sideDebugger.buttons[2] = controllerSide.buttons[2];
+            sideDebugger.buttons[3] = controllerSide.buttons[3];
+
+            sideDebugger.bumper = controllerSide.trigger1;
+            sideDebugger.trigger = controllerSide.trigger2;
+
+            sideDebugger.option = controllerSide.option;
+        }
    }

-    public ControllerSideDebugger left;
-    public ControllerSideDebugger right;
-
-    private Controller controller;
-
-	private void Start () {
-        controller = Controllers.GetController(0);
-
-        left.buttons = new bool[4];
-        right.buttons = new bool[4];
-	}
-	
-	private void Update () {
-        UpdateSide(ref left, controller.left);
-        UpdateSide(ref right, controller.right);
-	}
-
-    void UpdateSide(ref ControllerSideDebugger sideDebugger, ControllerSide controllerSide) {
-        sideDebugger.stickHorizontal = controllerSide.stickHorizontal;
-        sideDebugger.stickVertical = controllerSide.stickVertical;
-        sideDebugger.stickButton = controllerSide.stickButton;
-        sideDebugger.stickTouch = controllerSide.stickTouch;
-
-        sideDebugger.touchpadHorizontal = controllerSide.touchpadHorizontal;
-        sideDebugger.touchpadVertical = controllerSide.touchpadVertical;
-        sideDebugger.touchpadButton = controllerSide.touchpadPress;
-        sideDebugger.touchpadTouch = controllerSide.touchpadTouch;
-
-        sideDebugger.buttons[0] = controllerSide.buttons[0];
-        sideDebugger.buttons[1] = controllerSide.buttons[1];
-        sideDebugger.buttons[2] = controllerSide.buttons[2];
-        sideDebugger.buttons[3] = controllerSide.buttons[3];
-
-        sideDebugger.bumper = controllerSide.trigger1;
-        sideDebugger.trigger = controllerSide.trigger2;
-
-        sideDebugger.option = controllerSide.option;
-    }
-}
+}
--- a/Runtime/Tools/Physics/HybridPhysics.cs
+++ b/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;
--- a/Runtime/Tools/Physics/RigidbodyDisabled.cs
+++ b/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;
--- a/Runtime/Tools/Scripts/HumanoidSpawnPoint.cs
+++ b/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 thisXZ = new Vector3(this.transform.position.x, 0, this.transform.position.z);
+            Vector3 humanoidXZ = new(humanoid.transform.position.x, 0, humanoid.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);
@ -103,6 +107,6 @@ namespace Passer.Humanoid {
            Gizmos.DrawLine(pos, lastPos);
        }

-        #endregion 
+        #endregion
    }
 }
--- a/Runtime/Tools/Scripts/InteractionModule.cs
+++ b/Runtime/Tools/Scripts/InteractionModule.cs
@ -112,7 +112,7 @@ namespace Passer {
                    // This is not working, because Unity may set this to the wrong object autonomously
                    //touchedObject = data.pointerCurrentRaycast.gameObject;
                    //if (touchedObject == null) {// object is a 3D object, as we do not use Physicsraycaster, use the focusObject
-                        touchedObject = focusObject;
+                    touchedObject = focusObject;
                    //}
                    DebugLog("Touch " + touchedObject);

@ -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,10 +562,14 @@ 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)
+                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;
+                }
            }
            return new RaycastResult();
        }
@ -579,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;
        }
    }
--- a/Runtime/Tools/Scripts/InteractionPointer.cs
+++ b/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) {
--- a/Runtime/Tools/Scripts/Socket.cs
+++ b/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

--- a/Runtime/Tools/Scripts/Spawner.cs
+++ b/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 };
--- a/Runtime/Visitors/Scripts/ShowVisitorName.cs
+++ b/Runtime/Visitors/Scripts/ShowVisitorName.cs
@ -1,18 +1,17 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;

-public class ShowVisitorName : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
+namespace Passer {
+
+    public class ShowVisitorName : MonoBehaviour {
+        // Start is called before the first frame update
+        void Start() {
+
+        }
+
+        // Update is called once per frame
+        void Update() {
+
+        }
    }

-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
+}
--- a/Runtime/Visitors/Scripts/ToggleActive.cs
+++ b/Runtime/Visitors/Scripts/ToggleActive.cs
@ -1,8 +1,12 @@
 using UnityEngine;

-public class ToggleActive : MonoBehaviour {
-    // Temporary helper script to implement toggling the gameobject active state
-    public void Toggle() {
-        this.gameObject.SetActive(!this.gameObject.activeSelf);
+namespace Passer {
+
+    public class ToggleActive : MonoBehaviour {
+        // Temporary helper script to implement toggling the gameobject active state
+        public void Toggle() {
+            this.gameObject.SetActive(!this.gameObject.activeSelf);
+        }
    }
-}
+
+}
--- a/Runtime/Visitors/Scripts/UI/SiteDetailsUI.cs
+++ b/Runtime/Visitors/Scripts/UI/SiteDetailsUI.cs
@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+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;
--- a/Runtime/Visitors/Scripts/UI/SitesUI.cs
+++ b/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;
--- a/Runtime/Visitors/Scripts/VisitorPossessions.cs
+++ b/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;

--- a/Runtime/HumanoidControl/Scripts/Resources/Materials.meta
+++ b/Runtime/HumanoidControl/Scripts/Resources/Materials.meta
@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: cc84ac7c95c473c44b97c107602087b7
+guid: 86153051f48cf8c488177d8f1b7aedaa
 folderAsset: yes
-timeCreated: 1486643266
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Samples~/GroceryStore/Environments/GroceryStore.prefab
+++ b/Samples~/GroceryStore/Environments/GroceryStore.prefab
--- a/Samples~/GroceryStore/Materials/Characters/URP.meta
+++ b/Samples~/GroceryStore/Materials/Characters/URP.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df1bff1867e6b5e42a3d0019e53e5550
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_ClassicShoes_URP.mat
+++ b/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
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_ClassicShoes_URP.mat.meta
+++ b/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_ClassicShoes_URP.mat.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 2e0c7704bf3970441b92fbc43c5ff251
+guid: 00d69c994b1a86745864920089aba4e6
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Jeans_URP.mat
+++ b/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
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Jeans_URP.mat.meta
+++ b/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Jeans_URP.mat.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 5f4a7b3d888e9aa45a99a1076a352e6e
+guid: 731d624f2e3c1d2488ed97fadc4bdceb
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Longsleeve_URP.mat
+++ b/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
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Longsleeve_URP.mat.meta
+++ b/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Longsleeve_URP.mat.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f288e74f24dec3949aed8e4f550c4b83
-timeCreated: 1486643266
-licenseType: Free
+guid: accc8d449e971a341b8b5ad32b0ba19c
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Skin_URP.mat
+++ b/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
--- a/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Skin_URP.mat.meta
+++ b/Samples~/GroceryStore/Materials/Characters/URP/MakeHuman_Skin_URP.mat.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 0e0e467473c4c304691fb218ad5d5411
-timeCreated: 1562924722
-licenseType: Free
+guid: ce08b92c0a6a4224d8df78eff1db7d93
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Bucket/Bucket.prefab
+++ b/Samples~/GroceryStore/Models/Bucket/Bucket.prefab
@ -3,9 +3,10 @@
 --- !u!1 &100000
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 400000}
  m_Layer: 0
@ -15,12 +16,31 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!4 &400000
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100000}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 819426745863577789}
+  - {fileID: 400002}
+  - {fileID: 8798210364446790789}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &100002
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 400002}
  - component: {fileID: 3300000}
@ -34,443 +54,112 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &100004
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400004}
-  - component: {fileID: 3300002}
-  - component: {fileID: 2300002}
-  - component: {fileID: 13600000}
-  m_Layer: 0
-  m_Name: mesh0%root%0%
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &100006
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400006}
-  - component: {fileID: 5400004}
-  - component: {fileID: 5900000}
-  m_Layer: 0
-  m_Name: Emmer-Handvat
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &100008
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400008}
-  - component: {fileID: 3300004}
-  - component: {fileID: 2300004}
-  - component: {fileID: 6400000}
-  m_Layer: 0
-  m_Name: mesh0%root%1%
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &100010
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400010}
-  - component: {fileID: 3300006}
-  - component: {fileID: 2300006}
-  m_Layer: 0
-  m_Name: mesh0%root%0%
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &100012
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400012}
-  - component: {fileID: 5400000}
-  m_Layer: 0
-  m_Name: Emmer_100_99_100
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &400000
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100000}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 400012}
-  - {fileID: 400002}
-  - {fileID: 400006}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &400002
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100002}
+  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 400000}
-  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &400004
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100004}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 400006}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &400006
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100006}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.0000166893, y: 0.46408212, z: -0.00036907196}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 400004}
-  m_Father: {fileID: 400000}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &400008
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100008}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 400010}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &400010
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100010}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 400008}
-  m_Father: {fileID: 400012}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &400012
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100012}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 400010}
-  m_Father: {fileID: 400000}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100002}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: e817da7ab6ed0c446af2182934ed0e28, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!23 &2300002
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100004}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: de6a2023f50748744956c008af08b773, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!23 &2300004
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100008}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: de6a2023f50748744956c008af08b773, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!23 &2300006
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100010}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: e817da7ab6ed0c446af2182934ed0e28, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
 --- !u!33 &3300000
 MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100002}
-  m_Mesh: {fileID: 4300006, guid: 53a999c6120664e48a5b3f59e08a1af1, type: 3}
--- !u!33 &3300002
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100004}
-  m_Mesh: {fileID: 4300000, guid: 51cef21fb8bc88c4bb4afcca6b6532f6, type: 3}
--- !u!33 &3300004
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100008}
-  m_Mesh: {fileID: 4300002, guid: 53a999c6120664e48a5b3f59e08a1af1, type: 3}
--- !u!33 &3300006
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100010}
-  m_Mesh: {fileID: 4300000, guid: 53a999c6120664e48a5b3f59e08a1af1, type: 3}
--- !u!54 &5400000
-Rigidbody:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100012}
-  serializedVersion: 2
-  m_Mass: 5
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_Mesh: {fileID: 4300006, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+--- !u!23 &2300000
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100002}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e817da7ab6ed0c446af2182934ed0e28, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!54 &5400002
 Rigidbody:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100002}
-  serializedVersion: 2
+  serializedVersion: 4
  m_Mass: 1
  m_Drag: 0
  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
  m_UseGravity: 1
  m_IsKinematic: 0
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
--- !u!54 &5400004
-Rigidbody:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100006}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
--- !u!59 &5900000
-HingeJoint:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100006}
-  m_ConnectedBody: {fileID: 5400002}
-  m_Anchor: {x: 0, y: 0, z: 0}
-  m_Axis: {x: 1, y: 0, z: 0}
-  m_AutoConfigureConnectedAnchor: 1
-  m_ConnectedAnchor: {x: 0.000016689346, y: 0.46408212, z: -0.000369072}
-  m_UseSpring: 1
-  m_Spring:
-    spring: 0
-    damper: 0.1
-    targetPosition: 0
-  m_UseMotor: 0
-  m_Motor:
-    targetVelocity: 0
-    force: 0
-    freeSpin: 0
-  m_UseLimits: 0
-  m_Limits:
-    min: 0
-    max: 0
-    bounciness: 0
-    bounceMinVelocity: 0.2
-    contactDistance: 0
-  m_BreakForce: Infinity
-  m_BreakTorque: Infinity
-  m_EnableCollision: 0
-  m_EnablePreprocessing: 1
-  m_MassScale: 1
-  m_ConnectedMassScale: 1
 --- !u!59 &5900002
 HingeJoint:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100002}
-  m_ConnectedBody: {fileID: 5400000}
+  m_ConnectedBody: {fileID: 0}
+  m_ConnectedArticulationBody: {fileID: 0}
  m_Anchor: {x: 0, y: 0.27, z: 0}
  m_Axis: {x: 1, y: 0, z: 0}
  m_AutoConfigureConnectedAnchor: 1
  m_ConnectedAnchor: {x: 0, y: 0.26999998, z: 0}
+  serializedVersion: 2
  m_UseSpring: 1
  m_Spring:
    spring: 0
@ -482,6 +171,8 @@ HingeJoint:
    force: 0
    freeSpin: 0
  m_UseLimits: 0
+  m_ExtendedLimits: 0
+  m_UseAcceleration: 0
  m_Limits:
    min: 0
    max: 0
@ -494,41 +185,127 @@ HingeJoint:
  m_EnablePreprocessing: 1
  m_MassScale: 1
  m_ConnectedMassScale: 1
--- !u!64 &6400000
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100008}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 1
-  m_CookingOptions: 14
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 4300002, guid: 53a999c6120664e48a5b3f59e08a1af1, type: 3}
--- !u!136 &13600000
-CapsuleCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100004}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.01
-  m_Height: 0.12
-  m_Direction: 0
-  m_Center: {x: 0.00000008009376, y: 0.0000633467, z: 0.0000022528698}
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
+--- !u!1001 &819426745863191101
+PrefabInstance:
+  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    serializedVersion: 3
+    m_TransformParent: {fileID: 400000}
+    m_Modifications:
+    - target: {fileID: 100000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_Name
+      value: Emmer_100_99_100
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 100000}
-  m_IsPrefabParent: 1
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+--- !u!4 &819426745863577789 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 2320b2c9aff2c434fa72dd781a6e907d, type: 3}
+  m_PrefabInstance: {fileID: 819426745863191101}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8798210364446920197
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 400000}
+    m_Modifications:
+    - target: {fileID: 100000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_Name
+      value: Emmer-Handvat (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.0000166893
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.46408212
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.00036907196
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+--- !u!4 &8798210364446790789 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 348c9e6e505ba8f48a33ca1a6bda84d7, type: 3}
+  m_PrefabInstance: {fileID: 8798210364446920197}
+  m_PrefabAsset: {fileID: 0}
--- a/Samples~/GroceryStore/Models/Bucket/Materials/Metal_Rough.mat
+++ b/Samples~/GroceryStore/Models/Bucket/Materials/Metal_Rough.mat
@ -2,19 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: Metal_Rough
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  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: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,19 +60,25 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
+    - _GlossMapScale: 1
    - _Glossiness: 0.5
+    - _GlossyReflections: 1
    - _Metallic: 0.859
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Bucket/Materials/WoodRough0106_2_S.mat
+++ b/Samples~/GroceryStore/Models/Bucket/Materials/WoodRough0106_2_S.mat
@ -2,19 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: WoodRough0106_2_S
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  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: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,19 +60,25 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
+    - _GlossMapScale: 1
    - _Glossiness: 0
+    - _GlossyReflections: 1
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-1-Metal_Rough.mat
+++ b/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-1-Metal_Rough.mat
@ -2,19 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: Emmer-1-Metal_Rough
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  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: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,6 +60,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
@ -74,3 +81,4 @@ Material:
    m_Colors:
    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-2-WoodRough0106_2_S.mat
+++ b/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-2-WoodRough0106_2_S.mat
@ -2,19 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: Emmer-2-WoodRough0106_2_S
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  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: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,6 +60,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
@ -74,3 +81,4 @@ Material:
    m_Colors:
    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-Handvat-1-WoodRough0106_2_S.mat
+++ b/Samples~/GroceryStore/Models/Bucket/Models/Materials/Emmer-Handvat-1-WoodRough0106_2_S.mat
@ -2,19 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: Emmer-Handvat-1-WoodRough0106_2_S
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  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: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,6 +60,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
@ -74,3 +81,4 @@ Material:
    m_Colors:
    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Bucket/Models/mesh2%Hengsel%0%.prefab
+++ b/Samples~/GroceryStore/Models/Bucket/Models/mesh2%Hengsel%0%.prefab
@ -1,84 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100000
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 400000}
-  - component: {fileID: 3300000}
-  - component: {fileID: 2300000}
-  m_Layer: 0
-  m_Name: mesh2%Hengsel%0%
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &400000
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100000}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100000}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: e817da7ab6ed0c446af2182934ed0e28, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!33 &3300000
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 100000}
-  m_Mesh: {fileID: 4300006, guid: 53a999c6120664e48a5b3f59e08a1af1, type: 3}
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 100000}
-  m_IsPrefabParent: 1
--- a/Samples~/GroceryStore/Models/Characters/MakeHuman_high.fbx
+++ b/Samples~/GroceryStore/Models/Characters/MakeHuman_high.fbx
--- a/Samples~/GroceryStore/Models/Characters/MakeHuman_high.fbx.meta
+++ b/Samples~/GroceryStore/Models/Characters/MakeHuman_high.fbx.meta
--- a/Samples~/GroceryStore/Models/Characters/Materials/MakeHuman_Jeans.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/MakeHuman_Jeans.mat
@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: MakeHuman_Jeans
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -55,6 +61,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
@ -75,3 +82,4 @@ Material:
    m_Colors:
    - _Color: {r: 0.0426, g: 0.0557, b: 0.2079, a: 0.9574}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/caucasian-male-young.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/caucasian-male-young.mat
@ -0,0 +1,83 @@
+%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: caucasian-male-young
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: 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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/caucasian-male-young.mat.meta
+++ b/Samples~/GroceryStore/Models/Characters/Materials/caucasian-male-young.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00d8e91da1464b845adca1425e9599d7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Characters/Materials/classicshoes_texture_black.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/classicshoes_texture_black.mat
@ -0,0 +1,85 @@
+%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: classicshoes_texture_black
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.1, g: 0.1, b: 0.1, a: 0.9}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/classicshoes_texture_black.mat.meta
+++ b/Samples~/GroceryStore/Models/Characters/Materials/classicshoes_texture_black.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 86a0d07d2ba985e4ba3112712f20d380
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Characters/Materials/jeans_texture.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/jeans_texture.mat
@ -0,0 +1,85 @@
+%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: jeans_texture
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.0426, g: 0.0557, b: 0.2079, a: 0.9574}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/jeans_texture.mat.meta
+++ b/Samples~/GroceryStore/Models/Characters/Materials/jeans_texture.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cad73e08b9f208a4a8f3ab6f6d4510dd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Characters/Materials/texture.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/texture.mat
@ -0,0 +1,85 @@
+%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: texture
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: 0}
+        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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.54, b: 0.35, a: 0.19999999}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/texture.mat.meta
+++ b/Samples~/GroceryStore/Models/Characters/Materials/texture.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a10d9d6b54f516042a24a6251f4b08b0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Characters/Materials/tshirt_longsleeves_medium_texture.mat
+++ b/Samples~/GroceryStore/Models/Characters/Materials/tshirt_longsleeves_medium_texture.mat
@ -0,0 +1,85 @@
+%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: tshirt_longsleeves_medium_texture
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: 0}
+        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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 0.19999999}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Characters/Materials/tshirt_longsleeves_medium_texture.mat.meta
+++ b/Samples~/GroceryStore/Models/Characters/Materials/tshirt_longsleeves_medium_texture.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d738943a74c8fa245b6b54a59ae6b72d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Dorpsstraat-20-1950.skp
+++ b/Samples~/GroceryStore/Models/Dorpsstraat-20-1950.skp
--- a/Samples~/GroceryStore/Models/Dorpsstraat-20-1950.skp.meta
+++ b/Samples~/GroceryStore/Models/Dorpsstraat-20-1950.skp.meta
@ -1,104 +0,0 @@
-fileFormatVersion: 2
-guid: 3617b7fe63100b9448e4c8ff5a476439
-SketchUpImporter:
-  serializedVersion: 19301
-  internalIDToNameTable: []
-  externalObjects: {}
-  materials:
-    materialImportMode: 1
-    materialName: 2
-    materialSearch: 0
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
-    importConstraints: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 0
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 0.0254
-    meshCompression: 0
-    addColliders: 0
-    useSRGBMaterialColor: 1
-    sortHierarchyByName: 1
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    fileIdsGeneration: 2
-    swapUVChannels: 0
-    generateSecondaryUV: 1
-    useFileUnits: 1
-    keepQuads: 0
-    weldVertices: 1
-    preserveHierarchy: 0
-    skinWeightsMode: 0
-    maxBonesPerVertex: 4
-    minBoneWeight: 0.001
-    meshOptimizationFlags: -1
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-    normalCalculationMode: 4
-    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
-    blendShapeNormalImportMode: 1
-    normalSmoothingSource: 0
-  referencedClips: []
-  importAnimation: 0
-  humanDescription:
-    serializedVersion: 3
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    globalScale: 0.0254
-    rootMotionBoneName: 
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 0
-  humanoidOversampling: 1
-  avatarSetup: 0
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  generateBackFace: 1
-  mergeCoplanarFaces: 0
-  selectedNodes: 0000000001000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000
-  assetHash:
-    serializedVersion: 2
-    Hash: d570e0caacebab534e74a9e736da42d8
-  fileUnit: 0
--- a/Runtime/HumanoidControl/Scripts/Resources/Materials/Material.mat
+++ b/Runtime/HumanoidControl/Scripts/Resources/Materials/Material.mat
@ -2,19 +2,24 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: Material
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 292
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 1
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -54,13 +59,14 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _BumpScale: 1
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 0
    - _GlossyReflections: 1
    - _Metallic: 0
    - _Mode: 0
@ -74,3 +80,4 @@ Material:
    m_Colors:
    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Materials/292.mat.meta
+++ b/Samples~/GroceryStore/Models/Materials/292.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 74962581d4fb15f4bbbe5afa898ccb31
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Materials/Bruidsuikers.mat
+++ b/Samples~/GroceryStore/Models/Materials/Bruidsuikers.mat
@ -0,0 +1,83 @@
+%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: Bruidsuikers
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: b4b9d5940a482db4987ccf4b3fa47fed, 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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Materials/Bruidsuikers.mat.meta
+++ b/Samples~/GroceryStore/Models/Materials/Bruidsuikers.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a4bcc9e4b3581bf47b18aa0b2b283e76
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Materials/HopjesEtiket.mat
+++ b/Samples~/GroceryStore/Models/Materials/HopjesEtiket.mat
@ -0,0 +1,83 @@
+%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: HopjesEtiket
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: 8f6c9d8dffa083b4995cf06c16e932fb, 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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Materials/HopjesEtiket.mat.meta
+++ b/Samples~/GroceryStore/Models/Materials/HopjesEtiket.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6d76c0e4651be4d4e849acd0e450bedb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Materials/Mastersword.mat
+++ b/Samples~/GroceryStore/Models/Materials/Mastersword.mat
@ -0,0 +1,83 @@
+%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: Mastersword
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: 0}
+        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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Materials/Mastersword.mat.meta
+++ b/Samples~/GroceryStore/Models/Materials/Mastersword.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 63f1540a1bfc3f04c9298d3335d2598c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Samples~/GroceryStore/Models/Materials/Metal_Rough.mat
+++ b/Samples~/GroceryStore/Models/Materials/Metal_Rough.mat
@ -0,0 +1,83 @@
+%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: Metal_Rough
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: a308f430732a0554f96ffbff3bbf4856, 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}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Samples~/GroceryStore/Models/Materials/Metal_Rough.mat.meta
+++ b/Samples~/GroceryStore/Models/Materials/Metal_Rough.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 74a910ad018ea804db5435e02cf85927
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pascal Serrarens	f177384da3	Update README to with links to the new repo site	2025-04-16 08:45:51 +02:00
Pascal Serrarens	bfa05a93e3	Added URP prefabs and materials	2024-11-28 14:02:03 +01:00
Pascal Serrarens	4d53839164	Fix wrong UNITY version in #if	2024-11-28 13:01:55 +01:00
Pascal Serrarens	0d22094ba4	Merge branch 'main' of http://gitlab.passervr.com/passer/unity/humanoidcontrol4_free	2024-11-28 12:58:15 +01:00
Pascal Serrarens	ab5d034f6e	UNITY 6 compatibility improvements	2024-11-28 12:57:52 +01:00
Pascal Serrarens	9e7a685815	UNITY 6 compatibility improvements	2024-11-28 12:36:48 +01:00
Pascal Serrarens	fd9bc37467	Hide Cube in target rig	2024-05-06 10:41:29 +02:00
Pascal Serrarens	f1ef79a103	Merge branch 'main' of https://gitlab.passervr.com/passer/unity/humanoidcontrol4_free	2024-03-18 09:25:36 +01:00
Pascal Serrarens	6dcd64ddc7	Updated gitignore	2024-03-18 09:24:19 +01:00
Pascal Serrarens	fbfbb8cbaf	Fix focus change	2024-03-11 08:49:32 +01:00
Pascal Serrarens	90b4c46988	Fix Quest both hands get tracking state when only one is being tracked	2024-02-21 10:38:46 +01:00
Pascal Serrarens	a3a2732060	Prevent ghost clicks using finger interaction	2024-02-08 15:38:52 +01:00
Pascal Serrarens	48f5a48639	Change start site URL to humanoidcontrol.com	2024-01-19 09:58:35 +01:00
Pascal Serrarens	039b347475	Update package.json	2024-01-19 08:32:42 +00:00
Pascal Serrarens	3d37b1a61e	Exclude package.json from git	2024-01-19 09:20:25 +01:00
Pascal Serrarens	c0effaf025	Updated scenes	2024-01-18 16:55:26 +01:00
Pascal Serrarens	66e07c9bdc	Fixed prefabs	2024-01-18 16:55:05 +01:00
Pascal Serrarens	3a15ab000f	Removed erroneous prefabs	2024-01-18 16:54:36 +01:00
Pascal Serrarens	0a609ce083	Exclude screen space UI elements from world interaction	2024-01-18 12:15:39 +01:00
Pascal Serrarens	36660c8495	Fix compatibility with Unity older than 2022.1	2024-01-18 12:14:00 +01:00
Pascal Serrarens	70f9edc918	Fix TargetRigOrientation to match Unity coordinate system.	2024-01-16 15:50:00 +01:00
Pascal Serrarens	c7c92f3e53	Removed empty prefabs	2024-01-16 15:32:00 +01:00
Pascal Serrarens	d7c2f3b960	Fixed unit tests	2024-01-16 15:28:50 +01:00
Pascal Serrarens	27afc9d501	Fix missing assets	2024-01-16 12:39:20 +01:00
Pascal Serrarens	f1a4ced59d	Fixed missing components	2024-01-16 12:23:18 +01:00
Pascal Serrarens	8b199b9c78	Updated gitignore	2024-01-16 12:00:27 +01:00
Pascal Serrarens	ea9deb82fb	Added namespaces	2024-01-16 11:57:58 +01:00
Pascal Serrarens	83ab3a6dbe	Model cleanup	2024-01-16 11:44:48 +01:00
Pascal Serrarens	9e19dfd5af	Removed obsolete GameControllerInputSettings	2024-01-16 11:44:14 +01:00
Pascal Serrarens	c852dc4a1e	Added hidden float reverting setting (hidden, because it is still experimental) This reverts the effect of the float correction when the avatar has bent knees.	2023-12-21 11:32:29 +01:00