From d49a4f4632ddc93effc111e274399f263b8f576e Mon Sep 17 00:00:00 2001 From: "Verduijn, Timon" <timon.verduijn@wur.nl> Date: Mon, 12 Feb 2024 13:24:23 +0100 Subject: [PATCH] Reset materials to standard rendering pipeline --- .../Models/Materials/OculusTouchForQuest2_MAT.mat | 5 ++--- Runtime/Models/Materials/TextHelper_Mat.mat | 12 +++++------- Runtime/Prefabs/OculusTouchForQuest2_Left.prefab | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Runtime/Models/Materials/OculusTouchForQuest2_MAT.mat b/Runtime/Models/Materials/OculusTouchForQuest2_MAT.mat index 0899b47..b0361e4 100644 --- a/Runtime/Models/Materials/OculusTouchForQuest2_MAT.mat +++ b/Runtime/Models/Materials/OculusTouchForQuest2_MAT.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OculusTouchForQuest2_MAT - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_InvalidKeywords: [] @@ -29,8 +29,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 diff --git a/Runtime/Models/Materials/TextHelper_Mat.mat b/Runtime/Models/Materials/TextHelper_Mat.mat index da605c8..fb7a8f1 100644 --- a/Runtime/Models/Materials/TextHelper_Mat.mat +++ b/Runtime/Models/Materials/TextHelper_Mat.mat @@ -21,17 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TextHelper_Mat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: - - _ENVIRONMENTREFLECTIONS_OFF + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] m_InvalidKeywords: - - _GLOSSYREFLECTIONS_OFF + - _ENVIRONMENTREFLECTIONS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -108,7 +106,7 @@ Material: - _EnvironmentReflections: 0 - _GlossMapScale: 0 - _Glossiness: 0 - - _GlossyReflections: 0 + - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Runtime/Prefabs/OculusTouchForQuest2_Left.prefab b/Runtime/Prefabs/OculusTouchForQuest2_Left.prefab index 5471318..ef23282 100644 --- a/Runtime/Prefabs/OculusTouchForQuest2_Left.prefab +++ b/Runtime/Prefabs/OculusTouchForQuest2_Left.prefab @@ -1941,7 +1941,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1918020002710429136 Animator: - serializedVersion: 5 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1958,7 +1958,7 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &3773171472934841565 MonoBehaviour: m_ObjectHideFlags: 0 -- GitLab