Merge branch 'dev'

z3y · Jun 30, 2023 · ee17532 · ee17532
2 parents f6285ce + 96c3010
commit ee17532
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 11 deletions.
diff --git a/Editor/Importer/LitImporter.cs b/Editor/Importer/LitImporter.cs
@@ -201,7 +201,7 @@ internal static string GetShaderLabCode(ShaderSettings settings, string assetPat
             SourceDependencies.Add("Packages/com.z3y.shaders/ShaderLibrary/FragmentShadowCaster.hlsl");
             SourceDependencies.Add("Packages/com.z3y.shaders/ShaderLibrary/FragmentMeta.hlsl");
             SourceDependencies.Add("Packages/com.z3y.shaders/ShaderLibrary/Structs.hlsl");
-            SourceDependencies.Add("Packages/com.z3y.shaders/ShaderLibrary/CustomLighting.hlsl");
+            SourceDependencies.Add("Packages/com.z3y.shaders/ShaderLibrary/ForwardLighting.hlsl");
 
             string definesSbString = shaderBlocks.definesSb.ToString();
             string codeSbSbString = shaderBlocks.codeSb.ToString();

diff --git a/Editor/Importer/LitImporterDefaultProperties.cs b/Editor/Importer/LitImporterDefaultProperties.cs
@@ -40,7 +40,7 @@ [ToggleGroupEnd] [UnIndent] [ToggleOff] _OpaqueLights(""Opaque Lights"", Float)
     // #define BICUBIC_LIGHTMAP // enable bicubic lightmap
     // #define BAKERY_SHNONLINEAR_OFF // disable non linear lightmap sh, enabled by default
     // #define NONLINEAR_LIGHTPROBESH // enable non linear lightprobe sh
-    // #define DISABLE_LIGHT_PROBE_PROXY_VOLUME // enable LPPV
+    // #define DISABLE_LIGHT_PROBE_PROXY_VOLUME // disable LPPV
     // #undef UNITY_SPECCUBE_BLENDING // disable blending of 2 reflection probes
 DEFINES_END
 

diff --git a/Editor/ProjectSettings/ProjectSettings.cs b/Editor/ProjectSettings/ProjectSettings.cs
@@ -7,7 +7,7 @@ namespace z3y.Shaders
 {
     public class ProjectSettings
     {
-        public const string ShaderName = "Lit Variants/Legacy/Lit v2";
+        public const string ShaderName = "Lit Variants/Lit v2";
 
         public static Shader lit => Shader.Find(ShaderName);
 
@@ -23,7 +23,7 @@ public static SettingsProvider CreateProvider()
             }
             var provider = new SettingsProvider("Project/Lit Shader", SettingsScope.Project)
             {
-                label = "Lit Shader",
+                label = "Lit Shader v2 (Legacy)",
                 guiHandler = (searchContext) =>
                 {
 

diff --git a/ShaderLibrary/CustomLighting.hlsl → ShaderLibrary/ForwardLighting.hlsl b/ShaderLibrary/CustomLighting.hlsl → ShaderLibrary/ForwardLighting.hlsl
@@ -503,7 +503,7 @@ namespace CustomLighting
             surfaceDescription.Albedo.rgb = lerp(1.0, surfaceDescription.Albedo.rgb, surfaceDescription.Alpha);
         #endif
 
-        half4 finalColor = half4(surfaceDescription.Albedo * (1.0 - surfaceDescription.Metallic) * (giData.IndirectDiffuse * surfaceDescription.Occlusion + (giData.Light))
+        half4 finalColor = half4(surfaceDescription.Albedo * (1.0 - surfaceDescription.Metallic) * (giData.IndirectDiffuse * surfaceDescription.Occlusion + giData.Light)
                         + giData.Reflections + giData.Specular + surfaceDescription.Emission, surfaceDescription.Alpha);
 
         // fog

diff --git a/ShaderLibrary/CustomLighting.hlsl.meta → ShaderLibrary/ForwardLighting.hlsl.meta b/ShaderLibrary/CustomLighting.hlsl.meta → ShaderLibrary/ForwardLighting.hlsl.meta
diff --git a/ShaderLibrary/Fragment.hlsl b/ShaderLibrary/Fragment.hlsl
@@ -1,4 +1,4 @@
-#include "Packages/com.z3y.shaders/ShaderLibrary/CustomLighting.hlsl"
+#include "Packages/com.z3y.shaders/ShaderLibrary/ForwardLighting.hlsl"
 
 
 #ifdef GENERATION_CODE

diff --git a/ShaderLibrary/LightFunctions.hlsl b/ShaderLibrary/LightFunctions.hlsl
@@ -1,3 +1,6 @@
+#ifndef LIGHTFUNCTIONS_INCLUDED
+#define LIGHTFUNCTIONS_INCLUDED
+
 namespace Filament
 {
     // License included at FilamentLicense.md
@@ -468,4 +471,6 @@ half3 GlossyEnvironmentReflection(half3 reflectVector, float3 positionWS, half p
     irradiance = DecodeHDREnvironment(encodedIrradiance, unity_SpecCube0_HDR);
 #endif // UNITY_SPECCUBE_BLENDING
     return irradiance * occlusion;
-}
+}
+
+#endif
diff --git a/Shaders/Lit.litshader b/Shaders/Lit.litshader
@@ -21,7 +21,7 @@ PROPERTIES_START // Properties
     _ParallaxOffset ("Parallax Offset", Range(-1, 1)) = 0
     [IntRange] [UnIndent] [ToggleGroupEnd] _ParallaxSteps ("Steps", Range(1, 32)) = 16
 
-
+    [Tooltip(Mask(R), Tangent(AG))]
     [Toggle(_ANISOTROPY)] [NoScaleOffset] [ExtraProperty] [Linear] _AnisotropyMap ("Anisotropy", 2D) = "black" {}
     _Anisotropy ("", Range(-1.0, 1.0)) = 0
 

diff --git a/Shaders/Lit/Lit/Lit.shader b/Shaders/Lit/Lit/Lit.shader
@@ -1,4 +1,4 @@
-Shader "Lit Variants/Legacy/Lit v2"
+Shader "Lit Variants/Lit v2"
 {
 
 Properties
@@ -147,6 +147,7 @@ CGINCLUDE
 // #endif
 
 //ConfigStart
+#define _ALLOW_LPPV
 #define FIX_BLACK_LEVEL
 #pragma skip_variants LOD_FADE_CROSSFADE
 #pragma skip_variants LTCGI

diff --git 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.3",
+  "version": "3.2.4",
   "unity": "2019.4",
   "displayName": "z3y - Shaders",
   "hideInEditor": false,