summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryum <yum.food.vr@gmail.com>2024-07-15 13:53:48 -0700
committeryum <yum.food.vr@gmail.com>2024-07-15 13:53:48 -0700
commit65960b924a861f273b72157456aabaa694831976 (patch)
tree26ae1b61e1581e5754843e70f785dda6bf4761a0
parent09de70448b051e20fbfbd56ee00b24168bdd90ab (diff)
Add filament-style clearcoat
-rw-r--r--Editor/tooner.cs86
-rw-r--r--MochieStandardBRDF.cginc16
-rw-r--r--feature_macros.cginc2
-rw-r--r--filament_math.cginc261
-rw-r--r--globals.cginc6
-rw-r--r--pbr.cginc1
-rw-r--r--tooner.shader4
7 files changed, 311 insertions, 65 deletions
diff --git a/Editor/tooner.cs b/Editor/tooner.cs
index adc0fca..2c02896 100644
--- a/Editor/tooner.cs
+++ b/Editor/tooner.cs
@@ -98,6 +98,24 @@ public class ToonerGUI : ShaderGUI {
SetKeyword("_ROUGHNESS_MAP", bct.textureValue);
}
+ void DoClearcoat() {
+ MaterialProperty bc;
+ bc = FindProperty("_Clearcoat_Enabled");
+ bool enabled = bc.floatValue > 1E-6;
+ EditorGUI.BeginChangeCheck();
+ enabled = EditorGUILayout.Toggle("Enable clearcoat", enabled);
+ EditorGUI.EndChangeCheck();
+ bc.floatValue = enabled ? 1.0f : 0.0f;
+ SetKeyword("_CLEARCOAT", enabled);
+
+ if (enabled) {
+ bc = FindProperty("_Clearcoat_Strength");
+ editor.RangeProperty(bc, "Strength");
+ bc = FindProperty("_Clearcoat_Roughness");
+ editor.RangeProperty(bc, "Roughness");
+ }
+ }
+
enum PbrAlbedoMixMode {
AlphaBlend,
Add,
@@ -1028,55 +1046,9 @@ public class ToonerGUI : ShaderGUI {
void DoMochieParams() {
MaterialProperty bc;
- GUILayout.Label("SSS", EditorStyles.boldLabel);
- {
- EditorGUI.indentLevel += 1;
- bc = FindProperty("_ScatterDist");
- editor.FloatProperty(bc, "Distance");
- bc = FindProperty("_ScatterPow");
- editor.FloatProperty(bc, "Power");
- bc = FindProperty("_ScatterIntensity");
- editor.FloatProperty(bc, "Intensity");
- bc = FindProperty("_ScatterAmbient");
- editor.FloatProperty(bc, "Ambient");
- EditorGUI.indentLevel -= 1;
- }
- GUILayout.Label("SSR", EditorStyles.boldLabel);
- {
- EditorGUI.indentLevel += 1;
-
- bc = FindProperty("_Enable_SSR");
- bool enabled = (bc.floatValue != 0.0);
- EditorGUI.BeginChangeCheck();
- enabled = EditorGUILayout.Toggle("Enable SSR", enabled);
- EditorGUI.EndChangeCheck();
- bc.floatValue = enabled ? 1.0f : 0.0f;
- SetKeyword("SSR_ENABLED", enabled);
-
- if (enabled) {
- bc = FindProperty("_SSRStrength");
- editor.FloatProperty(bc, "Strength");
- bc = FindProperty("_SSRHeight");
- editor.FloatProperty(bc, "Height");
- bc = FindProperty("_EdgeFade");
- editor.FloatProperty(bc, "Edge fade");
- }
- EditorGUI.indentLevel -= 1;
- }
- GUILayout.Label("GSAA", EditorStyles.boldLabel);
- {
- EditorGUI.indentLevel += 1;
- bc = FindProperty("_GSAA");
- editor.FloatProperty(bc, "Enable");
- bc = FindProperty("_GSAAStrength");
- editor.FloatProperty(bc, "Strength");
- EditorGUI.indentLevel -= 1;
- }
bc = FindProperty("_WrappingFactor");
editor.FloatProperty(bc, "Wrapping factor");
- bc = FindProperty("_Subsurface");
- editor.FloatProperty(bc, "Subsurface");
bc = FindProperty("_SpecularStrength");
editor.FloatProperty(bc, "Specular strength");
bc = FindProperty("_FresnelStrength");
@@ -1085,23 +1057,6 @@ public class ToonerGUI : ShaderGUI {
editor.FloatProperty(bc, "Use fresnel");
bc = FindProperty("_ReflectionStrength");
editor.FloatProperty(bc, "Reflection strength");
- /*
-float _ScatterDist;
-float _ScatterPow;
-float _ScatterIntensity;
-float _ScatterAmbient;
-float _GSAA;
-float _GSAAStrength;
-float _WrappingFactor;
-float _Subsurface;
-float _SpecularStrength;
-float _FresnelStrength;
-float _UseFresnel;
-float _ReflectionStrength;
-float3 shadowedReflections;
-float3 _ReflShadows;
-float3 _ReflShadowStrength;
-*/
}
enum RenderingMode {
@@ -1300,6 +1255,11 @@ float3 _ReflShadowStrength;
DoPBROverlay();
+ GUILayout.Label("Clearcoat", EditorStyles.boldLabel);
+ EditorGUI.indentLevel += 1;
+ DoClearcoat();
+ EditorGUI.indentLevel -= 1;
+
DoDecal();
GUILayout.Label("Lighting", EditorStyles.boldLabel);
diff --git a/MochieStandardBRDF.cginc b/MochieStandardBRDF.cginc
index 795bbee..90f5df5 100644
--- a/MochieStandardBRDF.cginc
+++ b/MochieStandardBRDF.cginc
@@ -1,6 +1,9 @@
#ifndef MOCHIE_STANDARD_BRDF_INCLUDED
#define MOCHIE_STANDARD_BRDF_INCLUDED
+#include "filament_math.cginc"
+#include "globals.cginc"
+
/*
* MIT License
*
@@ -54,7 +57,7 @@ float GSAARoughness(float3 normal, float roughness){
half4 BRDF1_Mochie_PBS (
half3 diffColor, half3 specColor, half oneMinusReflectivity, half smoothness,
- half3 normal, half3 viewDir, half3 worldPos, half2 screenUVs, half4 screenPos,
+ half3 normal, half3 mesh_normal, half3 viewDir, half3 worldPos, half2 screenUVs, half4 screenPos,
half metallic, half thickness, half3 ssColor, half atten, float2 lightmapUV, float3 vertexColor,
UnityLight light, UnityIndirect gi)
{
@@ -170,6 +173,17 @@ half4 BRDF1_Mochie_PBS (
// reflCol *= lerp(1, vertexColor, _ReflVertexColor*_ReflVertexColorStrength);
// #endif
+#if defined(_CLEARCOAT)
+ half cc_nh = saturate(dot(mesh_normal, halfDir));
+ float clearcoat = FilamentClearcoat(
+ _Clearcoat_Roughness,
+ _Clearcoat_Strength,
+ cc_nh,
+ lh,
+ halfDir);
+ specCol += clearcoat * saturate(dot(mesh_normal, light.dir)) * 10;
+#endif
+
return half4(diffCol + specCol + reflCol + subsurfaceCol, 1);
}
diff --git a/feature_macros.cginc b/feature_macros.cginc
index d9de678..8246737 100644
--- a/feature_macros.cginc
+++ b/feature_macros.cginc
@@ -91,7 +91,7 @@
#pragma shader_feature_local _ _GIMMICK_EYES_00
#pragma shader_feature_local _ _PIXELLATE
#pragma shader_feature_local _ _TROCHOID
-#pragma shader_feature_local _ SSR_ENABLED
+#pragma shader_feature_local _ _CLEARCOAT
#endif // __FEATURE_MACROS_INC
diff --git a/filament_math.cginc b/filament_math.cginc
new file mode 100644
index 0000000..38a30e8
--- /dev/null
+++ b/filament_math.cginc
@@ -0,0 +1,261 @@
+#ifndef __FILAMENT_MATH_INC
+#define __FILAMENT_MATH_INC
+
+#define PI 3.1415926535897932384626433832795028841971
+
+/*
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+float D_GGX(float roughness, float NoH, const float3 h) {
+ // Walter et al. 2007, "Microfacet Models for Refraction through Rough Surfaces"
+
+ // In mediump, there are two problems computing 1.0 - NoH^2
+ // 1) 1.0 - NoH^2 suffers floating point cancellation when NoH^2 is close to 1 (highlights)
+ // 2) NoH doesn't have enough precision around 1.0
+ // Both problem can be fixed by computing 1-NoH^2 in highp and providing NoH in highp as well
+
+ // However, we can do better using Lagrange's identity:
+ // ||a x b||^2 = ||a||^2 ||b||^2 - (a . b)^2
+ // since N and H are unit vectors: ||N x H||^2 = 1.0 - NoH^2
+ // This computes 1.0 - NoH^2 directly (which is close to zero in the highlights and has
+ // enough precision).
+ // Overall this yields better performance, keeping all computations in mediump
+#if defined(TARGET_MOBILE)
+ float3 NxH = cross(shading_normal, h);
+ float oneMinusNoHSquared = dot(NxH, NxH);
+#else
+ float oneMinusNoHSquared = 1.0 - NoH * NoH;
+#endif
+
+ float a = NoH * roughness;
+ float k = roughness / (oneMinusNoHSquared + a * a);
+ float d = k * k * (1.0 / PI);
+ return saturate(d);
+}
+
+float3 F_Schlick(const float3 f0, float VoH) {
+ float f = pow(1.0 - VoH, 5.0);
+ return f + f0 * (1.0 - f);
+}
+
+float V_Kelemen(float LoH) {
+ // Kelemen 2001, "A Microfacet Based Coupled Specular-Matte BRDF Model with
+ // Importance Sampling"
+ return saturate(0.25 / (LoH * LoH));
+}
+
+float FilamentClearcoat(
+ float roughness,
+ float strength,
+ float NoH,
+ float LoH,
+ float3 h) {
+ float Dc = D_GGX(roughness, NoH, h);
+ float Vc = V_Kelemen(LoH);
+ float Fc = F_Schlick(0.04, LoH) * strength;
+ return (Dc * Vc) * Fc;
+}
+
+#endif // __FILAMENT_MATH_INC
+
diff --git a/globals.cginc b/globals.cginc
index 4aab736..128972b 100644
--- a/globals.cginc
+++ b/globals.cginc
@@ -38,6 +38,12 @@ float3 shadowedReflections;
float3 _ReflShadows;
float3 _ReflShadowStrength;
+#if defined(_CLEARCOAT)
+float _Clearcoat_Enabled;
+float _Clearcoat_Strength;
+float _Clearcoat_Roughness;
+#endif
+
#if defined(SSR_ENABLED)
UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture);
sampler2D _GrabTexture;
diff --git a/pbr.cginc b/pbr.cginc
index 325ff79..7b37d86 100644
--- a/pbr.cginc
+++ b/pbr.cginc
@@ -237,6 +237,7 @@ float4 getLitColor(
one_minus_reflectivity,
smoothness,
normal,
+ i.normal,
view_dir,
i.worldPos,
screenUVs,
diff --git a/tooner.shader b/tooner.shader
index a5cca46..45fa9e2 100644
--- a/tooner.shader
+++ b/tooner.shader
@@ -6,6 +6,10 @@ Shader "yum_food/tooner"
_Metallic("Metallic", Range(0, 1)) = 0
_Roughness("Roughness", Range(0, 1)) = 1
+ _Clearcoat_Enabled("Clearcoat enabled", Float) = 0
+ _Clearcoat_Strength("Clearcoat strength", Range(0, 1)) = 0
+ _Clearcoat_Roughness("Clearcoat strength", Range(0, 1)) = 0
+
[NoScaleOffset] _MainTex("Base color", 2D) = "white" {}
[NoScaleOffset] _NormalTex("Normal", 2D) = "bump" {}
[NoScaleOffset] _MetallicTex("Metallic", 2D) = "white" {}