Merge pull request #6 from Xiexe/development

Merge AO and Defaults changes
Xiexe · Aug 11, 2018 · 043daec · 043daec
2 parents 55dbb50 + 04bd26f
commit 043daec
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/StandardLighting PBR Dithered/StandardLighting.shader b/StandardLighting PBR Dithered/StandardLighting.shader
@@ -23,7 +23,7 @@ Shader "Xiexe/StandardLightingDithered"
         [HDR]_EmissionColor("Emission Color", Color) = (0,0,0,1)
 
         // Dithering
-        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.01
+        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.001
 
         // Specular Lightmap Occlusion
         _SpecularLightmapOcclusion("Specular Lightmap Occlusion Scale", Range(0,1)) = 1
@@ -68,4 +68,4 @@ Shader "Xiexe/StandardLightingDithered"
         ENDCG
     }
     Fallback "Diffuse"
-}
+}
diff --git a/StandardLighting PBR Dithered/StandardLightingFade-1.shader b/StandardLighting PBR Dithered/StandardLightingFade-1.shader
@@ -23,7 +23,7 @@ Shader "Xiexe/StandardLightingDitheredFade-1"
         [HDR]_EmissionColor("Emission Color", Color) = (0,0,0,1)
 
         // Dithering
-        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.01
+        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.001
 
         // Specular Lightmap Occlusion
         _SpecularLightmapOcclusion("Specular Lightmap Occlusion Scale", Range(0,1)) = 1
@@ -143,4 +143,4 @@ Shader "Xiexe/StandardLightingDitheredFade-1"
         }
     }
     Fallback "Diffuse"
-}
+}
diff --git a/StandardLighting PBR Dithered/StandardLightingFade.shader b/StandardLighting PBR Dithered/StandardLightingFade.shader
@@ -23,7 +23,7 @@ Shader "Xiexe/StandardLightingDitheredFade"
         [HDR]_EmissionColor("Emission Color", Color) = (0,0,0,1)
 
         // Dithering
-        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.01
+        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.001
 
         // Specular Lightmap Occlusion
         _SpecularLightmapOcclusion("Specular Lightmap Occlusion Scale", Range(0,1)) = 1
@@ -143,4 +143,4 @@ Shader "Xiexe/StandardLightingDitheredFade"
         }
     }
     Fallback "Diffuse"
-}
+}
diff --git a/StandardLighting PBR Dithered/StandardLightingModelDithered.cginc b/StandardLighting PBR Dithered/StandardLightingModelDithered.cginc
@@ -135,7 +135,7 @@ void surf(Input i , inout SurfaceOutputDitheredStandard o)
     // Ambient Occlusion
     float2 uv_OcclusionMap = i.uv_texcoord * _OcclusionMap_ST.xy + _OcclusionMap_ST.zw;
     float4 occlusion = tex2D(_OcclusionMap, uv_OcclusionMap);
-    o.Occlusion = occlusion;
+    o.Occlusion = lerp(1.0, occlusion, _OcclusionStrength);
 
     // Compute Dithering
     o.Dithering = (ditherNoiseFuncHigh(i.uv_texcoord.xy) - 0.5) * 2 * _NoiseScale;

diff --git a/StandardLighting PBR Dithered/StandardLightingTransparent-1.shader b/StandardLighting PBR Dithered/StandardLightingTransparent-1.shader
@@ -23,7 +23,7 @@ Shader "Xiexe/StandardLightingDitheredTransparent-1"
         [HDR]_EmissionColor("Emission Color", Color) = (0,0,0,1)
 
         // Dithering
-        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.01
+        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.001
 
         // Specular Lightmap Occlusion
         _SpecularLightmapOcclusion("Specular Lightmap Occlusion Scale", Range(0,1)) = 1
@@ -143,4 +143,4 @@ Shader "Xiexe/StandardLightingDitheredTransparent-1"
         }
     }
     Fallback "Diffuse"
-}
+}
diff --git a/StandardLighting PBR Dithered/StandardLightingTransparent.shader b/StandardLighting PBR Dithered/StandardLightingTransparent.shader
@@ -23,7 +23,7 @@ Shader "Xiexe/StandardLightingDitheredTransparent"
         [HDR]_EmissionColor("Emission Color", Color) = (0,0,0,1)
 
         // Dithering
-        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.01
+        _NoiseScale("Dithering Scale", Range(0,0.2)) = 0.001
 
         // Specular Lightmap Occlusion
         _SpecularLightmapOcclusion("Specular Lightmap Occlusion Scale", Range(0,1)) = 1
@@ -143,4 +143,4 @@ Shader "Xiexe/StandardLightingDitheredTransparent"
         }
     }
     Fallback "Diffuse"
-}
+}