Merge pull request #19 from Masterexa/develop

Update : v7.1

Assets/Editor Default Resources/HoshiyukiToonEditor/Localization/HoshiyukiToonEditor_japanese.json

@@ -54,6 +54,11 @@
     "m_Image": { "instanceID": 0 },
     "m_Tooltip": "Unityの標準的なGIを利用する"
   },
+  "blendOcclusionToAlbedoText":{
+    "m_Text": "オクルージョンをアルベドに適用",
+    "m_Image": { "instanceID": 0 },
+    "m_Tooltip": ""
+  },
   "cullModeText": {
     "m_Text": "カリングモード",
     "m_Image": { "instanceID": 0 },
@@ -63,5 +68,4 @@
   "primaryMapsText": "Main Maps",
   "lineSettingsText": "Outline",
   "advancedOptionsText": "Options"
-
 }

Assets/Nowhere/HoshiyukiToon/Editor/Scripts/HoshiyukiToonEditor.cs

@@ -44,8 +44,9 @@ class Styles {
                 public GUIContent lineSizeText   = new GUIContent("Size", "Size of outline(Viewport Space)");
                 public GUIContent lineColorText  = new GUIContent("Color", "Color(RGB) and Transparency(Alpha)");
 
-                public GUIContent standardGIText = new GUIContent("Use Traditional GI", "");
-                public GUIContent cullModeText   = new GUIContent("Cull Mode", "");
+                public GUIContent standardGIText                = new GUIContent("Use Traditional GI", "");
+                public GUIContent blendOcclusionToAlbedoText    = new GUIContent("Blend Occlusion to Albedo", "");
+                public GUIContent cullModeText                  = new GUIContent("Cull Mode", "");
 
                 public string tipsText                  = "Recommend \"No ramp\" and \"No shadow casting\" for character material.";
                 public string primaryMapsText           = "Main Maps";
@@ -82,6 +83,7 @@ class Styles {
 
                 MaterialProperty    cullMode;
                 MaterialProperty    useStandardGI;
+                MaterialProperty    blendOcclusionToAlbedo;
 
                 bool                    m_firstTimeApply    = true;
                 MaterialEditor          m_materialEditor    = null;
@@ -192,6 +194,7 @@ void DoOptionsArea(Material mtl) {
                     EditorGUILayout.Space();
                     GUILayout.Label(s_styles.advancedOptionsText, EditorStyles.boldLabel);
                     m_materialEditor.ShaderProperty(useStandardGI, s_styles.standardGIText);
+                    m_materialEditor.ShaderProperty(blendOcclusionToAlbedo, s_styles.blendOcclusionToAlbedoText);
                 }
 
                 void BlendModeProp() {
@@ -273,6 +276,7 @@ void FindProperties(MaterialProperty[] props) {
                     // Option
                     cullMode                = FindProperty("_Cull", props);
                     useStandardGI           = FindProperty("_UseStandardGI", props);
+                    blendOcclusionToAlbedo  = FindProperty("_BlendOcclusionToAlbedo", props);
 
                     if( blendMode!=null && alphaCutoff!=null )
                     {
@@ -315,6 +319,7 @@ static void SetMaterialKeywords(Material mtl) {
                     SetKeyword(mtl, "_EMISSION", shouldEmissionBeEnabled);
                     // GI Mode
                     SetKeyword(mtl, "NWH_TOON_STANDARDGI", mtl.GetFloat("_UseStandardGI")==1f);
+                    SetKeyword(mtl, "HTS_BLEND_OCCLUSION_TO_ALBEDO", mtl.GetFloat("_BlendOcclusionToAlbedo")==1f);
 
                     // Lightmap emissive
                     var flags = mtl.globalIlluminationFlags;

Assets/Nowhere/HoshiyukiToon/Shaders/HoshiyukiToonSurfaceLitBase.cginc

@@ -51,9 +51,15 @@ inline half4 SampleMOXSMap(float2 uv)
         o.Smoothness    = moxs.a;
 		o.Albedo		= c.rgb;
 		o.Emission		= emit;
-		o.Occlusion		= moxs.g;
 		o.Alpha			= c.a;
 
+		#ifdef HTS_BLEND_OCCLUSION_TO_ALBEDO
+			o.Albedo	*= moxs.g;
+			o.Occlusion = 1.0;
+		#else
+			o.Occlusion = moxs.g;
+		#endif
+
 		#ifdef NWH_TOON_CUTOUT
 			clip(c.a-_Cutoff);
 		#endif

Assets/Nowhere/HoshiyukiToon/Shaders/LitFadeOutline.shader

@@ -27,6 +27,7 @@ Shader "HoshiyukiToon/LitFadeOutline"
 		_EmissionMap	( "Emission", 2D ) = "white"{}
 		// Lit Options
 		[ToggleOff]								_UseStandardGI("Use Standard GI", Float) = 0
+		[ToggleOff]								_BlendOcclusionToAlbedo("Blend Occlusion to Albedo", Float) = 0
 		[Enum(UnityEngine.Rendering.CullMode)]	_Cull("Cull Mode", Float ) = 2
 		[HideInInspector]						_Blend( "Mode", Float ) = 0
 

Assets/Nowhere/HoshiyukiToon/Shaders/LitOutline.shader

@@ -27,6 +27,7 @@ Shader "HoshiyukiToon/LitOutline"
 		_EmissionMap	( "Emission", 2D ) = "white"{}
 		// Lit Options
 		[ToggleOff]								_UseStandardGI("Use Standard GI", Float) = 0
+		[ToggleOff]								_BlendOcclusionToAlbedo("Blend Occlusion to Albedo", Float) = 0
 		[Enum(UnityEngine.Rendering.CullMode)]	_Cull("Cull Mode", Float ) = 2
 		[HideInInspector]						_Blend( "Mode", Float ) = 0
 

Assets/Nowhere/HoshiyukiToon/Shaders/ToonLit.shader

@@ -26,6 +26,7 @@ Shader "HoshiyukiToon/Lit" {
 
 		// Lit Options
 		[ToggleOff]								_UseStandardGI("Use Standard GI", Float) = 0
+		[ToggleOff]								_BlendOcclusionToAlbedo("Blend Occlusion to Albedo", Float) = 0
 		[Enum(UnityEngine.Rendering.CullMode)]	_Cull("Cull Mode", Float ) = 2
 		[HideInInspector]						_Blend("Mode", Float) = 0
 	}
@@ -37,6 +38,7 @@ Shader "HoshiyukiToon/Lit" {
 		CGPROGRAM
 			#pragma multi_compile _ NWH_TOON_CUTOUT
 			#pragma multi_compile _ NWH_TOON_STANDARDGI
+			#pragma multi_compile _ HTS_BLEND_OCCLUSION_TO_ALBEDO
 			#pragma surface surfLitBase ToonRampMetallic2 fullforwardshadows addshadow
 			#pragma target 3.0
 			#define HTS_USE_POINTLIGHTRAMP

Assets/Nowhere/HoshiyukiToon/Shaders/ToonLitFade.shader

@@ -26,6 +26,7 @@ Shader "HoshiyukiToon/LitFade" {
 
 		// Lit Options
 		[ToggleOff]								_UseStandardGI("Use Standard GI", Float) = 0
+		[ToggleOff]								_BlendOcclusionToAlbedo("Blend Occlusion to Albedo", Float) = 0
 		[Enum(UnityEngine.Rendering.CullMode)]	_Cull("Cull Mode", Float ) = 2
 		[HideInInspector]						_Blend("Mode", Float) = 0
 	}
@@ -50,6 +51,7 @@ Shader "HoshiyukiToon/LitFade" {
 		CGPROGRAM
 			#pragma multi_compile _ NWH_TOON_CUTOUT
 			#pragma multi_compile _ NWH_TOON_STANDARDGI
+			#pragma multi_compile _ HTS_BLEND_OCCLUSION_TO_ALBEDO
 			#pragma surface surfLitBase ToonRampMetallic2 fullforwardshadows keepalpha
 			#pragma target 3.0
 			#define HTS_USE_POINTLIGHTRAMP

Assets/Nowhere/HoshiyukiToonSample/Graphics/Models/Misc/Materials/Suzanne_ao.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: Suzanne_ao
   m_Shader: {fileID: 4800000, guid: d6ca4d37b0ad45e429f895352d602cb5, type: 3}
-  m_ShaderKeywords: _USESTANDARDGI_OFF
+  m_ShaderKeywords: HTS_BLEND_OCCLUSION_TO_ALBEDO _USESTANDARDGI_OFF
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -73,6 +73,7 @@ Material:
     m_Floats:
     - _Blend: 0
     - _BlendFactor: 0.589
+    - _BlendOcclusionToAlbedo: 1
     - _BumpScale: 1
     - _Cull: 2
     - _Cutoff: 0
@@ -88,6 +89,7 @@ Material:
     - _OutlineSize: 0.002
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
+    - _SpecularFactor: 0
     - _SpecularHighlights: 1
     - _SpecularStrength: 1
     - _SrcBlend: 1