Skip to content

Commit

Permalink
v17
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarthShader
DarthShader committed Aug 22, 2020
1 parent 45ad80d commit c2314f2
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Shaders/Kaj/Editor/KajShaderEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ protected void DrawPropertiesGUIRecursive(MaterialEditor materialEditor, Materia
continue;
float h = materialEditor.GetPropertyHeight(props[i], props[i].displayName);
Rect r = EditorGUILayout.GetControlRect(true, h, EditorStyles.layerMaskField);
materialEditor.ShaderProperty(r, props[i], props[i].displayName);
materialEditor.ShaderProperty(r, props[i], props[i].displayName); // something is throwing a warning here
}

}
Expand Down
122 changes: 105 additions & 17 deletions Shaders/Kaj/KajCore.cginc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ UNITY_DECLARE_TEX2D_NOSAMPLER(_MetallicGlossMap); // Standard metallic map
uniform float _SpecularHighlights; // Standard specular highlights toggle
uniform float _GlossyReflections; // Standard reflections toggle
uniform half _BumpScale; // Standard normal map scale
// Problem using tex2Dbias with the Unity sampler definition
UNITY_DECLARE_TEX2D(_BumpMap); // Standard normal map
//sampler2D _BumpMap;
uniform float4 _BumpMap_ST;
uniform float4 _BumpMap_TexelSize;
uniform half _Parallax; // Standard height map scale
Expand Down Expand Up @@ -227,9 +225,7 @@ uniform float _DiffuseWrap; // Lambert shading diffu
uniform float _DiffuseWrapIntensity; // Lambert shading diffuse wrap toggle
uniform float _DiffuseWrapConserveEnergy; // Lambert shading diffuse wrap toggle
uniform float group_toggle_PreIntegratedSkin;
// Problem using tex2Dlod with the Unity texture macro
//UNITY_DECLARE_TEX2D(_PreIntSkinTex);
sampler2D _PreIntSkinTex; // BRDF diffuse term lookup texture
UNITY_DECLARE_TEX2D(_PreIntSkinTex); // BRDF diffuse term lookup texture
uniform float _BumpBlurBias; // Pre-Integrated Skin parameters
uniform float _BlurStrength; // Pre-Integrated Skin parameters
uniform float _CurvatureInfluence; // Pre-Integrated Skin parameters
Expand All @@ -239,6 +235,7 @@ uniform float group_toggle_SSSTransmission;
UNITY_DECLARE_TEX2D_NOSAMPLER(_TranslucencyMap); // Subsurface Transmission relative thickness map
uniform float4 _TranslucencyMap_ST;
uniform float4 _TranslucencyMap_TexelSize;
uniform float _TranslucencyMapUV;
uniform float _SSSTranslucencyMax;
uniform float _SSSTranslucencyMin;
uniform float _SSSTransmissionPower;
Expand All @@ -265,12 +262,21 @@ uniform float _SpecularMapUV;
uniform float _CombinedMapUV;
uniform float _DetailMaskUV;
uniform float _ParallaxMapUV;
uniform float _TranslucencyMapUV;
uniform float _ParallaxUV0;
uniform float _ParallaxUV1;
uniform float _ParallaxUV2;
uniform float _ParallaxUV3;
uniform float _TriplanarUseVertexColors;
uniform float _DebugWorldNormals;
uniform float4 _AOColorBleed;
uniform float _DebugOcclusion;
uniform float _EmissionTintByAlbedo;
uniform float _SpecularAnisotropy;
uniform float _SpecularAnisotropyAngle;
UNITY_DECLARE_TEX2D_NOSAMPLER(_SpecularAnisotropyTangentMap);
uniform float4 _SpecularAnisotropyTangentMap_ST;
uniform float4 _SpecularAnisotropyTangentMap_TexelSize;
uniform float _SpecularAnisotropyTangentMapUV;

// Reusable macros and functions

Expand Down Expand Up @@ -589,6 +595,14 @@ float3 roundVertex(float3 vert, half factor) // good default is 120
return round(vert * factor) / factor;
}

// Affine texture transformation
half4 sampleAffine(sampler2D tex, float4 objPosition, float2 coord, float4 st)
{
float3 texcoord = float3((coord.xy* st.xy + st.zw) * objPosition.w, objPosition.w);
return tex2D(tex, texcoord.xy / texcoord.z);
}


fixed switchChannel(half channel, fixed4 combinedTex)
{
if (channel == 0)
Expand Down Expand Up @@ -666,6 +680,22 @@ half2 stereoCorrectScreenUV(half4 screenPos)
return uv;
}

// Burley12
// Apparently HDRP implementation doesn't divide by pi, so skipping that
float GGXTerm_Aniso(float TdotH, float BdotH, float roughnessT, float roughnessB, float NdotH)
{
float denom = TdotH * TdotH / (roughnessT * roughnessT) + BdotH * BdotH / (roughnessB * roughnessB) + NdotH * NdotH;
return (1.0 / ( roughnessT*roughnessB * denom*denom));
}

float SmithJointGGXAniso(float TdotV, float BdotV, float NdotV, float TdotL, float BdotL, float NdotL, float roughnessT, float roughnessB)
{
float lambdaV = NdotL * sqrt(roughnessT * TdotV * TdotV + roughnessB * BdotV * BdotV + NdotV * NdotV);
float lambdaL = NdotV * sqrt(roughnessT * TdotL * TdotL + roughnessB * BdotL * BdotL + NdotL * NdotL);
return 0.5 / max(1e-5f, (lambdaV + lambdaL) );
}


// Reusable vert/frag/geoms

UNITY_INSTANCING_BUFFER_START(Props)
Expand Down Expand Up @@ -907,6 +937,8 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
perceptualRoughness = 1.0 - perceptualRoughness;
perceptualRoughness = _GlossinessMin + perceptualRoughness * (_Glossiness - _GlossinessMin);
occlusion = lerp(1, occlusion, _OcclusionStrength);
if (_DiffuseMode == 2) // Color bleed only available on Skin diffuse, may change later. Occlusion tint is also a thing
occlusion = pow(occlusion, 1 - _AOColorBleed);
specularScale = _SpecularMin + specularScale * (_SpecularMax - _SpecularMin);
specularScale *= _SpecColor;

Expand Down Expand Up @@ -979,8 +1011,8 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
_DetailNormalMapBlue_var.xyz = UnpackScaleNormal(_DetailNormalMapBlue_var, _DetailNormalMapScaleBlue);
blendedNormal = lerp(blendedNormal, BlendNormals(blendedNormal, _DetailNormalMapBlue_var.xyz), _DetailMask_var.b);
}
float3x3 tangentTransform = float3x3(i.tangentWorld, i.bitangentWorld, i.normalWorld);
fixed3 normalDir = normalize(mul(blendedNormal, tangentTransform));
float3x3 tangentToWorld = float3x3(i.tangentWorld, i.bitangentWorld, i.normalWorld);
fixed3 normalDir = normalize(mul(blendedNormal, tangentToWorld));


// Common vars
Expand All @@ -996,6 +1028,12 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
float NdotH = saturate(dot(normalDir, halfDir));
half LdotV = saturate(dot(lightDir, viewDir));
half LdotH = saturate(dot(lightDir, halfDir));
float TdotH = dot(i.tangentWorld, halfDir);
float BdotH = dot(i.bitangentWorld, halfDir);
float TdotV = dot(i.tangentWorld, viewDir);
float BdotV = dot(i.bitangentWorld, viewDir);
float TdotL = dot(i.tangentWorld, lightDir);
float BdotL = dot(i.bitangentWorld, lightDir);
fixed RVdotL = max(0, dot(viewReflectDir, lightDir));
half smoothness = 1.0f - perceptualRoughness;
float roughness = max(PerceptualRoughnessToRoughness(perceptualRoughness), 0.002);
Expand Down Expand Up @@ -1043,7 +1081,7 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
blurredWorldNormal = UnpackScaleNormal(blurredWorldNormal_var, _BumpScale);
// Lerp blurred normal against combined normal by blur strength
blurredWorldNormal = lerp(blendedNormal, blurredWorldNormal, _BlurStrength);
blurredWorldNormal = normalize(mul(blurredWorldNormal, tangentTransform));
blurredWorldNormal = normalize(mul(blurredWorldNormal, tangentToWorld));

// use fwidth to get surface curvature via world normal and world position
UNITY_BRANCH
Expand Down Expand Up @@ -1107,10 +1145,9 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
else if (_DiffuseMode == 2) // Skin
{
float NdotLBlurredUnclamped = dot(blurredWorldNormal, lightDir);
//NdotLBlurredUnclamped = NdotLBlurredUnclamped * _DiffuseWrap + (1-_DiffuseWrap);
NdotLBlurredUnclamped = NdotLBlurredUnclamped * 0.5 + 0.5;
// Pre integrated skin lookup tex serves as the BRDF diffuse term
half3 brdf = tex2Dlod(_PreIntSkinTex, float4(NdotLBlurredUnclamped , Curvature, 0, 0));
half3 brdf = UNITY_SAMPLE_TEX2D_LOD(_PreIntSkinTex, half2(NdotLBlurredUnclamped, Curvature), 0);
color.rgb += diffColor * (indirect_diffuse + lightColor * brdf);
}
else if (_DiffuseMode == 3) // Flat Lit
Expand All @@ -1135,15 +1172,60 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
{
color.rgb += pow(RVdotL, _PhongSpecularPower) * _PhongSpecularIntensity * lightColor * specularScale;
}
else if (_SpecularMode == 1 || _SpecularMode == 3) // PBR
else if (_SpecularMode == 1 || _SpecularMode == 2 || _SpecularMode == 3) // PBR, Anisotropic, and Skin
{
float V = SmithJointGGXVisibilityTerm (NdotL, NdotV, roughness);
float D = GGXTerm (NdotH, roughness);
float V = 0;
float D = 0;

UNITY_BRANCH
if (_SpecularMode == 2)
{
// Two roughness params from a single anisotropy parameter
// Would be better to have full independent roughness control in the future
float roughnessT = roughness;
float roughnessB = lerp(0.002, roughness, 1-_SpecularAnisotropy);
roughnessT *= roughnessT;
roughnessB *= roughnessB;

// Use tangent map if it exists
UNITY_BRANCH
if (_SpecularAnisotropyTangentMap_TexelSize.x != 1)
{
fixed4 _SpecularAnisotropyTangentMap_var = 0;
PBR_SAMPLE_TEX2DS_SAMPLER(_SpecularAnisotropyTangentMap_var, _SpecularAnisotropyTangentMap, _MainTex);
_SpecularAnisotropyTangentMap_var.xyz = UnpackNormal(_SpecularAnisotropyTangentMap_var);
// blend with unmultiplied tangent space normal (from normal map?)
// perturb tangent then recalculate bitangent?
// rotate tanget and bitangent
// tangentDirectionMap = mul(tangentToWorld, float3(normalLocalAniso.rg, 0.0)).xyz; ?
}

// Rotate tangent/bitangent via the tangentToWorld matrix
half theta = radians(_SpecularAnisotropyAngle);
half3 rotatedTangent = half3(cos(theta), sin(theta), 0);
rotatedTangent = normalize(mul(rotatedTangent, tangentToWorld));
half3 rotatedBitangent = normalize(cross(i.normalWorld, rotatedTangent));
// Overwriting these dot products because they're not used anywhere else atm
TdotH = dot(rotatedTangent, halfDir);
BdotH = dot(rotatedBitangent, halfDir);
TdotV = dot(rotatedTangent, viewDir);
BdotV = dot(rotatedBitangent, viewDir);
TdotL = dot(rotatedTangent, lightDir);
BdotL = dot(rotatedBitangent, lightDir);
V = SmithJointGGXAniso(TdotV, BdotV, NdotV, TdotL, BdotL, NdotL, roughnessT, roughnessB);
D = GGXTerm_Aniso(TdotH, BdotH, roughnessT, roughnessB, NdotH);
}
else
{
V = SmithJointGGXVisibilityTerm (NdotL, NdotV, roughness);
D = GGXTerm (NdotH, roughness);
}

half3 specularTerm = V*D * UNITY_PI; // Torrance-Sparrow model, Fresnel is applied later
#ifdef UNITY_COLORSPACE_GAMMA
specularTerm = sqrt(max(1e-4h, specularTerm));
#endif
specularTerm = max(0, specularTerm * NdotL) * occlusion; // added ao
specularTerm = max(0, specularTerm * NdotL) * occlusion; // added direct specular occlusion - should probably be a dedicated setting
color.rgb += specularTerm * lightColor * FresnelTerm (specColor, LdotH);
}
}
Expand Down Expand Up @@ -1205,9 +1287,15 @@ half4 frag_full_pbr (v2f_full i) : SV_Target
// Emission
fixed4 _EmissionMap_var = 0;
PBR_SAMPLE_TEX2DS_SAMPLER(_EmissionMap_var, _EmissionMap, _MainTex);
color.rgb += _EmissionColor.rgb * _EmissionMap_var.rgb;
color.rgb += _EmissionColor.rgb * lerp(_EmissionMap_var.rgb, albedo.rgb * _EmissionMap_var.rgb, _EmissionTintByAlbedo);

UNITY_APPLY_FOG(i.fogCoord, color);

// Debug
if (_DebugWorldNormals)
color.rgb = normalDir;
if (_DebugOcclusion)
color.rgb = occlusion;
return color;
}

Expand Down Expand Up @@ -1429,7 +1517,7 @@ float4 frag_meta_full (v2f_meta_full i) : SV_Target
o.VizUV = i.vizUV;
o.LightCoord = i.lightCoord;
#endif
o.Emission = _EmissionColor.rgb * _EmissionMap_var.rgb;
o.Emission = _EmissionColor.rgb * lerp(_EmissionMap_var.rgb, o.Albedo.rgb * _EmissionMap_var.rgb, _EmissionTintByAlbedo);
return UnityMetaFragment(o);
}

Expand Down
39 changes: 27 additions & 12 deletions Shaders/Kaj/PBR.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Shader "Kaj/PBR"
_EmissionMap("Emission Map", 2D) = "white" {}
[Indent]
[Enum(UV0,0,UV1,1,UV2,2,UV3,3,World Triplanar,4,Object Triplanar,5)]_EmissionMapUV ("UV Set", Int) = 0
_EmissionTintByAlbedo("Tint by Albedo", Range(0,1)) = 0
[HideInInspector]end_Main("", Int) = 1

[HideInInspector]group_StandardSettings("Standard Settings", Int) = 0
Expand Down Expand Up @@ -79,13 +80,14 @@ Shader "Kaj/PBR"
[HideInInspector]end_CombinedMap("", Int) = 0
[HideInInspector]end_StandardSettings("", Int) = 1

[HideInInspector]group_Lighting("Lighting", Int) = 0
[HideInInspector]group_Lighting("Lighting Settings", Int) = 0
[ToggleUI]_HDREnabled("HDR Enabled", Int) = 1
[ToggleUI]_ReceiveShadows("Receive Shadows", Int) = 1
// Shadow strength
// Shadow smoothstep
// Fake light direction
// Estimate baked light direction toggle
// Receive Fog
// Shadow strength (0-1)
// Shadow smoothstep (0-1)
// Fake light direction (toggle + vector3)
// Estimate baked light direction toggle (toggle)
// Full vertex light shading and specular toggle
[HideInInspector]end_Lighting("", Int) = 0

Expand All @@ -104,20 +106,28 @@ Shader "Kaj/PBR"
_CurvatureInfluence("Curvature Influence", Range (0,1)) = 0.5
_CurvatureScale("Curvature Scale", Float) = 0.02
_CurvatureBias("Curvature Bias", Range(0,1)) = 0
_AOColorBleed("AO Color Bleed", Color) = (0.4,0.15,0.13,1)
[HideInInspector]end_SkinDiffuse("", Int) = 0
//[HideInInspector]group_ToonRampDiffuse("Toon", Int) = 0
//[HideInInspector]end_ToonRampDiffuse("", Int) = 0
[HideInInspector]end_Diffuse("", Int) = 0

[HideInInspector][ToggleUI]group_toggle_Specular("Specular Highlights", Int) = 1
//[WideEnum(Phong,0, PBR,1, Anisotropic,2, Skin,3, Toon,4)]_SpecularMode("Mode", Int) = 1
[WideEnum(Phong,0, PBR,1, Skin,3)]_SpecularMode("Mode", Int) = 1
[WideEnum(Phong,0, PBR,1, PBR Anisotropic,2, Skin,3)]_SpecularMode("Mode", Int) = 1
[HideInInspector]group_PhongSpecular("Phong", Int) = 0
_PhongSpecularPower("Power", Range(1,1000)) = 5
_PhongSpecularIntensity("Intensity", Range(0,1)) = 1
[HideInInspector]end_PhongSpecular("", Int) = 0
//[HideInInspector]group_AnisotropicSpecular("Anisotropic", Int) = 0
//[HideInInspector]end_AnisotropicSpecular("", Int) = 0
[HideInInspector]group_PBRAnisotropicSpecular("PBR Anisotropic", Int) = 0
_SpecularAnisotropy("Anisotropy", Range(0,1)) = 0
_SpecularAnisotropyAngle("Angle", Range(-90,90)) = 0
//[Normal]_SpecularAnisotropyTangentMap("Tangent Map", 2D) = "bump" {}
//[Indent]
// [Enum(UV0,0,UV1,1,UV2,2,UV3,3,World Triplanar,4,Object Triplanar,5)]_SpecularAnisotropyTangentMapUV ("UV Set", Int) = 0
// Independent roughness control toggle
// Bitangent roughness map + controls
[HideInInspector]end_PBRAnisotropicSpecular("", Int) = 0
//[HideInInspector]group_ToonSpecular("Toon", Int) = 0
//[HideInInspector]end_ToonSpecular("", Int) = 0
[HideInInspector]end_Specular("", Int) = 0
Expand All @@ -126,6 +136,8 @@ Shader "Kaj/PBR"
//[WideEnum(Basic,0, PBR,1, Skin,2, Toon,3)]_ReflectionsMode("Mode", Int) = 1
[WideEnum(PBR,1, Skin,2)]_ReflectionsMode("Mode", Int) = 1
[ToggleUI]_GlossyReflections("Glossy Reflections", Int) = 1
// Fallback reflection cubemap
// Use only as fallback toggle
[HideInInspector]group_PBRReflections("PBR", Int) = 0
_StandardFresnelIntensity("Fresnel Intensity", Range(0,1)) = 1.0
[HideInInspector]end_PBRReflections("", Int) = 0
Expand Down Expand Up @@ -189,10 +201,11 @@ Shader "Kaj/PBR"
_SSSTransmissionPower("Power", Range(1,8)) = 2
_SSSTransmissionDistortion("Normals Distortion", Range(0,1)) = 0.1
_SSSTransmissionScale("Scale", Range(1,8)) = 4
// Change to single slider
[ToggleUI]_SSSStylizedIndirect("Stylized Indirect Diffuse Transmission", Int) = 0
[Indent]
_SSSStylizedIndirectIntensity("Intensity", Range(0,1)) = 1
// Scale by translucency checkbox
// Modulate by translucency checkbox
[HideInInspector]end_SSSTransmission("", Int) = 0

[HideInInspector]group_Triplanar("Triplanar Mapping", Int) = 0
Expand Down Expand Up @@ -226,10 +239,12 @@ Shader "Kaj/PBR"
[WideEnum(UnityEngine.Rendering.CompareFunction)] _StencilComp ("Compare Function", Int) = 8
[HideInInspector]end_Stencil("", Int) = 0

//[HideInInspector]group_Debug("Debug", Int) = 0
//[HideInInspector]end_Debug("", Int) = 0
[HideInInspector]group_Debug("Debug", Int) = 0
[ToggleUI]_DebugWorldNormals("Show World Normal Direction", Int) = 0
[ToggleUI]_DebugOcclusion("Show Occlusion", Int) = 0
[HideInInspector]end_Debug("", Int) = 0

[KajLabel]_Version("Shader Version: 16", Int) = 16
[KajLabel]_Version("Shader Version: 17", Int) = 17
}

CustomEditor "Kaj.ShaderEditor"
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Kaj/Textures/diffusescatteringonring_gamma1024.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c2314f2

Please sign in to comment.