diff --git a/README.md b/README.md index 928d741..17d2020 100644 --- a/README.md +++ b/README.md @@ -245,7 +245,7 @@ The exported tracking data CSV contains the following columns: ### Key Dependencies - **Meta XR SDK Core**: 76.0.1 - **Meta XR SDK Interaction**: 76.0.1 -- **Meta XR SDK Movement**: 76.0.1 (local file dependency) +- **Meta XR SDK Movement**: 76.0.1 - **Unity XR Interaction Toolkit**: 3.1.1 - **Unity XR Hands**: 1.5.0 - **Unity XR Management**: 4.5.1 @@ -254,6 +254,18 @@ The exported tracking data CSV contains the following columns: - **Unity Input System**: 1.14.0 - **Unity Timeline**: 1.8.7 +### Installing Meta XR Movement SDK + +To install the Meta XR Movement SDK v76.0.1 in Unity: + +1. Open Unity Package Manager (`Window` > `Package Manager`) +2. Click the **+** button in the top-left corner +3. Select **"Add package from git URL..."** +4. Enter: `https://github.com/oculus-samples/Unity-Movement.git#v76.0.1` +5. Click **Add** + +For more information, see the [Unity-Movement repository](https://github.com/oculus-samples/Unity-Movement). + ### Build Requirements - Unity 6000.0.49f1 or compatible - Meta XR SDK 76.0.1 diff --git a/vrcharades-unity/vrcharades-master/.vscode/settings.json b/vrcharades-unity/vrcharades-master/.vscode/settings.json index 8353846..4995a91 100644 --- a/vrcharades-unity/vrcharades-master/.vscode/settings.json +++ b/vrcharades-unity/vrcharades-master/.vscode/settings.json @@ -60,11 +60,11 @@ "*.asset": "yaml", "*.meta": "yaml", "*.prefab": "yaml", - "*.unity": "yaml", + "*.unity": "yaml" }, "explorer.fileNesting.enabled": true, "explorer.fileNesting.patterns": { - "*.sln": "*.csproj", + "*.sln": "*.csproj" }, - "dotnet.defaultSolution": "facetracking.sln" + "dotnet.defaultSolution": "vrcharades-master.sln" } \ No newline at end of file diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/Meta XR Movement SDK/76.0.1/Face Tracking Samples/Scenes/MovementFace.unity b/vrcharades-unity/vrcharades-master/Assets/Samples/Meta XR Movement SDK/76.0.1/Face Tracking Samples/Scenes/MovementFace.unity index 4e2c51d..da155e0 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/Meta XR Movement SDK/76.0.1/Face Tracking Samples/Scenes/MovementFace.unity +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/Meta XR Movement SDK/76.0.1/Face Tracking Samples/Scenes/MovementFace.unity @@ -1899,6 +1899,9 @@ MonoBehaviour: - {fileID: 708573341} - {fileID: 1581144283} - {fileID: 1258202039} + centerEyeAnchor: {fileID: 1388721546} + leftHandAnchor: {fileID: 64612120} + rightHandAnchor: {fileID: 1195843015} _ovrFaceExpressions: {fileID: 1053850699} --- !u!114 &331518071 MonoBehaviour: @@ -2281,6 +2284,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2302,6 +2307,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -6823,7 +6829,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -6831,6 +6836,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!4 &749460473 stripped Transform: m_CorrespondingSourceObject: {fileID: 7716329754068448961, guid: ac9cc3687745eea499d8b24def228f27, type: 3} @@ -7636,6 +7642,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7657,6 +7665,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -7891,6 +7900,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7912,6 +7923,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -9049,6 +9061,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9070,6 +9084,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -10416,6 +10431,9 @@ MonoBehaviour: - {fileID: 477121324} - {fileID: 477121323} - {fileID: 477121322} + centerEyeAnchor: {fileID: 0} + leftHandAnchor: {fileID: 0} + rightHandAnchor: {fileID: 0} _ovrFaceExpressions: {fileID: 1053850699} --- !u!1 &1272119319 GameObject: @@ -10947,17 +10965,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &1364086341 GameObject: m_ObjectHideFlags: 0 @@ -11254,7 +11278,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -11262,6 +11285,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &1402933566 GameObject: m_ObjectHideFlags: 0 @@ -11644,6 +11668,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11665,6 +11691,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -12776,6 +12803,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12797,6 +12826,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -16996,17 +17026,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &2078015469 GameObject: m_ObjectHideFlags: 0 @@ -17232,17 +17268,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &2094724098 GameObject: m_ObjectHideFlags: 0 @@ -17353,17 +17395,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &2099202519 GameObject: m_ObjectHideFlags: 0 @@ -17552,7 +17600,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -17560,6 +17607,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!4 &2106765072 stripped Transform: m_CorrespondingSourceObject: {fileID: 8096826516553714632, guid: ac9cc3687745eea499d8b24def228f27, type: 3} diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat index 0e9b08d..69465be 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat index fb87371..bcb3fb8 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat @@ -167,4 +167,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat index c96510a..31a7095 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!114 &-4118503124237194887 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat index 64b54e7..bc78df2 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat @@ -25,7 +25,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat index ece6943..4131ce9 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat @@ -169,4 +169,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Interactable White.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Interactable White.mat index 94a56d4..9ffa707 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Interactable White.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Interactable White.mat @@ -25,7 +25,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat index d689631..2bd2ab3 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat @@ -170,4 +170,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat index 9dd2742..d657bc9 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!114 &-4650124383509787667 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Light.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Light.mat index 15fcc16..7c4974a 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Light.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Light.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!114 &-2671852768243367264 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat index a0dcaf4..713f2a3 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat index 4c9365b..f7899f8 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Dark Blue.mat @@ -169,4 +169,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Grey.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Grey.mat index 1613e5d..b35a406 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Grey.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Grey.mat @@ -172,4 +172,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat index 2ae6bdd..1618717 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Concrete Light Blue.mat @@ -156,7 +156,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!114 &4738169426747826149 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Lit White.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Lit White.mat index 135436b..e63e235 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Lit White.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/DemoSceneAssets/Materials/Lit White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_Grey.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_Grey.mat index 25c0f1f..77e82ae 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_Grey.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_Grey.mat @@ -185,4 +185,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_White.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_White.mat index 84f3992..ad404fa 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_White.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Controller_White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!114 &-1555896807369559897 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/FresnelHighlight.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/FresnelHighlight.mat index 5aa822b..c9f4e48 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/FresnelHighlight.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/FresnelHighlight.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Interactable.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Interactable.mat index 5de3c38..aecfd5d 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Interactable.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Interactable.mat @@ -25,7 +25,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Anchor.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Anchor.mat index f749dd2..ad66511 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Anchor.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Anchor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Area.mat b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Area.mat index 9dbb444..937910d 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Area.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Samples/XR Interaction Toolkit/3.1.1/Starter Assets/Materials/Telport Area.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/Scenes/BasicScene/Grid.mat b/vrcharades-unity/vrcharades-master/Assets/Scenes/BasicScene/Grid.mat index b261c84..d4b6084 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Scenes/BasicScene/Grid.mat +++ b/vrcharades-unity/vrcharades-master/Assets/Scenes/BasicScene/Grid.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -27,7 +27,7 @@ Material: m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -101,6 +101,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -149,6 +150,7 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/vrcharades-unity/vrcharades-master/Assets/Settings/Project Configuration/UniversalRenderPipelineGlobalSettings.asset b/vrcharades-unity/vrcharades-master/Assets/Settings/Project Configuration/UniversalRenderPipelineGlobalSettings.asset index 8d3499b..feed181 100644 --- a/vrcharades-unity/vrcharades-master/Assets/Settings/Project Configuration/UniversalRenderPipelineGlobalSettings.asset +++ b/vrcharades-unity/vrcharades-master/Assets/Settings/Project Configuration/UniversalRenderPipelineGlobalSettings.asset @@ -59,18 +59,11 @@ MonoBehaviour: - rid: 2514623182215315458 - rid: 2514623182215315459 - rid: 2514623182215315460 + - rid: 5032575941332172996 + - rid: 5032575941332172997 + - rid: 5032575941332172998 m_RuntimeSettings: - m_List: - - rid: 1876391467148115968 - - rid: 1876391467148115969 - - rid: 1876391467148115970 - - rid: 1876391467148115972 - - rid: 1876391467148115973 - - rid: 1876391467148115976 - - rid: 1876391467148115978 - - rid: 1876391467148115986 - - rid: 1876391467148115987 - - rid: 1876391467148115988 + m_List: [] m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -119,6 +112,8 @@ MonoBehaviour: m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 1876391467148115972 type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -259,6 +254,42 @@ MonoBehaviour: type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} + - rid: 5032575941332172996 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 5032575941332172997 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 5032575941332172998 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 - rid: 6000930410917265691 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -296,9 +327,6 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat index 7cce233..0c4cff6 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Base.mat @@ -136,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat index 7baaff5..309b7b1 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Anchor Blue Glow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -29,7 +29,7 @@ Material: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - _EMISSION - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 m_CustomRenderQueue: 3000 @@ -155,6 +155,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 0.4} diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat index ef7a9fd..9956342 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Anchor Materials/Blue Anchor Arrow.mat @@ -138,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/Controller.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/Controller.mat index 2aabf8a..dc3057b 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/Controller.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/Controller.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat index b3891a3..11ccbf9 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat @@ -131,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat index d9528be..49b39ed 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat @@ -131,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Arrows.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Arrows.mat index 891ef6a..06d2712 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Arrows.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Arrows.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -97,8 +97,11 @@ Material: 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 @@ -107,6 +110,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -121,9 +125,11 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Chrome.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Chrome.mat index b071759..abb9bf4 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Chrome.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Chrome.mat @@ -135,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat index a90b804..7cf63c2 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Blue.mat @@ -137,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat index 9f671c8..160a79f 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete Grey.mat @@ -137,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete.mat index b4bcba4..05c3d27 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Concrete.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Dark Green.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Dark Green.mat index 7ac85c2..f88a302 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Dark Green.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Dark Green.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Glass.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Glass.mat index 86867ee..8f35b5c 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Glass.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Glass.mat @@ -143,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Grey.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Grey.mat index 9472f4a..420f380 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Grey.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Grey.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat index 070161d..ca3a2e9 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Cut.mat @@ -136,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat index c77432d..941559e 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Environment/Wall Default.mat @@ -136,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Angle Indicator.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Angle Indicator.mat index 20a082d..1d8736f 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Angle Indicator.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Angle Indicator.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -30,7 +30,7 @@ Material: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - _FLIPBOOKBLENDING_OFF - m_LightmapFlags: 0 + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/BlinkOcclusionPass.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/BlinkOcclusionPass.mat index 73b64b3..20d14a6 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/BlinkOcclusionPass.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/BlinkOcclusionPass.mat @@ -131,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Blue Standard.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Blue Standard.mat index f98db7a..f33f044 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Blue Standard.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Blue Standard.mat @@ -14,7 +14,7 @@ Material: m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -84,8 +84,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -103,6 +106,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _EnvironmentReflections: 1 - _FlipbookMode: 0 @@ -123,9 +127,11 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} @@ -149,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Standard White.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Standard White.mat index 340536e..b2d0a0e 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Standard White.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Locomotion/Standard White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Particles/ConfettiParticles.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Particles/ConfettiParticles.mat index af87e2d..d8fc99f 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Particles/ConfettiParticles.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Particles/ConfettiParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Cube_Fabric.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Cube_Fabric.mat index 512cb39..ae07b8a 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Cube_Fabric.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Cube_Fabric.mat @@ -131,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Green.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Green.mat index 5096839..452073a 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Green.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Green.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 2.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 2.mat index 7a52634..c910ef6 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 2.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 3.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 3.mat index 945fd76..e18025e 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 3.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat index 954413c..ebea1d6 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 5.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 5.mat index 405abaa..dc98790 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 5.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables 5.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables.mat index dde515f..57bbb53 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Interactables.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Torus.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Torus.mat index 3db4718..0de8f68 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Torus.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/Primitive/Torus.mat @@ -134,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/UI/Handle.mat b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/UI/Handle.mat index 8c6cb57..d51b310 100644 --- a/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/UI/Handle.mat +++ b/vrcharades-unity/vrcharades-master/Assets/VRTemplateAssets/Materials/UI/Handle.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/vrcharades-unity/vrcharades-master/Assets/XR/Settings/OpenXRPackageSettings.asset b/vrcharades-unity/vrcharades-master/Assets/XR/Settings/OpenXRPackageSettings.asset index d15df61..dc8d030 100644 --- a/vrcharades-unity/vrcharades-master/Assets/XR/Settings/OpenXRPackageSettings.asset +++ b/vrcharades-unity/vrcharades-master/Assets/XR/Settings/OpenXRPackageSettings.asset @@ -176,6 +176,7 @@ MonoBehaviour: features: - {fileID: 8487559348959976567} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -183,7 +184,11 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &-5311418557368314572 MonoBehaviour: m_ObjectHideFlags: 0 @@ -381,6 +386,7 @@ MonoBehaviour: features: - {fileID: 7077444821019895077} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -388,7 +394,32 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 +--- !u!114 &-3274706230891421836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01512f11fe5096443ad972feb69271f6, type: 3} + m_Name: SpaceWarpFeature Android + m_EditorClassIdentifier: Unity.XR.OpenXR::UnityEngine.XR.OpenXR.Features.SpaceWarpFeature + m_enabled: 0 + nameUi: Application SpaceWarp + version: 1.0.0 + featureIdInternal: com.unity.openxr.feature.spacewarp + openxrExtensionStrings: XR_FB_space_warp + company: Unity + priority: 0 + required: 0 + m_UseRightHandedNDC: 0 --- !u!114 &-3225394163401567679 MonoBehaviour: m_ObjectHideFlags: 0 @@ -693,6 +724,7 @@ MonoBehaviour: m_Name: Android m_EditorClassIdentifier: features: + - {fileID: -3274706230891421836} - {fileID: 6886245988355559344} - {fileID: 6746228182035495572} - {fileID: 8877639857907081683} @@ -718,6 +750,7 @@ MonoBehaviour: - {fileID: -5901582635306253} - {fileID: -4603662951859827220} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -725,7 +758,11 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &-5901582635306253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -839,6 +876,7 @@ MonoBehaviour: - {fileID: -746052863005154228} - {fileID: -4571133337129847037} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -846,7 +884,11 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &1070505300935040877 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1032,6 +1074,7 @@ MonoBehaviour: - {fileID: 1940785323570898695} - {fileID: 4312871930695646315} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -1039,7 +1082,11 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &3150671951373486854 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1267,6 +1314,8 @@ MonoBehaviour: lateLatchingMode: 0 lateLatchingDebug: 0 optimizeMultiviewRenderRegions: 0 + multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegions: 1 spacewarpMotionVectorTextureFormat: 0 --- !u!114 &5185910735314338884 MonoBehaviour: @@ -1688,6 +1737,7 @@ MonoBehaviour: features: - {fileID: 3150671951373486854} m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -1695,7 +1745,11 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_optimizeMultiviewRenderRegions: 0 + m_multiviewRenderRegionsOptimizationMode: 0 + m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &8759366741247560425 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/vrcharades-unity/vrcharades-master/Packages/manifest.json b/vrcharades-unity/vrcharades-master/Packages/manifest.json index 5ac3946..085c988 100644 --- a/vrcharades-unity/vrcharades-master/Packages/manifest.json +++ b/vrcharades-unity/vrcharades-master/Packages/manifest.json @@ -2,18 +2,18 @@ "dependencies": { "com.meta.xr.sdk.core": "76.0.1", "com.meta.xr.sdk.interaction.ovr": "76.0.1", - "com.meta.xr.sdk.movement": "file:C:/Users/VER-SoSe25/Downloads/unitymovement/Unity-Movement-76.0.1", + "com.meta.xr.sdk.movement": "https://github.com/oculus-samples/Unity-Movement.git#v76.0.1", "com.unity.collab-proxy": "2.8.2", "com.unity.feature.development": "1.0.2", - "com.unity.inputsystem": "1.14.0", - "com.unity.learn.iet-framework": "4.0.4", + "com.unity.inputsystem": "1.14.2", + "com.unity.learn.iet-framework": "5.0.1", "com.unity.multiplayer.center": "1.0.0", - "com.unity.render-pipelines.universal": "17.0.4", - "com.unity.timeline": "1.8.7", + "com.unity.render-pipelines.universal": "17.2.0", + "com.unity.timeline": "1.8.9", "com.unity.xr.hands": "1.5.0", - "com.unity.xr.interaction.toolkit": "3.1.1", + "com.unity.xr.interaction.toolkit": "3.2.0", "com.unity.xr.management": "4.5.1", - "com.unity.xr.openxr": "1.14.1", + "com.unity.xr.openxr": "1.15.1", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/vrcharades-unity/vrcharades-master/Packages/packages-lock.json b/vrcharades-unity/vrcharades-master/Packages/packages-lock.json index 7243f75..6f8ce90 100644 --- a/vrcharades-unity/vrcharades-master/Packages/packages-lock.json +++ b/vrcharades-unity/vrcharades-master/Packages/packages-lock.json @@ -28,17 +28,18 @@ "url": "https://packages.unity.com" }, "com.meta.xr.sdk.movement": { - "version": "file:C:/Users/VER-SoSe25/Downloads/unitymovement/Unity-Movement-76.0.1", + "version": "https://github.com/oculus-samples/Unity-Movement.git#v76.0.1", "depth": 0, - "source": "local", + "source": "git", "dependencies": { "com.unity.burst": "1.8.18", "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0" - } + }, + "hash": "2392f212552b21a116a66e7cd6017011df44ab78" }, "com.unity.burst": { - "version": "1.8.21", + "version": "1.8.24", "depth": 1, "source": "registry", "dependencies": { @@ -55,13 +56,14 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.5.7", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.19", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -111,7 +113,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.14.0", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -120,7 +122,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "4.0.4", + "version": "5.0.1", "depth": 0, "source": "registry", "dependencies": { @@ -145,7 +147,7 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 3, "source": "registry", "dependencies": {}, @@ -159,11 +161,11 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.4", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.20", + "com.unity.burst": "1.8.14", "com.unity.mathematics": "1.3.2", "com.unity.ugui": "2.0.0", "com.unity.collections": "2.4.3", @@ -174,12 +176,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.4", + "version": "17.2.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", - "com.unity.shadergraph": "17.0.4", + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.shadergraph": "17.2.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -216,11 +218,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.4", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", + "com.unity.render-pipelines.core": "17.2.0", "com.unity.searcher": "4.9.3" } }, @@ -263,7 +265,7 @@ } }, "com.unity.timeline": { - "version": "1.8.7", + "version": "1.8.9", "depth": 0, "source": "registry", "dependencies": { @@ -306,7 +308,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "3.1.1", + "version": "3.2.0", "depth": 0, "source": "registry", "dependencies": { @@ -345,7 +347,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.14.1", + "version": "1.15.1", "depth": 0, "source": "registry", "dependencies": { @@ -504,7 +506,8 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectSettings.asset b/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectSettings.asset index 5327e2f..f1089b4 100644 --- a/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectSettings.asset +++ b/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectSettings.asset @@ -132,6 +132,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 @@ -274,6 +275,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -588,6 +592,9 @@ PlayerSettings: - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 @@ -875,12 +882,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: Android: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS;ISDK_OPENXR_HAND CloudRendering: UNITY_POST_PROCESSING_STACK_V2 @@ -1009,3 +1016,4 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} diff --git a/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectVersion.txt b/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectVersion.txt index 7a12cc2..8bd173d 100644 --- a/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectVersion.txt +++ b/vrcharades-unity/vrcharades-master/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.49f1 -m_EditorVersionWithRevision: 6000.0.49f1 (840e0a9776d9) +m_EditorVersion: 6000.2.1f1 +m_EditorVersionWithRevision: 6000.2.1f1 (55300504c302) diff --git a/vrcharades-unity/vrcharades-master/ProjectSettings/ShaderGraphSettings.asset b/vrcharades-unity/vrcharades-master/ProjectSettings/ShaderGraphSettings.asset index e66042a..ce8c243 100644 --- a/vrcharades-unity/vrcharades-master/ProjectSettings/ShaderGraphSettings.asset +++ b/vrcharades-unity/vrcharades-master/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/vrcharades-unity/vrcharades-master/ProjectSettings/URPProjectSettings.asset b/vrcharades-unity/vrcharades-master/ProjectSettings/URPProjectSettings.asset index 08faf03..64a8674 100644 --- a/vrcharades-unity/vrcharades-master/ProjectSettings/URPProjectSettings.asset +++ b/vrcharades-unity/vrcharades-master/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10