diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset.shader b/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset.shader index 3edbe6f..e6c5512 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset.shader @@ -13,6 +13,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset" { _Intensity ("Intensity", Range(0, 10)) = 0.8 _Saturation ("Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _NormalMap ("Normal Map", 2D) = "bump" {} @@ -124,6 +125,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING #define NOENOETOON_RAMP_MASKING @@ -203,6 +205,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset" { #pragma shader_feature_local _OUTLINE_SCREENSPACE #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING #define NOENOETOON_OUTLINE_PASS @@ -337,6 +340,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Vertex Offset" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING #define NOENOETOON_RAMP_MASKING diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/Noenoe Toon Eye Tracking.shader b/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/Noenoe Toon Eye Tracking.shader index fbe7352..4c71d7d 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/Noenoe Toon Eye Tracking.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/Advanced/Noenoe Toon Eye Tracking.shader @@ -13,6 +13,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Eye Tracking" { _Intensity ("Intensity", Range(0, 10)) = 0.8 _Saturation ("Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _NormalMap ("Normal Map", 2D) = "bump" {} @@ -95,6 +96,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Eye Tracking" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; @@ -169,6 +171,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/Advanced/NoeNoe Toon Eye Tracking" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Outline.shader b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Outline.shader index 424bd44..03a7ff4 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Outline.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Outline.shader @@ -13,7 +13,8 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Outline" { _Intensity ("Intensity", Range(0, 10)) = 0.8 _Saturation ("Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 - _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 + _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 3 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _NormalMap ("Normal Map", 2D) = "bump" {} [Enum(None,0,Metallic,1,Specular,2)] _MetallicMode("Metallic Mode", Float) = 0 @@ -102,6 +103,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Outline" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; @@ -178,6 +180,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Outline" { #pragma shader_feature_local _OUTLINE_SCREENSPACE #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING #define NOENOETOON_OUTLINE_PASS @@ -291,6 +294,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Outline" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked.shader b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked.shader index 95d4b5b..8a15227 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked.shader @@ -13,7 +13,8 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked" { _Intensity ("Default Intensity", Range(0, 10)) = 0.8 _Saturation ("Default Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 - _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 + _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 3 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _NormalMap ("Normal Map", 2D) = "bump" {} [Toggle(_ALPHATEST_ON)] _Mode ("Cutout", Float) = 0 @@ -86,7 +87,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked" { #include "UnityStandardBRDF.cginc" #include "AutoLight.cginc" #pragma multi_compile_fwdbase_fullshadows - #pragma multi_compile _ VERTEXLIGHT_ON + #pragma multi_compile _ VERTEXLIGHT_ON #pragma only_renderers d3d9 d3d11 glcore gles #pragma target 3.0 #pragma shader_feature_local _ALPHATEST_ON @@ -100,6 +101,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; @@ -174,6 +176,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Ramp Masked" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Transparent.shader b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Transparent.shader index 986ba87..4a60b63 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Transparent.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon Transparent.shader @@ -13,7 +13,8 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Transparent" { _Intensity ("Intensity", Range(0, 10)) = 0.8 _Saturation ("Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 - _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 + _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 3 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _Opacity ("Opacity", Range(0, 1)) = 1 _NormalMap ("Normal Map", 2D) = "bump" {} @@ -95,6 +96,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Transparent" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; @@ -172,6 +174,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon Transparent" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon.shader b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon.shader index a02bc4c..3bb5691 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon.shader +++ b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoe Toon.shader @@ -13,7 +13,8 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon" { _Intensity ("Intensity", Range(0, 10)) = 0.8 _Saturation ("Saturation", Range(0, 1)) = 0.65 _Exposure ("Exposure", Range(0, 1)) = 0.7 - _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 2 + [Toggle(_TOON_RAMP_DIMMING)] _ToonRampDimming ("Toon Ramp Dimming", Float) = 0 + _ExposureContrast ("Exposure Toon Ramp Contrast", Range(0, 4)) = 3 [Enum(Toon,0,PBR,1,Legacy Toon,2)] _LightingMode ("Lighting Mode", Float) = 0 _NormalMap ("Normal Map", 2D) = "bump" {} [Toggle(_ALPHATEST_ON)] _Mode ("Cutout", Float) = 0 @@ -90,6 +91,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; @@ -162,6 +164,7 @@ Shader "NoeNoe/NoeNoe Toon Shader/NoeNoe Toon" { #pragma shader_feature_local _CUBEMAP_ON #pragma shader_feature_local _ _RIMLIGHT_ADD _RIMLIGHT_MIX #pragma shader_feature_local _ _LIGHTING_PBR_ON _LIGHTING_LEGACY_ON + #pragma shader_feature_local _ _TOON_RAMP_DIMMING uniform float4 _Color; uniform sampler2D _MainTex; uniform float4 _MainTex_ST; diff --git a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoeToonEdits.cginc b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoeToonEdits.cginc index 4ab9641..4df840a 100644 --- a/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoeToonEdits.cginc +++ b/NoeNoe Shaders/NoeNoe Toon Shader/NoeNoeToonEdits.cginc @@ -1,22 +1,22 @@ // Add macros for shadowless light attenuation #ifdef POINT - #define SHADOWLESS_LIGHT_ATTENUATION(a) (tex2D(_LightTexture0, dot(a._LightCoord,a._LightCoord).rr).r) + #define SHADOWLESS_LIGHT_ATTENUATION(a) (tex2D(_LightTexture0, dot(a._LightCoord,a._LightCoord).rr).r) #endif #ifdef SPOT - #define SHADOWLESS_LIGHT_ATTENUATION(a) ( (a._LightCoord.z > 0) * UnitySpotCookie(a._LightCoord) * UnitySpotAttenuate(a._LightCoord.xyz)) + #define SHADOWLESS_LIGHT_ATTENUATION(a) ( (a._LightCoord.z > 0) * UnitySpotCookie(a._LightCoord) * UnitySpotAttenuate(a._LightCoord.xyz)) #endif #ifdef DIRECTIONAL - #define SHADOWLESS_LIGHT_ATTENUATION(a) 1 + #define SHADOWLESS_LIGHT_ATTENUATION(a) 1 #endif #ifdef POINT_COOKIE - #define SHADOWLESS_LIGHT_ATTENUATION(a) (tex2D(_LightTextureB0, dot(a._LightCoord,a._LightCoord).rr).r * texCUBE(_LightTexture0, a._LightCoord).w) + #define SHADOWLESS_LIGHT_ATTENUATION(a) (tex2D(_LightTextureB0, dot(a._LightCoord,a._LightCoord).rr).r * texCUBE(_LightTexture0, a._LightCoord).w) #endif #ifdef DIRECTIONAL_COOKIE - #define SHADOWLESS_LIGHT_ATTENUATION(a)(tex2D(_LightTexture0, a._LightCoord).w) + #define SHADOWLESS_LIGHT_ATTENUATION(a) (tex2D(_LightTexture0, a._LightCoord).w) #endif float _WorldLightIntensity; @@ -209,13 +209,13 @@ float4 frag(VertexOutput i, float facing : VFACE) : COLOR { #if defined(_OVERRIDE_WORLD_LIGHT_DIR_ON) float4 staticLightDir = _StaticToonLight; #else - // If point or spot light, calculate the light direction from its position - // If the light is directional or the current pass is forwardbase, grab _WorldSpaceLightPos0 as light direction - #if defined(UNITY_PASS_FORWARDADD) && !defined(DIRECTIONAL) - float4 staticLightDir = float4(normalize(_WorldSpaceLightPos0.xyz - i.posWorld.xyz), 0) * _WorldLightIntensity; - #else - float4 staticLightDir = lightDirection(_StaticToonLight); - #endif + // If point or spot light, calculate the light direction from its position + // If the light is directional or the current pass is forwardbase, grab _WorldSpaceLightPos0 as light direction + #if defined(UNITY_PASS_FORWARDADD) && !defined(DIRECTIONAL) + float4 staticLightDir = float4(normalize(_WorldSpaceLightPos0.xyz - i.posWorld.xyz), 0) * _WorldLightIntensity; + #else + float4 staticLightDir = lightDirection(_StaticToonLight); + #endif #endif i.normalDir = normalize(i.normalDir); @@ -514,12 +514,17 @@ float4 frag(VertexOutput i, float facing : VFACE) : COLOR { #if defined(_LIGHTING_LEGACY_ON) float3 finalColor = ((IntensityVar*FlatLighting*Diffuse) > 0.5 ? (1.0-(1.0-2.0*((IntensityVar*FlatLighting*Diffuse)-0.5))*(1.0-lerp(float3(node_424,node_424,node_424),StaticToonLighting,ToonContrast_var))) : (2.0*(IntensityVar*FlatLighting*Diffuse)*lerp(float3(node_424,node_424,node_424),StaticToonLighting,ToonContrast_var))); #else - // Dim the toon ramp effect as the area gets brighter - float3 toonContrastModifier = (IntensityVar*saturate(FlatLighting)*Diffuse); - toonContrastModifier = (1 - toonContrastModifier) * _ExposureContrast; - toonContrastModifier = smoothstep(0.5, 1, toonContrastModifier); - - toonContrastModifier *= ToonContrast_var; + + #if defined(_TOON_RAMP_DIMMING) + // Dim the toon ramp effect as the area gets brighter + float3 toonContrastModifier = (IntensityVar*saturate(FlatLighting)*Diffuse); + toonContrastModifier = (1 - toonContrastModifier) * _ExposureContrast; + toonContrastModifier = smoothstep(0.5, 1, toonContrastModifier); + + toonContrastModifier *= ToonContrast_var; + #else + float3 toonContrastModifier = float3(ToonContrast_var, ToonContrast_var, ToonContrast_var); + #endif float3 finalColor = 2 * (IntensityVar*FlatLighting*Diffuse); finalColor *= lerp(float3(0.5, 0.5, 0.5), StaticToonLighting, toonContrastModifier); @@ -532,8 +537,6 @@ float4 frag(VertexOutput i, float facing : VFACE) : COLOR { #if defined(_METALLICGLOSSMAP) || defined(_SPECGLOSSMAP) // Apply unlit reflections #ifdef UNITY_PASS_FORWARDBASE - // TODO: If reflecting the skybox rather than a probe, dim the reflection. - // Is that even possible? If so, tell me how ;) finalColor = lerp(finalColor, reflectionColor, metallic); #endif diff --git a/NoeNoe Shaders/Scripts/Editor/NoeNoeToonEditorGUI.cs b/NoeNoe Shaders/Scripts/Editor/NoeNoeToonEditorGUI.cs index 69b3c58..578d9fd 100644 --- a/NoeNoe Shaders/Scripts/Editor/NoeNoeToonEditorGUI.cs +++ b/NoeNoe Shaders/Scripts/Editor/NoeNoeToonEditorGUI.cs @@ -24,6 +24,7 @@ public class NoeNoeToonEditorGUI : ShaderGUI private MaterialProperty intensity = null; private MaterialProperty saturation = null; private MaterialProperty exposure = null; + private MaterialProperty toonRampDimmingEnabled = null; private MaterialProperty exposureToonRampContrast = null; private MaterialProperty lightMode = null; @@ -274,7 +275,11 @@ private void DrawToonLighting() if(lightMode.floatValue != 2) { editor.ShaderProperty(exposure, new GUIContent("Exposure", "Controls the contribution of directional and realtime lights.")); - editor.ShaderProperty(exposureToonRampContrast, new GUIContent("Exposure Toon Ramp Contrast", "As this value increases, the intensity of toon ramps on lighter surfaces increases.")); + editor.ShaderProperty(toonRampDimmingEnabled, new GUIContent("Toon Ramp Dimming", "If enabled, the toon ramp's intensity will decrease as the surface gets brighter.")); + if (toonRampDimmingEnabled.floatValue == 1) + { + editor.ShaderProperty(exposureToonRampContrast, new GUIContent("Exposure Toon Ramp Contrast", "As this value increases, the intensity of toon ramps on lighter surfaces increases.")); + } } if(HasRampMasking()) @@ -642,6 +647,7 @@ private void FindProperties(MaterialProperty[] props) intensity = FindProperty("_Intensity", props); saturation = FindProperty("_Saturation", props); exposure = FindProperty("_Exposure", props); + toonRampDimmingEnabled = FindProperty("_ToonRampDimming", props); exposureToonRampContrast = FindProperty("_ExposureContrast", props); lightMode = FindProperty("_LightingMode", props); @@ -877,6 +883,12 @@ private void SetupKeywords() { material.EnableKeyword("_LIGHTING_LEGACY_ON"); } + + // Toon ramp dimming + if(lightMode.floatValue != 2 && toonRampDimmingEnabled.floatValue == 1) + { + material.EnableKeyword("_TOON_RAMP_DIMMING"); + } } /// diff --git a/NoeNoe Shaders/Textures/noenoe_toon_boolean.png.meta b/NoeNoe Shaders/Textures/noenoe_toon_boolean.png.meta index 5594ddb..0580b5e 100644 --- a/NoeNoe Shaders/Textures/noenoe_toon_boolean.png.meta +++ b/NoeNoe Shaders/Textures/noenoe_toon_boolean.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: -100 wrapU: 1 @@ -58,7 +58,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +81,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -91,7 +93,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -102,6 +105,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png b/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png new file mode 100644 index 0000000..7ada606 Binary files /dev/null and b/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png differ diff --git a/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png.meta b/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png.meta new file mode 100644 index 0000000..8bf3554 --- /dev/null +++ b/NoeNoe Shaders/Textures/noenoe_toon_sharp_ramp.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 3b3a4ab45e9460a4383658931f4ee367 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/NoeNoe Shaders/Textures/toon_skin_arlvit.png.meta b/NoeNoe Shaders/Textures/toon_skin_arlvit.png.meta index c685000..ebc044e 100644 --- a/NoeNoe Shaders/Textures/toon_skin_arlvit.png.meta +++ b/NoeNoe Shaders/Textures/toon_skin_arlvit.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -58,7 +58,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +69,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,6 +81,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/NoeNoe Shaders/Textures/toon_skin_hq.png.meta b/NoeNoe Shaders/Textures/toon_skin_hq.png.meta index c61c5ee..da2b731 100644 --- a/NoeNoe Shaders/Textures/toon_skin_hq.png.meta +++ b/NoeNoe Shaders/Textures/toon_skin_hq.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: f6bb7c886cb800345aa94b89e6fb7ad7 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 4 + serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -21,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -51,11 +53,13 @@ TextureImporter: spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -65,7 +69,9 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -75,12 +81,23 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: