diff --git a/ShaderLibrary/ForwardLighting.hlsl b/ShaderLibrary/ForwardLighting.hlsl index a18d564..052ce50 100644 --- a/ShaderLibrary/ForwardLighting.hlsl +++ b/ShaderLibrary/ForwardLighting.hlsl @@ -18,6 +18,7 @@ namespace CustomLighting void ApplyAlphaClip(inout SurfaceDescription surfaceDescription) { #if defined(_ALPHATEST_ON) && defined(ALPHATOCOVERAGE_ON) + clip(surfaceDescription.Alpha - 0.2); surfaceDescription.Alpha = (surfaceDescription.Alpha - surfaceDescription.AlphaClipThreshold) / max(fwidth(surfaceDescription.Alpha), surfaceDescription.AlphaClipSharpness) + 0.5f; #endif diff --git a/Shaders/Lit Crossfade.litshader b/Shaders/Lit Crossfade.litshader new file mode 100644 index 0000000..109da38 --- /dev/null +++ b/Shaders/Lit Crossfade.litshader @@ -0,0 +1,5 @@ +#include "Packages/com.z3y.shaders/Shaders/Lit.litshader" + +DEFINES_START + #pragma multi_compile LOD_FADE_CROSSFADE +DEFINES_END \ No newline at end of file diff --git a/Shaders/Lit Crossfade.litshader.meta b/Shaders/Lit Crossfade.litshader.meta new file mode 100644 index 0000000..7a16d2c --- /dev/null +++ b/Shaders/Lit Crossfade.litshader.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 87f2b604a52e6cf42958bcbac9517c4a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: c6b508151abe0a040a11a4b72bff5b69, type: 3} + settings: + shaderName: + materialType: 0 + bicubicLightmap: 0 + gsaa: 0 + anisotropy: 3 + bakeryMonoSH: 0 + lightmappedSpecular: 0 + grabPass: 0 + alphaToCoverage: 1 + customEditorGUI: diff --git a/Shaders/Lit/ShaderLibrary/Common.hlsl b/Shaders/Lit/ShaderLibrary/Common.hlsl index 52836a3..73374a4 100644 --- a/Shaders/Lit/ShaderLibrary/Common.hlsl +++ b/Shaders/Lit/ShaderLibrary/Common.hlsl @@ -376,6 +376,7 @@ float3 ditherNoiseFuncHigh(float2 p) uniform half _CutoutSharpness; void AACutout(inout half alpha, half cutoff) { + clip(alpha - 0.2); alpha = (alpha - cutoff) / max(fwidth(alpha), _CutoutSharpness) + 0.5; } diff --git a/package.json b/package.json index 28824a1..3da5090 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.z3y.shaders", "description": "A Standard Shader and Surface Shaders replacement for Unity for Built-In pipeline and forward rendering (VRChat)", - "version": "3.2.12", + "version": "3.2.13", "unity": "2019.4", "displayName": "z3y - Shaders", "hideInEditor": false,