diff --git a/Editor/APIInternal/ShaderInformation.Liltoon.cs b/Editor/APIInternal/ShaderInformation.Liltoon.cs index b6d4f811..1a07760b 100644 --- a/Editor/APIInternal/ShaderInformation.Liltoon.cs +++ b/Editor/APIInternal/ShaderInformation.Liltoon.cs @@ -122,6 +122,7 @@ public override void GetMaterialInformation(MaterialInformationCallback matInfo) return STAndScrollRotateToMatrix("_MainTex_ST", "_MainTex_ScrollRotate"); } +#region Default.lilblock / DefaultALL.lilblock matInfo.RegisterTextureUVUsage("_DitherTex", SamplerStateInformation.LinearRepeatSampler, UsingUVChannels.NonMesh, null); // dither UV is based on screen space @@ -558,7 +559,18 @@ public override void GetMaterialInformation(MaterialInformationCallback matInfo) } // _BaseMap and _BaseColorMap are unused - +#endregion Default.lilblock + +#region DefaultFurCutout, DefaultFurTransparent, DefaultAll, + // fur + LIL_SAMPLE_2D_ST("_FurNoiseMask", "_MainTex", UsingUVChannels.UV0); + LIL_SAMPLE_2D_ST_WithMat("_FurMask", "_MainTex", uvMain, uvMainMatrix); + LIL_SAMPLE_2D_ST_WithMat("_FurLengthMask", "_MainTex", uvMain, uvMainMatrix); + LIL_SAMPLE_2D_WithMat("_FurLengthMask", SamplerStateInformation.LinearRepeatSampler, UsingUVChannels.UV0, + STToMatrix($"_MainTex_ST")); + LIL_SAMPLE_2D_WithMat("_FurVectorTex", SamplerStateInformation.LinearRepeatSampler, uvMain, uvMainMatrix); + +#endregion // Vertex ID var idMaskProperties = new[] { diff --git a/Editor/Processors/ShaderMaterialInformation.cs b/Editor/Processors/ShaderMaterialInformation.cs index fdac7efc..16b19efa 100644 --- a/Editor/Processors/ShaderMaterialInformation.cs +++ b/Editor/Processors/ShaderMaterialInformation.cs @@ -162,6 +162,7 @@ public override void RegisterTextureUVUsage( if ((_supportedKind & ShaderInformationKind.TextureAndUVUsage) == 0) throw new InvalidOperationException("RegisterOtherUVUsage is not registered as supported information"); if (_textureUsageInformations == null) return; + if (_material.HasTexture(textureMaterialPropertyName)) return; UVChannel uvChannel; switch (uvChannels) {