Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@whiteflare
whiteflare committed Mar 30, 2019
2 parents fb41336 + 667cd9d commit 7f4f1c3
Show file tree
Hide file tree
Showing 27 changed files with 426 additions and 70 deletions.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat
View file
Binary file not shown.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat
View file
Binary file not shown.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_face.mat
View file
Binary file not shown.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_faceoption.mat
View file
Binary file not shown.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat
View file
Binary file not shown.
Binary file modified Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_photon.mat
View file
Binary file not shown.
Binary file added Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade1.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade2.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_ShadeBase.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_ShadeBase.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions Shaders/Unlit_WF_UnToon_Texture.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Texture" {

/*
* authors:
* ver:2019/03/23 whiteflare,
* ver:2019/03/30 whiteflare,
*/

Properties {
Expand Down Expand Up @@ -92,11 +92,19 @@ Shader "UnlitWF/WF_UnToon_Texture" {
[Header(ToonShade)]
[Toggle(_)]
_TS_Enable ("[SH] Enable", Float) = 0
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.5, 0.5, 0.5, 1)
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.3, 0.3, 0.3, 1)
_TS_BaseColor ("[SH] Base Color", Color) = (1, 1, 1, 1)
[NoScaleOffset]
_TS_BaseTex ("[SH] Base Shade Texture", 2D) = "white" {}
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.7, 0.7, 0.9, 1)
[NoScaleOffset]
_TS_1stTex ("[SH] 1st Shade Texture", 2D) = "white" {}
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
[NoScaleOffset]
_TS_2ndTex ("[SH] 2nd Shade Texture", 2D) = "white" {}
_TS_1stPower ("[SH] 1st Shade Power", Range(0, 2)) = 1
_TS_2ndPower ("[SH] 2nd Shade Power", Range(0, 2)) = 1
_TS_1stBorder ("[SH] 1st Border", Range(0, 1)) = 0.4
_TS_2ndBorder ("[SH] 2nd Border", Range(0, 1)) = 0.2
_TS_ShadowLimit ("[SH] Shade Power Limit", Range(0, 1)) = 0.5
_TS_Feather ("[SH] Feather", Range(0, 0.2)) = 0.05
_TS_BlendNormal ("[SH] Blend Normal", Range(0, 1)) = 0.1
[NoScaleOffset]
Expand Down
18 changes: 14 additions & 4 deletions Shaders/Unlit_WF_UnToon_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_TransCutout" {

/*
* authors:
* ver:2019/03/23 whiteflare,
* ver:2019/03/30 whiteflare,
*/

Properties {
Expand Down Expand Up @@ -99,11 +99,19 @@ Shader "UnlitWF/WF_UnToon_TransCutout" {
[Header(ToonShade)]
[Toggle(_)]
_TS_Enable ("[SH] Enable", Float) = 0
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.5, 0.5, 0.5, 1)
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.3, 0.3, 0.3, 1)
_TS_BaseColor ("[SH] Base Color", Color) = (1, 1, 1, 1)
[NoScaleOffset]
_TS_BaseTex ("[SH] Base Shade Texture", 2D) = "white" {}
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.7, 0.7, 0.9, 1)
[NoScaleOffset]
_TS_1stTex ("[SH] 1st Shade Texture", 2D) = "white" {}
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
[NoScaleOffset]
_TS_2ndTex ("[SH] 2nd Shade Texture", 2D) = "white" {}
_TS_1stPower ("[SH] 1st Shade Power", Range(0, 2)) = 1
_TS_2ndPower ("[SH] 2nd Shade Power", Range(0, 2)) = 1
_TS_1stBorder ("[SH] 1st Border", Range(0, 1)) = 0.4
_TS_2ndBorder ("[SH] 2nd Border", Range(0, 1)) = 0.2
_TS_ShadowLimit ("[SH] Shade Power Limit", Range(0, 1)) = 0.5
_TS_Feather ("[SH] Feather", Range(0, 0.2)) = 0.05
_TS_BlendNormal ("[SH] Blend Normal", Range(0, 1)) = 0.1
[NoScaleOffset]
Expand Down Expand Up @@ -180,6 +188,8 @@ Shader "UnlitWF/WF_UnToon_TransCutout" {
#pragma multi_compile_fwdbase
#pragma multi_compile_fog

#define _AL_ENABLE

#include "UnityCG.cginc"
#include "Lighting.cginc"
#include "WF_UnToon.cginc"
Expand Down
16 changes: 12 additions & 4 deletions Shaders/Unlit_WF_UnToon_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent" {

/*
* authors:
* ver:2019/03/23 whiteflare,
* ver:2019/03/30 whiteflare,
*/

Properties {
Expand Down Expand Up @@ -100,11 +100,19 @@ Shader "UnlitWF/WF_UnToon_Transparent" {
[Header(ToonShade)]
[Toggle(_)]
_TS_Enable ("[SH] Enable", Float) = 0
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.5, 0.5, 0.5, 1)
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.3, 0.3, 0.3, 1)
_TS_BaseColor ("[SH] Base Color", Color) = (1, 1, 1, 1)
[NoScaleOffset]
_TS_BaseTex ("[SH] Base Shade Texture", 2D) = "white" {}
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.7, 0.7, 0.9, 1)
[NoScaleOffset]
_TS_1stTex ("[SH] 1st Shade Texture", 2D) = "white" {}
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
[NoScaleOffset]
_TS_2ndTex ("[SH] 2nd Shade Texture", 2D) = "white" {}
_TS_1stPower ("[SH] 1st Shade Power", Range(0, 2)) = 1
_TS_2ndPower ("[SH] 2nd Shade Power", Range(0, 2)) = 1
_TS_1stBorder ("[SH] 1st Border", Range(0, 1)) = 0.4
_TS_2ndBorder ("[SH] 2nd Border", Range(0, 1)) = 0.2
_TS_ShadowLimit ("[SH] Shade Power Limit", Range(0, 1)) = 0.5
_TS_Feather ("[SH] Feather", Range(0, 0.2)) = 0.05
_TS_BlendNormal ("[SH] Blend Normal", Range(0, 1)) = 0.1
[NoScaleOffset]
Expand Down
16 changes: 12 additions & 4 deletions Shaders/Unlit_WF_UnToon_Transparent3Pass.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" {

/*
* authors:
* ver:2019/03/23 whiteflare,
* ver:2019/03/30 whiteflare,
*/

Properties {
Expand Down Expand Up @@ -101,11 +101,19 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" {
[Header(ToonShade)]
[Toggle(_)]
_TS_Enable ("[SH] Enable", Float) = 0
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.5, 0.5, 0.5, 1)
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.3, 0.3, 0.3, 1)
_TS_BaseColor ("[SH] Base Color", Color) = (1, 1, 1, 1)
[NoScaleOffset]
_TS_BaseTex ("[SH] Base Shade Texture", 2D) = "white" {}
_TS_1stColor ("[SH] 1st Shade Color", Color) = (0.7, 0.7, 0.9, 1)
[NoScaleOffset]
_TS_1stTex ("[SH] 1st Shade Texture", 2D) = "white" {}
_TS_2ndColor ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
[NoScaleOffset]
_TS_2ndTex ("[SH] 2nd Shade Texture", 2D) = "white" {}
_TS_1stPower ("[SH] 1st Shade Power", Range(0, 2)) = 1
_TS_2ndPower ("[SH] 2nd Shade Power", Range(0, 2)) = 1
_TS_1stBorder ("[SH] 1st Border", Range(0, 1)) = 0.4
_TS_2ndBorder ("[SH] 2nd Border", Range(0, 1)) = 0.2
_TS_ShadowLimit ("[SH] Shade Power Limit", Range(0, 1)) = 0.5
_TS_Feather ("[SH] Feather", Range(0, 0.2)) = 0.05
_TS_BlendNormal ("[SH] Blend Normal", Range(0, 1)) = 0.1
[NoScaleOffset]
Expand Down
Loading

0 comments on commit 7f4f1c3

Please sign in to comment.