Merge branch 'dev'

whiteflare · Mar 23, 2019 · fb41336 · fb41336
2 parents 09f8e12 + 6bc0989
commit fb41336
Show file tree

Hide file tree

Showing 27 changed files with 339 additions and 317 deletions.
diff --git a/Shaders/Unlit_WF_FakeFur_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_TransCutout.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -42,17 +42,17 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
 
         // 色変換
         [Header(Color Change)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Enable      ("[CL] Enable", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Monochrome  ("[CL] monochrome", Range(0, 1)) = 0
             _CL_DeltaH      ("[CL] Hur", Range(0, 1)) = 0
             _CL_DeltaS      ("[CL] Saturation", Range(-1, 1)) = 0
             _CL_DeltaV      ("[CL] Brightness", Range(-1, 1)) = 0
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -61,14 +61,14 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // ウェーブアニメーション
         [Header(Fur Wave Animation)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _WV_Enable      ("[WV] Enable", Float) = 0
             _WaveSpeed      ("[WV] Wave Speed", Vector) = (0, 0, 0, 0)
             _WaveScale      ("[WV] Wave Scale", Vector) = (0, 0, 0, 0)

diff --git a/Shaders/Unlit_WF_FakeFur_Transparent.shader b/Shaders/Unlit_WF_FakeFur_Transparent.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -41,17 +41,17 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
 
         // 色変換
         [Header(Color Change)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Enable      ("[CL] Enable", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Monochrome  ("[CL] monochrome", Range(0, 1)) = 0
             _CL_DeltaH      ("[CL] Hur", Range(0, 1)) = 0
             _CL_DeltaS      ("[CL] Saturation", Range(-1, 1)) = 0
             _CL_DeltaV      ("[CL] Brightness", Range(-1, 1)) = 0
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -60,14 +60,14 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // ウェーブアニメーション
         [Header(Fur Wave Animation)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _WV_Enable      ("[WV] Enable", Float) = 0
             _WaveSpeed      ("[WV] Wave Speed", Vector) = (0, 0, 0, 0)
             _WaveScale      ("[WV] Wave Scale", Vector) = (0, 0, 0, 0)

diff --git a/Shaders/Unlit_WF_MatcapShadows_Color.shader b/Shaders/Unlit_WF_MatcapShadows_Color.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_MatcapShadows_Color" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -33,7 +33,7 @@ Shader "UnlitWF/WF_MatcapShadows_Color" {
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -42,14 +42,14 @@ Shader "UnlitWF/WF_MatcapShadows_Color" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // Overlay Texture
         [Header(Overlay Texture)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _OL_Enable      ("[OL] Enable", Float) = 0
             _OL_OverlayTex  ("[OL] Texture", 2D) = "white" {}
         [Enum(ALPHA,0,ADD,1,MUL,2)]

diff --git a/Shaders/Unlit_WF_MatcapShadows_ColorFade.shader b/Shaders/Unlit_WF_MatcapShadows_ColorFade.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_MatcapShadows_ColorFade" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -43,7 +43,7 @@ Shader "UnlitWF/WF_MatcapShadows_ColorFade" {
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -52,14 +52,14 @@ Shader "UnlitWF/WF_MatcapShadows_ColorFade" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // Overlay Texture
         [Header(Overlay Texture)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _OL_Enable      ("[OL] Enable", Float) = 0
             _OL_OverlayTex  ("[OL] Texture", 2D) = "white" {}
         [Enum(ALPHA,0,ADD,1,MUL,2)]

diff --git a/Shaders/Unlit_WF_MatcapShadows_Simple.shader b/Shaders/Unlit_WF_MatcapShadows_Simple.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_MatcapShadows_Simple" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -32,17 +32,17 @@ Shader "UnlitWF/WF_MatcapShadows_Simple" {
 
         // 色変換
         [Header(Color Change)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Enable      ("[CL] Enable", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Monochrome  ("[CL] monochrome", Range(0, 1)) = 0
             _CL_DeltaH      ("[CL] Hur", Range(0, 1)) = 0
             _CL_DeltaS      ("[CL] Saturation", Range(-1, 1)) = 0
             _CL_DeltaV      ("[CL] Brightness", Range(-1, 1)) = 0
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -51,9 +51,9 @@ Shader "UnlitWF/WF_MatcapShadows_Simple" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
     }
 

diff --git a/Shaders/Unlit_WF_MatcapShadows_Texture.shader b/Shaders/Unlit_WF_MatcapShadows_Texture.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_MatcapShadows_Texture" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -32,25 +32,25 @@ Shader "UnlitWF/WF_MatcapShadows_Texture" {
 
         // 色変換
         [Header(Color Change)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Enable      ("[CL] Enable", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Monochrome  ("[CL] monochrome", Range(0, 1)) = 0
             _CL_DeltaH      ("[CL] Hur", Range(0, 1)) = 0
             _CL_DeltaS      ("[CL] Saturation", Range(-1, 1)) = 0
             _CL_DeltaV      ("[CL] Brightness", Range(-1, 1)) = 0
 
         // 法線マップ
         [Header(NormalMap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _NM_Enable      ("[NM] Enable", Float) = 0
         [NoScaleOffset]
             _BumpMap        ("[NM] NormalMap Texture", 2D) = "bump" {}
             _NM_Power       ("[NM] Shadow Power", Range(0, 1)) = 0.25
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -59,14 +59,14 @@ Shader "UnlitWF/WF_MatcapShadows_Texture" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // Overlay Texture
         [Header(Overlay Texture)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _OL_Enable      ("[OL] Enable", Float) = 0
             _OL_OverlayTex  ("[OL] Texture", 2D) = "white" {}
         [Enum(MAINTEX_UV,0,VIEW_XY,1)]
@@ -79,7 +79,7 @@ Shader "UnlitWF/WF_MatcapShadows_Texture" {
 
         // EmissiveScroll
         [Header(Emissive Scroll)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _ES_Enable      ("[ES] Enable", Float) = 0
         [HDR]
             _ES_Color       ("[ES] Emissive Color", Color) = (1, 1, 1, 1)

diff --git a/Shaders/Unlit_WF_MatcapShadows_TransCutout.shader b/Shaders/Unlit_WF_MatcapShadows_TransCutout.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_MatcapShadows_TransCutout" {
 
     /*
      * authors:
-     *      ver:2019/03/17 whiteflare,
+     *      ver:2019/03/23 whiteflare,
      */
 
     Properties {
@@ -39,25 +39,25 @@ Shader "UnlitWF/WF_MatcapShadows_TransCutout" {
 
         // 色変換
         [Header(Color Change)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Enable      ("[CL] Enable", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _CL_Monochrome  ("[CL] monochrome", Range(0, 1)) = 0
             _CL_DeltaH      ("[CL] Hur", Range(0, 1)) = 0
             _CL_DeltaS      ("[CL] Saturation", Range(-1, 1)) = 0
             _CL_DeltaV      ("[CL] Brightness", Range(-1, 1)) = 0
 
         // 法線マップ
         [Header(NormalMap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _NM_Enable      ("[NM] Enable", Float) = 0
         [NoScaleOffset]
             _BumpMap        ("[NM] NormalMap Texture", 2D) = "bump" {}
             _NM_Power       ("[NM] Shadow Power", Range(0, 1)) = 0.25
 
         // Matcapハイライト
         [Header(HighLight and Shadow Matcap)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_Enable      ("[HL] Enable", Float) = 0
         [NoScaleOffset]
             _HL_MatcapTex   ("[HL] Matcap Sampler", 2D) = "gray" {}
@@ -66,14 +66,14 @@ Shader "UnlitWF/WF_MatcapShadows_TransCutout" {
             _HL_Power       ("[HL] Power", Range(0, 2)) = 1
         [NoScaleOffset]
             _HL_MaskTex     ("[HL] Mask Texture", 2D) = "white" {}
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftShadow  ("[HL] Soft Shadow Enable", Float) = 1
-        [ToggleNoKwd]
+        [Toggle(_)]
             _HL_SoftLight   ("[HL] Soft Light Enable", Float) = 0
 
         // Overlay Texture
         [Header(Overlay Texture)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _OL_Enable      ("[OL] Enable", Float) = 0
             _OL_OverlayTex  ("[OL] Texture", 2D) = "white" {}
         [Enum(MAINTEX_UV,0,VIEW_XY,1)]
@@ -86,15 +86,15 @@ Shader "UnlitWF/WF_MatcapShadows_TransCutout" {
 
         // EmissiveScroll
         [Header(Emissive Scroll)]
-        [ToggleNoKwd]
+        [Toggle(_)]
             _ES_Enable      ("[ES] Enable", Float) = 0
         [HDR]
             _ES_Color       ("[ES] Emissive Color", Color) = (1, 1, 1, 1)
         [NoScaleOffset]
             _ES_MaskTex     ("[ES] Mask Texture", 2D) = "white" {}
         [Enum(EXCITATION,0,SAWTOOTH_WAVE,1,SIN_WAVE,2,ALWAYS_ON,3)]
             _ES_Shape       ("[ES] Wave Type", Float) = 0
-        [ToggleNoKwd]
+        [Toggle(_)]
             _ES_AlphaScroll ("[ES] Alpha mo Scroll", Range(0, 1)) = 0
             _ES_Direction   ("[ES] Direction", Vector) = (0, -10, 0, 0)
             _ES_LevelOffset ("[ES] LevelOffset", Range(-1, 1)) = 0