From e5d031346bab7e9b53d766b4030654a626da5b98 Mon Sep 17 00:00:00 2001 From: notargs Date: Wed, 16 Mar 2022 14:04:32 +0900 Subject: [PATCH 1/2] Update MToon --- Assets/VRMShaders/VRM/MToon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRMShaders/VRM/MToon b/Assets/VRMShaders/VRM/MToon index e7b15eed3..f451d6151 160000 --- a/Assets/VRMShaders/VRM/MToon +++ b/Assets/VRMShaders/VRM/MToon @@ -1 +1 @@ -Subproject commit e7b15eed3be9aec5400ec31f21ce664350368d3f +Subproject commit f451d61513b137e8e39338d328ffca73d8744f0a From 03956f1f4eba591e83bf42b517e289c36828df55 Mon Sep 17 00:00:00 2001 From: notargs Date: Wed, 16 Mar 2022 15:57:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?MToon10=E3=81=AB=E3=81=A6=E3=80=81Android?= =?UTF-8?q?=E7=AB=AF=E6=9C=AB=E3=81=A7UV=E3=82=B9=E3=82=AF=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=8C=E3=82=AB=E3=82=AF=E3=81=A4=E3=81=8F?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/VRM10/vrmc_materials_mtoon_input.hlsl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl index fd738a6cc..6f5d361e9 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl @@ -12,7 +12,8 @@ UNITY_DECLARE_TEX2D(_EmissionMap); UNITY_DECLARE_TEX2D(_MatcapTex); UNITY_DECLARE_TEX2D(_RimTex); UNITY_DECLARE_TEX2D(_OutlineWidthTex); -UNITY_DECLARE_TEX2D(_UvAnimMaskTex); +// NOTE: "tex2d() * _Time.y" returns mediump value if sampler is half precision in Android VR platform +UNITY_DECLARE_TEX2D_FLOAT(_UvAnimMaskTex); CBUFFER_START(UnityPerMaterial) // Vector @@ -35,9 +36,9 @@ half _RimLift; half _RimLightingMix; half _OutlineWidth; half _OutlineLightingMix; -half _UvAnimScrollXSpeed; -half _UvAnimScrollYSpeed; -half _UvAnimRotationSpeed; +float _UvAnimScrollXSpeed; +float _UvAnimScrollYSpeed; +float _UvAnimRotationSpeed; CBUFFER_END // No Using on shader