mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-20 01:42:37 +08:00
Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 60d0df6171 | |||
| e031e57f23 | |||
| c919449629 | |||
| 6bfc676bee | |||
| 346b1c8ec6 | |||
| be86d169bf | |||
| ee452d6794 | |||
| e0c660773f | |||
| 0369fa1a25 | |||
| cec7f8e995 | |||
| 64a31982f7 | |||
| 84d20aefd4 | |||
| 7a59e35843 | |||
| fcd7f68831 | |||
| 35e2ac5677 | |||
| ec63fd905d | |||
| 481d4e8e63 | |||
| 321a47b4d3 | |||
| a03b6fdf2c | |||
| 7e04e08bb3 | |||
| 844d6b2d71 | |||
| e7ce12353b | |||
| 4a5557185d |
+3
-1
@@ -33,4 +33,6 @@ sysinfo.txt
|
||||
|
||||
|
||||
# Packages
|
||||
*.unitypackage
|
||||
*.unitypackage
|
||||
build.app
|
||||
unity.log
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
+10
-18
@@ -1,14 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 660f666739adc442dacb957af200c2f1
|
||||
timeCreated: 1527673509
|
||||
licenseType: Pro
|
||||
guid: f3b45d5175ff30c42aab20cc35e51f4e
|
||||
timeCreated: 1528468261
|
||||
licenseType: Free
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
sRGBTexture: 0
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
@@ -30,21 +30,21 @@ TextureImporter:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
alphaUsage: 2
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureType: 10
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
@@ -66,14 +66,6 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 70 KiB |
+11
-19
@@ -1,14 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6789beb7377034038b701aa05106933d
|
||||
timeCreated: 1523277470
|
||||
licenseType: Pro
|
||||
guid: 42fa8c34958b97442a6de1f23f479c99
|
||||
timeCreated: 1528469143
|
||||
licenseType: Free
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
sRGBTexture: 0
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
@@ -30,21 +30,21 @@ TextureImporter:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
alphaUsage: 2
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureType: 10
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
@@ -66,14 +66,6 @@ TextureImporter:
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
@@ -94,7 +86,7 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag: Demo_ShinyEffectForUGUI
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 177 KiB |
@@ -0,0 +1,185 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 975570a90d56c477582e12d440dc9931
|
||||
timeCreated: 1528964000
|
||||
licenseType: Pro
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: old_detail
|
||||
21300002: old_fast
|
||||
21300004: old_medium
|
||||
21300006: UIEffect_Demo_Dark_Silhouette
|
||||
21300008: UIEffect_Demo_Pattern
|
||||
21300010: UIEffect_Demo_red
|
||||
21300012: UIEffect_Demo_Unity-chan
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: old_detail
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 192
|
||||
width: 106
|
||||
height: 159
|
||||
alignment: 0
|
||||
pivot: {x: 53, y: 79.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
- serializedVersion: 2
|
||||
name: old_fast
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 116
|
||||
y: 125
|
||||
width: 106
|
||||
height: 159
|
||||
alignment: 0
|
||||
pivot: {x: 53, y: 79.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
- serializedVersion: 2
|
||||
name: old_medium
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 116
|
||||
y: 288
|
||||
width: 106
|
||||
height: 159
|
||||
alignment: 0
|
||||
pivot: {x: 53, y: 79.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
- serializedVersion: 2
|
||||
name: UIEffect_Demo_Dark_Silhouette
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 116
|
||||
y: 0
|
||||
width: 140
|
||||
height: 121
|
||||
alignment: 0
|
||||
pivot: {x: 70, y: 60.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
- serializedVersion: 2
|
||||
name: UIEffect_Demo_red
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 355
|
||||
width: 100
|
||||
height: 100
|
||||
alignment: 0
|
||||
pivot: {x: 50, y: 50}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
- serializedVersion: 2
|
||||
name: UIEffect_Demo_Unity-chan
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 112
|
||||
height: 188
|
||||
alignment: 0
|
||||
pivot: {x: 56, y: 94}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
tessellationDetail: -1
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.0 KiB |
@@ -4,12 +4,12 @@ timeCreated: 1502934796
|
||||
licenseType: Pro
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
@@ -21,10 +21,8 @@ TextureImporter:
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 1
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 7
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -3
|
||||
maxTextureSize: 512
|
||||
@@ -35,9 +33,7 @@ TextureImporter:
|
||||
wrapMode: 1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
@@ -45,10 +41,57 @@ TextureImporter:
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 2
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
buildTargetSettings: []
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 256
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Standalone
|
||||
maxTextureSize: 256
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
maxTextureSize: 256
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Android
|
||||
maxTextureSize: 256
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: WebGL
|
||||
maxTextureSize: 256
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
@@ -1,57 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 925f66fdcc9764b579413b7408c718f2
|
||||
timeCreated: 1488188399
|
||||
licenseType: Pro
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 7
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: 0
|
||||
aniso: 16
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 1
|
||||
textureType: 8
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
outline: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
@@ -59,9 +59,9 @@ Material:
|
||||
m_ObjectHideFlags: 9
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: UI-Effect-Dissolve-Set
|
||||
m_Name: UI-Effect-Dissolve-Fill
|
||||
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
|
||||
m_ShaderKeywords: UI_COLOR_SET
|
||||
m_ShaderKeywords: FILL
|
||||
m_LightmapFlags: 5
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
@@ -112,9 +112,9 @@ Material:
|
||||
m_ObjectHideFlags: 9
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: UI-Effect-Dissolve-Sub
|
||||
m_Name: UI-Effect-Dissolve-Subtract
|
||||
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
|
||||
m_ShaderKeywords: UI_COLOR_SUB
|
||||
m_ShaderKeywords: SUBTRACT
|
||||
m_LightmapFlags: 5
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
@@ -167,7 +167,7 @@ Material:
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: UI-Effect-Dissolve-Add
|
||||
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
|
||||
m_ShaderKeywords: UI_COLOR_ADD
|
||||
m_ShaderKeywords: ADD
|
||||
m_LightmapFlags: 5
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 04feaefc7cdee4c13abcd553a1a6e3a9
|
||||
folderAsset: yes
|
||||
timeCreated: 1528368324
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,13 @@
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Blur effect mode.
|
||||
/// </summary>
|
||||
public enum BlurMode
|
||||
{
|
||||
None = 0,
|
||||
FastBlur = 1,
|
||||
MediumBlur = 2,
|
||||
DetailBlur = 3,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5645838b01af8764d8f381f04b62b9a2
|
||||
timeCreated: 1528296875
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,13 @@
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Color effect mode.
|
||||
/// </summary>
|
||||
public enum ColorMode
|
||||
{
|
||||
Multiply = 0,
|
||||
Fill = 1,
|
||||
Add = 2,
|
||||
Subtract = 3,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e6ba1e487e0a19644afde2bd5531bd04
|
||||
timeCreated: 1528296875
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Area for effect.
|
||||
/// </summary>
|
||||
public enum EffectArea
|
||||
{
|
||||
RectTransform,
|
||||
Fit,
|
||||
Character,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a78f43d1382a048a99411472ca714e1b
|
||||
timeCreated: 1528636556
|
||||
licenseType: Pro
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,66 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
public class MaterialCache
|
||||
{
|
||||
public ColorMode colorMode;
|
||||
public int referenceCount = 0;
|
||||
public Texture texture;
|
||||
public Material material;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
[UnityEditor.InitializeOnLoadMethod]
|
||||
static void ClearCache()
|
||||
{
|
||||
materialCache.Clear();
|
||||
}
|
||||
#endif
|
||||
|
||||
public static List<MaterialCache> materialCache = new List<MaterialCache>();
|
||||
|
||||
public static MaterialCache Register(ColorMode color, Texture tex, System.Func<Material> onCreateMaterial)
|
||||
{
|
||||
var cache = materialCache.FirstOrDefault(x => x.IsMatch(color, tex));
|
||||
if (cache != null)
|
||||
{
|
||||
cache.referenceCount++;
|
||||
}
|
||||
if (cache == null)
|
||||
{
|
||||
cache = new MaterialCache()
|
||||
{
|
||||
colorMode = color,
|
||||
texture = tex,
|
||||
material = onCreateMaterial(),
|
||||
referenceCount = 1,
|
||||
};
|
||||
materialCache.Add(cache);
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
public static void Unregister(MaterialCache cache)
|
||||
{
|
||||
if (cache == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
cache.referenceCount--;
|
||||
if (cache.referenceCount <= 0)
|
||||
{
|
||||
MaterialCache.materialCache.Remove(cache);
|
||||
cache.material = null;
|
||||
cache.texture = null;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsMatch(ColorMode color, Texture tex)
|
||||
{
|
||||
return colorMode == color && texture == tex;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2160d2c55a6100642b6c7ba09df935da
|
||||
timeCreated: 1528509206
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,103 @@
|
||||
#if UNITY_EDITOR
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
public class MaterialResolver
|
||||
{
|
||||
static readonly StringBuilder s_StringBuilder = new StringBuilder ();
|
||||
|
||||
public static Material GetOrGenerateMaterialVariant (Shader shader, params object[] append)
|
||||
{
|
||||
if (!shader) {
|
||||
return null;
|
||||
}
|
||||
|
||||
string[] keywords = append.Where (x => 0 < (int)x)
|
||||
.Select (x => x.ToString ().ToUpper ())
|
||||
.ToArray ();
|
||||
Material mat = GetMaterial (shader, append);
|
||||
if (mat) {
|
||||
if(!mat.shaderKeywords.OrderBy(x=>x).SequenceEqual(keywords.OrderBy(x=>x)))
|
||||
{
|
||||
mat.shaderKeywords = keywords;
|
||||
EditorUtility.SetDirty (mat);
|
||||
if (!Application.isPlaying)
|
||||
{
|
||||
EditorApplication.delayCall += AssetDatabase.SaveAssets;
|
||||
}
|
||||
}
|
||||
return mat;
|
||||
}
|
||||
|
||||
var variantName = GetVariantName (shader, append);
|
||||
Debug.Log ("Generate material : " + variantName);
|
||||
mat = new Material (shader);
|
||||
mat.shaderKeywords = keywords;
|
||||
|
||||
mat.name = variantName;
|
||||
mat.hideFlags |= HideFlags.NotEditable;
|
||||
|
||||
#if UIEFFECT_SEPARATE
|
||||
string dir = Path.GetDirectoryName(GetDefaultMaterialPath (shader));
|
||||
string materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
|
||||
|
||||
Directory.CreateDirectory (Path.GetDirectoryName (materialPath));
|
||||
AssetDatabase.CreateAsset (mat, materialPath);
|
||||
AssetDatabase.SaveAssets ();
|
||||
#else
|
||||
if (append.Cast<int> ().All (x => x == 0)) {
|
||||
string materialPath = GetDefaultMaterialPath (shader);
|
||||
Directory.CreateDirectory (Path.GetDirectoryName (materialPath));
|
||||
AssetDatabase.CreateAsset (mat, materialPath);
|
||||
AssetDatabase.SaveAssets ();
|
||||
} else {
|
||||
GetOrGenerateMaterialVariant (shader);
|
||||
string materialPath = GetDefaultMaterialPath (shader);
|
||||
mat.hideFlags |= HideFlags.HideInHierarchy;
|
||||
AssetDatabase.AddObjectToAsset (mat, materialPath);
|
||||
}
|
||||
#endif
|
||||
return mat;
|
||||
}
|
||||
|
||||
public static Material GetMaterial (Shader shader, params object[] append)
|
||||
{
|
||||
string variantName = GetVariantName (shader, append);
|
||||
return AssetDatabase.FindAssets ("t:Material " + Path.GetFileName (shader.name))
|
||||
.Select (x => AssetDatabase.GUIDToAssetPath (x))
|
||||
.SelectMany (x => AssetDatabase.LoadAllAssetsAtPath (x))
|
||||
.OfType<Material> ()
|
||||
.FirstOrDefault (x => x.name == variantName);
|
||||
}
|
||||
|
||||
public static string GetDefaultMaterialPath (Shader shader)
|
||||
{
|
||||
var name = Path.GetFileName (shader.name);
|
||||
return AssetDatabase.FindAssets ("t:Material " + name)
|
||||
.Select (x => AssetDatabase.GUIDToAssetPath (x))
|
||||
.FirstOrDefault (x => Path.GetFileNameWithoutExtension (x) == name)
|
||||
?? ("Assets/" + name + ".mat");
|
||||
}
|
||||
|
||||
public static string GetVariantName (Shader shader, params object[] append)
|
||||
{
|
||||
s_StringBuilder.Length = 0;
|
||||
|
||||
#if UIEFFECT_SEPARATE
|
||||
s_StringBuilder.Append("[Separated] ");
|
||||
#endif
|
||||
s_StringBuilder.Append (Path.GetFileName (shader.name));
|
||||
foreach (object mode in append.Where(x=>0<(int)x)) {
|
||||
s_StringBuilder.Append ("-");
|
||||
s_StringBuilder.Append (mode.ToString ());
|
||||
}
|
||||
return s_StringBuilder.ToString ();
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 70261fa2760d4c040ac28aebb1f155fb
|
||||
timeCreated: 1528297353
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,14 @@
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Shadow effect style.
|
||||
/// </summary>
|
||||
public enum ShadowStyle
|
||||
{
|
||||
None = 0,
|
||||
Shadow,
|
||||
Outline,
|
||||
Outline8,
|
||||
Shadow3,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b0eda5bf10146491c9cfe6a31c66f9a7
|
||||
timeCreated: 1528296875
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,17 @@
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Effect mode.
|
||||
/// </summary>
|
||||
public enum ToneMode
|
||||
{
|
||||
None = 0,
|
||||
Grayscale = 1,
|
||||
Sepia = 2,
|
||||
Nega = 3,
|
||||
Pixel = 4,
|
||||
Mono = 5,
|
||||
Cutoff = 6,
|
||||
Hue = 7,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 092769547c242d74cbad96631a00963f
|
||||
timeCreated: 1528296875
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,148 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Abstract effect base for UI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[RequireComponent(typeof(Graphic))]
|
||||
[DisallowMultipleComponent]
|
||||
public abstract class UIEffectBase : BaseMeshEffect
|
||||
#if UNITY_EDITOR
|
||||
, ISerializationCallbackReceiver
|
||||
#endif
|
||||
{
|
||||
protected static readonly Rect rectForCharacter = new Rect(0, 0, 1, 1);
|
||||
protected static readonly Vector2[] splitedCharacterPosition = { Vector2.up, Vector2.one, Vector2.right, Vector2.zero };
|
||||
protected static readonly List<UIVertex> tempVerts = new List<UIVertex>();
|
||||
|
||||
[SerializeField] protected Material m_EffectMaterial;
|
||||
|
||||
/// <summary>
|
||||
/// Gets target graphic for effect.
|
||||
/// </summary>
|
||||
public Graphic targetGraphic { get { return graphic; } }
|
||||
|
||||
/// <summary>
|
||||
/// Gets material for effect.
|
||||
/// </summary>
|
||||
public Material effectMaterial { get { return m_EffectMaterial; } }
|
||||
|
||||
#if UNITY_EDITOR
|
||||
/// <summary>
|
||||
/// Raises the validate event.
|
||||
/// </summary>
|
||||
protected override void OnValidate ()
|
||||
{
|
||||
base.OnValidate ();
|
||||
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raises the before serialize event.
|
||||
/// </summary>
|
||||
public virtual void OnBeforeSerialize()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raises the after deserialize event.
|
||||
/// </summary>
|
||||
public virtual void OnAfterDeserialize()
|
||||
{
|
||||
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the material.
|
||||
/// </summary>
|
||||
/// <param name="ignoreInPlayMode">If set to <c>true</c> ignore in play mode.</param>
|
||||
protected void UpdateMaterial(bool ignoreInPlayMode)
|
||||
{
|
||||
if(!this || ignoreInPlayMode && Application.isPlaying)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var mat = GetMaterial();
|
||||
if (m_EffectMaterial != mat || targetGraphic.material != mat)
|
||||
{
|
||||
targetGraphic.material = m_EffectMaterial = mat;
|
||||
UnityEditor.EditorUtility.SetDirty(this);
|
||||
UnityEditor.EditorUtility.SetDirty(targetGraphic);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the material.
|
||||
/// </summary>
|
||||
/// <returns>The material.</returns>
|
||||
protected virtual Material GetMaterial()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
{
|
||||
targetGraphic.material = m_EffectMaterial;
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the behaviour becomes disabled () or inactive.
|
||||
/// </summary>
|
||||
protected override void OnDisable()
|
||||
{
|
||||
targetGraphic.material = null;
|
||||
base.OnDisable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Mark the UIEffect as dirty.
|
||||
/// </summary>
|
||||
protected void SetDirty()
|
||||
{
|
||||
if (targetGraphic)
|
||||
{
|
||||
targetGraphic.SetVerticesDirty();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets effect for area.
|
||||
/// </summary>
|
||||
protected Rect GetEffectArea(VertexHelper vh, EffectArea area)
|
||||
{
|
||||
switch(area)
|
||||
{
|
||||
case EffectArea.RectTransform: return graphic.rectTransform.rect;
|
||||
case EffectArea.Character: return rectForCharacter;
|
||||
case EffectArea.Fit:
|
||||
{
|
||||
// Fit to contents.
|
||||
Rect rect = default(Rect);
|
||||
UIVertex vertex = default(UIVertex);
|
||||
rect.xMin = rect.yMin = float.MaxValue;
|
||||
rect.xMax = rect.yMax = float.MinValue;
|
||||
for (int i = 0; i < vh.currentVertCount; i++)
|
||||
{
|
||||
vh.PopulateUIVertex(ref vertex, i);
|
||||
rect.xMin = Mathf.Min(rect.xMin, vertex.position.x);
|
||||
rect.yMin = Mathf.Min(rect.yMin, vertex.position.y);
|
||||
rect.xMax = Mathf.Max(rect.xMax, vertex.position.x);
|
||||
rect.yMax = Mathf.Max(rect.yMax, vertex.position.y);
|
||||
}
|
||||
return rect;
|
||||
}
|
||||
default: return graphic.rectTransform.rect;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,7 @@ namespace Coffee.UIExtensions
|
||||
changed |= EditorGUI.EndChangeCheck();
|
||||
|
||||
// When tone is enable, show parameters.
|
||||
if (spToneMode.intValue != (int)UIEffect.ToneMode.None)
|
||||
if (spToneMode.intValue != (int)ToneMode.None)
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ToneLevel"));
|
||||
@@ -54,7 +54,7 @@ namespace Coffee.UIExtensions
|
||||
changed |= EditorGUI.EndChangeCheck();
|
||||
|
||||
// When color is enable, show parameters.
|
||||
if (spColorMode.intValue != (int)UIEffect.ColorMode.None)
|
||||
if (spColorMode.intValue != (int)ColorMode.Multiply)
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectColor"));
|
||||
@@ -70,26 +70,26 @@ namespace Coffee.UIExtensions
|
||||
changed |= EditorGUI.EndChangeCheck();
|
||||
|
||||
// When blur is enable, show parameters.
|
||||
if (spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
if (spBlurMode.intValue != (int)BlurMode.None)
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Blur"));
|
||||
EditorGUI.indentLevel--;
|
||||
}
|
||||
|
||||
// Set effect material.
|
||||
if (!serializedObject.isEditingMultipleObjects && spToneMode.intValue == 0 && spColorMode.intValue == 0 && spBlurMode.intValue == 0)
|
||||
{
|
||||
spMaterial.objectReferenceValue = null;
|
||||
}
|
||||
else if (changed || !serializedObject.isEditingMultipleObjects)
|
||||
{
|
||||
spMaterial.objectReferenceValue = UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName),
|
||||
(UIEffect.ToneMode)spToneMode.intValue,
|
||||
(UIEffect.ColorMode)spColorMode.intValue,
|
||||
(UIEffect.BlurMode)spBlurMode.intValue
|
||||
);
|
||||
}
|
||||
// // Set effect material.
|
||||
// if (!serializedObject.isEditingMultipleObjects && spToneMode.intValue == 0 && spColorMode.intValue == 0 && spBlurMode.intValue == 0)
|
||||
// {
|
||||
// spMaterial.objectReferenceValue = null;
|
||||
// }
|
||||
// else if (changed || !serializedObject.isEditingMultipleObjects)
|
||||
// {
|
||||
// spMaterial.objectReferenceValue = UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName),
|
||||
// (UIEffect.ToneMode)spToneMode.intValue,
|
||||
// (UIEffect.ColorMode)spColorMode.intValue,
|
||||
// (UIEffect.BlurMode)spBlurMode.intValue
|
||||
// );
|
||||
// }
|
||||
}
|
||||
|
||||
//################################
|
||||
@@ -132,7 +132,7 @@ namespace Coffee.UIExtensions
|
||||
{
|
||||
_spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
|
||||
var element = _spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
|
||||
element.FindPropertyRelative("shadowMode").intValue = (int)UIEffect.ShadowStyle.Shadow;
|
||||
element.FindPropertyRelative("shadowMode").intValue = (int)ShadowStyle.Shadow;
|
||||
element.FindPropertyRelative("shadowColor").colorValue = Color.black;
|
||||
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
|
||||
element.FindPropertyRelative("useGraphicAlpha").boolValue = true;
|
||||
@@ -142,10 +142,10 @@ namespace Coffee.UIExtensions
|
||||
float ElementHeightCallback(int index)
|
||||
{
|
||||
var element = _spAdditionalShadows.GetArrayElementAtIndex(index);
|
||||
if (element.FindPropertyRelative("shadowMode").intValue == (int)UIEffect.ShadowStyle.None)
|
||||
if (element.FindPropertyRelative("shadowMode").intValue == (int)ShadowStyle.None)
|
||||
return 16;
|
||||
|
||||
return (_spBlurMode.intValue == (int)UIEffect.BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
return (_spBlurMode.intValue == (int)BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -159,7 +159,7 @@ namespace Coffee.UIExtensions
|
||||
r.height = EditorGUIUtility.singleLineHeight;
|
||||
var spMode = sp.FindPropertyRelative("shadowMode");
|
||||
EditorGUI.PropertyField(r, spMode);
|
||||
if (spMode.intValue == (int)UIEffect.ShadowStyle.None)
|
||||
if (spMode.intValue == (int)ShadowStyle.None)
|
||||
return;
|
||||
|
||||
r.y += r.height;
|
||||
@@ -169,7 +169,7 @@ namespace Coffee.UIExtensions
|
||||
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
|
||||
|
||||
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
if (_spBlurMode.intValue != (int)BlurMode.None)
|
||||
{
|
||||
r.y += r.height;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("shadowBlur"));
|
||||
@@ -209,14 +209,14 @@ namespace Coffee.UIExtensions
|
||||
EditorGUILayout.PropertyField(spShadowMode);
|
||||
|
||||
// When shadow is enable, show parameters.
|
||||
if (spShadowMode.intValue != (int)UIEffect.ShadowStyle.None)
|
||||
if (spShadowMode.intValue != (int)ShadowStyle.None)
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectDistance"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowColor"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_UseGraphicAlpha"));
|
||||
|
||||
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
if (_spBlurMode.intValue != (int)BlurMode.None)
|
||||
{
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowBlur"));
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace Coffee.UIExtensions
|
||||
{
|
||||
spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
|
||||
var element = spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
|
||||
element.FindPropertyRelative("style").intValue = (int)UIShadow.ShadowStyle.Shadow;
|
||||
element.FindPropertyRelative("style").intValue = (int)ShadowStyle.Shadow;
|
||||
element.FindPropertyRelative("effectColor").colorValue = Color.black;
|
||||
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
|
||||
element.FindPropertyRelative("useGraphicAlpha").boolValue = true;
|
||||
@@ -42,10 +42,10 @@ namespace Coffee.UIExtensions
|
||||
float ElementHeightCallback(int index)
|
||||
{
|
||||
var element = spAdditionalShadows.GetArrayElementAtIndex(index);
|
||||
if (element.FindPropertyRelative("style").intValue == (int)UIShadow.ShadowStyle.None)
|
||||
if (element.FindPropertyRelative("style").intValue == (int)ShadowStyle.None)
|
||||
return 16;
|
||||
|
||||
return (uiEffect && uiEffect.blurMode != UIEffect.BlurMode.None ? 84 : 64) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
return (uiEffect && uiEffect.blurMode != BlurMode.None ? 84 : 64) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -59,7 +59,7 @@ namespace Coffee.UIExtensions
|
||||
r.height = EditorGUIUtility.singleLineHeight;
|
||||
var spMode = sp.FindPropertyRelative("style");
|
||||
EditorGUI.PropertyField(r, spMode);
|
||||
if (spMode.intValue == (int)UIShadow.ShadowStyle.None)
|
||||
if (spMode.intValue == (int)ShadowStyle.None)
|
||||
return;
|
||||
|
||||
r.y += r.height;
|
||||
@@ -69,7 +69,7 @@ namespace Coffee.UIExtensions
|
||||
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
|
||||
|
||||
if (uiEffect && uiEffect.blurMode != UIEffect.BlurMode.None)
|
||||
if (uiEffect && uiEffect.blurMode != BlurMode.None)
|
||||
{
|
||||
r.y += r.height;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("blur"));
|
||||
@@ -91,14 +91,14 @@ namespace Coffee.UIExtensions
|
||||
EditorGUILayout.PropertyField(spShadowMode);
|
||||
|
||||
// When shadow is enable, show parameters.
|
||||
if (spShadowMode.intValue != (int)UIShadow.ShadowStyle.None)
|
||||
if (spShadowMode.intValue != (int)ShadowStyle.None)
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectDistance"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectColor"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_UseGraphicAlpha"));
|
||||
|
||||
if (uiEffect && uiEffect.blurMode != UIEffect.BlurMode.None)
|
||||
if (uiEffect && uiEffect.blurMode != BlurMode.None)
|
||||
{
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Blur"));
|
||||
}
|
||||
|
||||
@@ -38,12 +38,6 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
public Vector4 customFactor2 { get { return m_CustomFactor2; } set { m_CustomFactor2 = value; SetDirty(); } }
|
||||
|
||||
// protected override void OnValidate()
|
||||
// {
|
||||
// base.OnValidate();
|
||||
// Debug.Log("hog!");
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
|
||||
@@ -1,25 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using UnityEditor;
|
||||
#endif
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// UIDissolve.
|
||||
/// Dissolve effect for uGUI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[DisallowMultipleComponent]
|
||||
public class UIDissolve : BaseMeshEffect
|
||||
#if UNITY_EDITOR
|
||||
, ISerializationCallbackReceiver
|
||||
#endif
|
||||
public class UIDissolve : UIEffectBase, IMaterialModifier
|
||||
{
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
@@ -34,23 +23,21 @@ namespace Coffee.UIExtensions
|
||||
[SerializeField] [Range(0, 1)] float m_Width = 0.5f;
|
||||
[SerializeField] [Range(0, 1)] float m_Softness = 0.5f;
|
||||
[SerializeField] [ColorUsage(false)] Color m_Color = new Color(0.0f, 0.25f, 1.0f);
|
||||
[SerializeField] UIEffect.ColorMode m_ColorMode = UIEffect.ColorMode.Add;
|
||||
[SerializeField] Material m_EffectMaterial;
|
||||
[Space]
|
||||
[SerializeField] ColorMode m_ColorMode = ColorMode.Add;
|
||||
[SerializeField] Texture m_NoiseTexture;
|
||||
[SerializeField] protected EffectArea m_EffectArea;
|
||||
[Header("Play Effect")]
|
||||
[SerializeField] bool m_Play = false;
|
||||
[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
|
||||
[SerializeField] AnimatorUpdateMode m_UpdateMode = AnimatorUpdateMode.Normal;
|
||||
|
||||
|
||||
//################################
|
||||
// Public Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// Graphic affected by the UIEffect.
|
||||
/// </summary>
|
||||
new public Graphic graphic { get { return base.graphic; } }
|
||||
|
||||
/// <summary>
|
||||
/// Location for effect.
|
||||
/// Current location[0-1] for dissolve effect. 0 is not dissolved, 1 is completely dissolved.
|
||||
/// </summary>
|
||||
public float location
|
||||
{
|
||||
@@ -61,7 +48,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Location, value))
|
||||
{
|
||||
m_Location = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -78,7 +65,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Width, value))
|
||||
{
|
||||
m_Width = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -95,7 +82,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Softness, value))
|
||||
{
|
||||
m_Softness = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -111,7 +98,42 @@ namespace Coffee.UIExtensions
|
||||
if (m_Color != value)
|
||||
{
|
||||
m_Color = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Noise texture.
|
||||
/// </summary>
|
||||
public Texture noiseTexture
|
||||
{
|
||||
get { return m_NoiseTexture; }
|
||||
set
|
||||
{
|
||||
if (m_NoiseTexture != value)
|
||||
{
|
||||
m_NoiseTexture = value;
|
||||
if (graphic)
|
||||
{
|
||||
graphic.SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The area for effect.
|
||||
/// </summary>
|
||||
public EffectArea effectArea
|
||||
{
|
||||
get { return m_EffectArea; }
|
||||
set
|
||||
{
|
||||
if (m_EffectArea != value)
|
||||
{
|
||||
m_EffectArea = value;
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,12 +141,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Color effect mode.
|
||||
/// </summary>
|
||||
public UIEffect.ColorMode colorMode { get { return m_ColorMode; } }
|
||||
|
||||
/// <summary>
|
||||
/// Effect material.
|
||||
/// </summary>
|
||||
public virtual Material effectMaterial { get { return m_EffectMaterial; } }
|
||||
public ColorMode colorMode { get { return m_ColorMode; } }
|
||||
|
||||
/// <summary>
|
||||
/// Play dissolve on enable.
|
||||
@@ -142,49 +159,33 @@ namespace Coffee.UIExtensions
|
||||
public AnimatorUpdateMode updateMode { get { return m_UpdateMode; } set { m_UpdateMode = value; } }
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// Modifies the material.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
public Material GetModifiedMaterial(Material baseMaterial)
|
||||
{
|
||||
_time = 0;
|
||||
graphic.material = effectMaterial;
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the behaviour becomes disabled () or inactive.
|
||||
/// </summary>
|
||||
protected override void OnDisable()
|
||||
{
|
||||
graphic.material = null;
|
||||
base.OnDisable();
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public void OnBeforeSerialize()
|
||||
{
|
||||
}
|
||||
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
var obj = this;
|
||||
EditorApplication.delayCall += () =>
|
||||
if (_materialCache != null && !_materialCache.IsMatch(m_ColorMode, m_NoiseTexture))
|
||||
{
|
||||
if (Application.isPlaying || !obj || !obj.graphic)
|
||||
return;
|
||||
|
||||
var mat = UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName), UIEffect.ToneMode.None, m_ColorMode, UIEffect.BlurMode.None);
|
||||
MaterialCache.Unregister(_materialCache);
|
||||
_materialCache = null;
|
||||
}
|
||||
|
||||
if (m_EffectMaterial == mat && graphic.material == mat)
|
||||
return;
|
||||
if (!isActiveAndEnabled || !m_NoiseTexture || !m_EffectMaterial)
|
||||
{
|
||||
return baseMaterial;
|
||||
}
|
||||
else if (_materialCache != null && _materialCache.IsMatch(m_ColorMode, m_NoiseTexture))
|
||||
{
|
||||
return _materialCache.material;
|
||||
}
|
||||
|
||||
graphic.material = m_EffectMaterial = mat;
|
||||
EditorUtility.SetDirty(this);
|
||||
EditorUtility.SetDirty(graphic);
|
||||
EditorApplication.delayCall += AssetDatabase.SaveAssets;
|
||||
};
|
||||
_materialCache = MaterialCache.Register(m_ColorMode, m_NoiseTexture, () =>
|
||||
{
|
||||
var mat = new Material(m_EffectMaterial);
|
||||
mat.SetTexture("_NoiseTex", m_NoiseTexture);
|
||||
return mat;
|
||||
});
|
||||
return _materialCache.material;
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
@@ -195,16 +196,26 @@ namespace Coffee.UIExtensions
|
||||
return;
|
||||
|
||||
// rect.
|
||||
Rect rect = graphic.rectTransform.rect;
|
||||
Rect rect = GetEffectArea(vh, m_EffectArea);
|
||||
|
||||
// Calculate vertex position.
|
||||
UIVertex vertex = default(UIVertex);
|
||||
bool effectEachCharacter = graphic is Text && m_EffectArea == EffectArea.Character;
|
||||
float x, y;
|
||||
for (int i = 0; i < vh.currentVertCount; i++)
|
||||
{
|
||||
vh.PopulateUIVertex(ref vertex, i);
|
||||
|
||||
var x = Mathf.Clamp01(vertex.position.x / rect.width + 0.5f);
|
||||
var y = Mathf.Clamp01(vertex.position.y / rect.height + 0.5f);
|
||||
if (effectEachCharacter)
|
||||
{
|
||||
x = splitedCharacterPosition[i%4].x;
|
||||
y = splitedCharacterPosition[i%4].y;
|
||||
}
|
||||
else
|
||||
{
|
||||
x = Mathf.Clamp01(vertex.position.x / rect.width + 0.5f);
|
||||
y = Mathf.Clamp01(vertex.position.y / rect.height + 0.5f);
|
||||
}
|
||||
vertex.uv1 = new Vector2(
|
||||
Packer.ToFloat(x, y, location, m_Width),
|
||||
Packer.ToFloat(m_Color.r, m_Color.g, m_Color.b, m_Softness)
|
||||
@@ -223,9 +234,51 @@ namespace Coffee.UIExtensions
|
||||
m_Play = true;
|
||||
}
|
||||
|
||||
|
||||
//################################
|
||||
// Protected Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
{
|
||||
_time = 0;
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
{
|
||||
MaterialCache.Unregister(_materialCache);
|
||||
_materialCache = null;
|
||||
base.OnDisable();
|
||||
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
base.OnValidate();
|
||||
if (graphic)
|
||||
{
|
||||
graphic.SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the material.
|
||||
/// </summary>
|
||||
/// <returns>The material.</returns>
|
||||
protected override Material GetMaterial()
|
||||
{
|
||||
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ColorMode);
|
||||
}
|
||||
#endif
|
||||
|
||||
//################################
|
||||
// Private Members.
|
||||
//################################
|
||||
MaterialCache _materialCache = null;
|
||||
float _time = 0;
|
||||
|
||||
void Update()
|
||||
@@ -246,14 +299,5 @@ namespace Coffee.UIExtensions
|
||||
_time = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Mark the UIEffect as dirty.
|
||||
/// </summary>
|
||||
void _SetDirty()
|
||||
{
|
||||
if (graphic)
|
||||
graphic.SetVerticesDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,55 +56,55 @@ namespace Coffee.UIExtensions
|
||||
//################################
|
||||
public const string shaderName = "UI/Hidden/UI-Effect";
|
||||
|
||||
/// <summary>
|
||||
/// Tone effect mode.
|
||||
/// </summary>
|
||||
public enum ToneMode
|
||||
{
|
||||
None = 0,
|
||||
Grayscale,
|
||||
Sepia,
|
||||
Nega,
|
||||
Pixel,
|
||||
Mono,
|
||||
Cutoff,
|
||||
Hue,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Color effect mode.
|
||||
/// </summary>
|
||||
public enum ColorMode
|
||||
{
|
||||
None = 0,
|
||||
Set,
|
||||
Add,
|
||||
Sub,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Shadow effect style.
|
||||
/// </summary>
|
||||
public enum ShadowStyle
|
||||
{
|
||||
None = 0,
|
||||
Shadow,
|
||||
Outline,
|
||||
Outline8,
|
||||
Shadow3,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Blur effect mode.
|
||||
/// </summary>
|
||||
public enum BlurMode
|
||||
{
|
||||
None = 0,
|
||||
Fast,
|
||||
Medium,
|
||||
Detail,
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// Tone effect mode.
|
||||
// /// </summary>
|
||||
// public enum ToneMode
|
||||
// {
|
||||
// None = 0,
|
||||
// Grayscale,
|
||||
// Sepia,
|
||||
// Nega,
|
||||
// Pixel,
|
||||
// Mono,
|
||||
// Cutoff,
|
||||
// Hue,
|
||||
// }
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Color effect mode.
|
||||
// /// </summary>
|
||||
// public enum ColorMode
|
||||
// {
|
||||
// None = 0,
|
||||
// Set,
|
||||
// Add,
|
||||
// Sub,
|
||||
// }
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Shadow effect style.
|
||||
// /// </summary>
|
||||
// public enum ShadowStyle
|
||||
// {
|
||||
// None = 0,
|
||||
// Shadow,
|
||||
// Outline,
|
||||
// Outline8,
|
||||
// Shadow3,
|
||||
// }
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Blur effect mode.
|
||||
// /// </summary>
|
||||
// public enum BlurMode
|
||||
// {
|
||||
// None = 0,
|
||||
// Fast,
|
||||
// Medium,
|
||||
// Detail,
|
||||
// }
|
||||
//
|
||||
|
||||
//################################
|
||||
// Serialize Members.
|
||||
@@ -258,118 +258,129 @@ namespace Coffee.UIExtensions
|
||||
tempVerts.Clear();
|
||||
}
|
||||
|
||||
//#if UNITY_EDITOR
|
||||
//
|
||||
// protected override void OnValidate ()
|
||||
// {
|
||||
// base.OnValidate ();
|
||||
// EditorApplication.delayCall += () => UpdateMaterial(false);
|
||||
// }
|
||||
//
|
||||
// public override void OnAfterDeserialize()
|
||||
// {
|
||||
// if (!m_CustomEffect)
|
||||
// {
|
||||
// EditorApplication.delayCall += () => UpdateMaterial (true);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// void UpdateMaterial(bool onlyEditMode)
|
||||
// {
|
||||
// if(!this || onlyEditMode && Application.isPlaying)
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// var mat = (0 == toneMode) && (0 == colorMode) && (0 == blurMode)
|
||||
// ? null
|
||||
// : GetOrGenerateMaterialVariant(Shader.Find(shaderName), toneMode, colorMode, blurMode);
|
||||
//
|
||||
// if (m_EffectMaterial != mat || targetGraphic.material != mat)
|
||||
// {
|
||||
// targetGraphic.material = m_EffectMaterial = mat;
|
||||
// EditorUtility.SetDirty(this);
|
||||
// EditorUtility.SetDirty(targetGraphic);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public static Material GetOrGenerateMaterialVariant(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
// {
|
||||
// if (!shader)
|
||||
// return null;
|
||||
//
|
||||
// Material mat = GetMaterial(shader, tone, color, blur);
|
||||
//
|
||||
// if (!mat)
|
||||
// {
|
||||
// Debug.Log("Generate material : " + GetVariantName(shader, tone, color, blur));
|
||||
// mat = new Material(shader);
|
||||
//
|
||||
// if (0 < tone)
|
||||
// mat.EnableKeyword("" + tone.ToString().ToUpper());
|
||||
// if (0 < color)
|
||||
// mat.EnableKeyword("UI_COLOR_" + color.ToString().ToUpper());
|
||||
// if (0 < blur)
|
||||
// mat.EnableKeyword("UI_BLUR_" + blur.ToString().ToUpper());
|
||||
//
|
||||
// mat.name = GetVariantName(shader, tone, color, blur);
|
||||
// mat.hideFlags |= HideFlags.NotEditable;
|
||||
//
|
||||
//#if UIEFFECT_SEPARATE
|
||||
// bool isMainAsset = true;
|
||||
// string dir = Path.GetDirectoryName(GetDefaultMaterialPath (shader));
|
||||
// string materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
|
||||
//#else
|
||||
// bool isMainAsset = (0 == tone) && (0 == color) && (0 == blur);
|
||||
// string materialPath = GetDefaultMaterialPath (shader);
|
||||
//#endif
|
||||
// if (isMainAsset)
|
||||
// {
|
||||
// Directory.CreateDirectory(Path.GetDirectoryName(materialPath));
|
||||
// AssetDatabase.CreateAsset(mat, materialPath);
|
||||
// AssetDatabase.SaveAssets();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// mat.hideFlags |= HideFlags.HideInHierarchy;
|
||||
// AssetDatabase.AddObjectToAsset(mat, materialPath);
|
||||
// }
|
||||
// }
|
||||
// return mat;
|
||||
// }
|
||||
//
|
||||
// public static Material GetMaterial(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
// {
|
||||
// string variantName = GetVariantName(shader, tone, color, blur);
|
||||
// return AssetDatabase.FindAssets("t:Material " + Path.GetFileName(shader.name))
|
||||
// .Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
// .SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
|
||||
// .OfType<Material>()
|
||||
// .FirstOrDefault(x => x.name == variantName);
|
||||
// }
|
||||
//
|
||||
// public static string GetDefaultMaterialPath(Shader shader)
|
||||
// {
|
||||
// var name = Path.GetFileName (shader.name);
|
||||
// return AssetDatabase.FindAssets("t:Material " + name)
|
||||
// .Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
// .FirstOrDefault(x => Path.GetFileNameWithoutExtension(x) == name)
|
||||
// ?? ("Assets/Coffee/UIExtensions/UIEffect/Materials/" + name + ".mat");
|
||||
// }
|
||||
//
|
||||
// public static string GetVariantName(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
// {
|
||||
// return
|
||||
//#if UIEFFECT_SEPARATE
|
||||
// "[Separated] " + Path.GetFileName(shader.name)
|
||||
//#else
|
||||
// Path.GetFileName(shader.name)
|
||||
//#endif
|
||||
// + (0 < tone ? "-" + tone : "")
|
||||
// + (0 < color ? "-" + color : "")
|
||||
// + (0 < blur ? "-" + blur : "");
|
||||
// }
|
||||
//#endif
|
||||
|
||||
#if UNITY_EDITOR
|
||||
|
||||
protected override void OnValidate ()
|
||||
/// <summary>
|
||||
/// Gets the material.
|
||||
/// </summary>
|
||||
/// <returns>The material.</returns>
|
||||
protected override Material GetMaterial ()
|
||||
{
|
||||
base.OnValidate ();
|
||||
EditorApplication.delayCall += () => UpdateMaterial(false);
|
||||
}
|
||||
|
||||
public override void OnAfterDeserialize()
|
||||
{
|
||||
if (!m_CustomEffect)
|
||||
{
|
||||
EditorApplication.delayCall += () => UpdateMaterial (true);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateMaterial(bool onlyEditMode)
|
||||
{
|
||||
if(!this || onlyEditMode && Application.isPlaying)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var mat = (0 == toneMode) && (0 == colorMode) && (0 == blurMode)
|
||||
? null
|
||||
: GetOrGenerateMaterialVariant(Shader.Find(shaderName), toneMode, colorMode, blurMode);
|
||||
|
||||
if (m_EffectMaterial != mat || targetGraphic.material != mat)
|
||||
{
|
||||
targetGraphic.material = m_EffectMaterial = mat;
|
||||
EditorUtility.SetDirty(this);
|
||||
EditorUtility.SetDirty(targetGraphic);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static Material GetOrGenerateMaterialVariant(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
{
|
||||
if (!shader)
|
||||
return null;
|
||||
|
||||
Material mat = GetMaterial(shader, tone, color, blur);
|
||||
|
||||
if (!mat)
|
||||
{
|
||||
Debug.Log("Generate material : " + GetVariantName(shader, tone, color, blur));
|
||||
mat = new Material(shader);
|
||||
|
||||
if (0 < tone)
|
||||
mat.EnableKeyword("UI_TONE_" + tone.ToString().ToUpper());
|
||||
if (0 < color)
|
||||
mat.EnableKeyword("UI_COLOR_" + color.ToString().ToUpper());
|
||||
if (0 < blur)
|
||||
mat.EnableKeyword("UI_BLUR_" + blur.ToString().ToUpper());
|
||||
|
||||
mat.name = GetVariantName(shader, tone, color, blur);
|
||||
mat.hideFlags |= HideFlags.NotEditable;
|
||||
|
||||
#if UIEFFECT_SEPARATE
|
||||
bool isMainAsset = true;
|
||||
string dir = Path.GetDirectoryName(GetDefaultMaterialPath (shader));
|
||||
string materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
|
||||
#else
|
||||
bool isMainAsset = (0 == tone) && (0 == color) && (0 == blur);
|
||||
string materialPath = GetDefaultMaterialPath (shader);
|
||||
#endif
|
||||
if (isMainAsset)
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(materialPath));
|
||||
AssetDatabase.CreateAsset(mat, materialPath);
|
||||
AssetDatabase.SaveAssets();
|
||||
}
|
||||
else
|
||||
{
|
||||
mat.hideFlags |= HideFlags.HideInHierarchy;
|
||||
AssetDatabase.AddObjectToAsset(mat, materialPath);
|
||||
}
|
||||
}
|
||||
return mat;
|
||||
}
|
||||
|
||||
public static Material GetMaterial(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
{
|
||||
string variantName = GetVariantName(shader, tone, color, blur);
|
||||
return AssetDatabase.FindAssets("t:Material " + Path.GetFileName(shader.name))
|
||||
.Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
.SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
|
||||
.OfType<Material>()
|
||||
.FirstOrDefault(x => x.name == variantName);
|
||||
}
|
||||
|
||||
public static string GetDefaultMaterialPath(Shader shader)
|
||||
{
|
||||
var name = Path.GetFileName (shader.name);
|
||||
return AssetDatabase.FindAssets("t:Material " + name)
|
||||
.Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
.FirstOrDefault(x => Path.GetFileNameWithoutExtension(x) == name)
|
||||
?? ("Assets/Coffee/UIExtensions/UIEffect/Materials/" + name + ".mat");
|
||||
}
|
||||
|
||||
public static string GetVariantName(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
|
||||
{
|
||||
return
|
||||
#if UIEFFECT_SEPARATE
|
||||
"[Separated] " + Path.GetFileName(shader.name)
|
||||
#else
|
||||
Path.GetFileName(shader.name)
|
||||
#endif
|
||||
+ (0 < tone ? "-" + tone : "")
|
||||
+ (0 < color ? "-" + color : "")
|
||||
+ (0 < blur ? "-" + blur : "");
|
||||
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ToneMode, m_ColorMode, m_BlurMode);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -445,7 +456,7 @@ namespace Coffee.UIExtensions
|
||||
|
||||
Color vertColor = color;
|
||||
|
||||
if(colorMode != ColorMode.None)
|
||||
if(colorMode != ColorMode.Multiply)
|
||||
{
|
||||
vertColor.r = vertColor.g = vertColor.b = 1;
|
||||
}
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Abstract effect base for UI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[RequireComponent(typeof(Graphic))]
|
||||
[DisallowMultipleComponent]
|
||||
public abstract class UIEffectBase : BaseMeshEffect, ISerializationCallbackReceiver
|
||||
{
|
||||
protected static readonly List<UIVertex> tempVerts = new List<UIVertex>();
|
||||
|
||||
[SerializeField] protected Material m_EffectMaterial;
|
||||
|
||||
/// <summary>
|
||||
/// Gets target graphic for effect.
|
||||
/// </summary>
|
||||
public Graphic targetGraphic { get { return graphic; } }
|
||||
|
||||
/// <summary>
|
||||
/// Gets material for effect.
|
||||
/// </summary>
|
||||
public Material effectMaterial { get { return m_EffectMaterial; } }
|
||||
|
||||
/// <summary>
|
||||
/// Raises the before serialize event.
|
||||
/// </summary>
|
||||
public virtual void OnBeforeSerialize()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raises the after deserialize event.
|
||||
/// </summary>
|
||||
public virtual void OnAfterDeserialize()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
UnityEditor.EditorApplication.delayCall += () => targetGraphic.material = m_EffectMaterial;
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
{
|
||||
targetGraphic.material = m_EffectMaterial;
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the behaviour becomes disabled () or inactive.
|
||||
/// </summary>
|
||||
protected override void OnDisable()
|
||||
{
|
||||
targetGraphic.material = null;
|
||||
base.OnDisable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Mark the UIEffect as dirty.
|
||||
/// </summary>
|
||||
protected void SetDirty()
|
||||
{
|
||||
if (targetGraphic)
|
||||
{
|
||||
targetGraphic.SetVerticesDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,16 +3,8 @@ using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using UnityEngine.UI;
|
||||
|
||||
#if UNITY_EDITOR
|
||||
using UnityEditor;
|
||||
#endif
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
using BlurMode = UIEffect.BlurMode;
|
||||
using ColorMode = UIEffect.ColorMode;
|
||||
using ToneMode = UIEffect.ToneMode;
|
||||
|
||||
/// <summary>
|
||||
/// UIEffectCapturedImage
|
||||
/// </summary>
|
||||
@@ -146,33 +138,6 @@ namespace Coffee.UIExtensions
|
||||
base.OnPopulateMesh(vh);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public void OnBeforeSerialize()
|
||||
{
|
||||
}
|
||||
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
var obj = this;
|
||||
EditorApplication.delayCall += () =>
|
||||
{
|
||||
if (Application.isPlaying || !obj)
|
||||
return;
|
||||
|
||||
var mat = (0 == toneMode) && (0 == colorMode) && (0 == blurMode)
|
||||
? null
|
||||
: UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName), toneMode, colorMode, blurMode);
|
||||
|
||||
if (m_EffectMaterial == mat)
|
||||
return;
|
||||
|
||||
m_EffectMaterial = mat;
|
||||
EditorUtility.SetDirty(this);
|
||||
EditorApplication.delayCall += AssetDatabase.SaveAssets;
|
||||
};
|
||||
}
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Gets the size of the desampling.
|
||||
/// </summary>
|
||||
@@ -302,6 +267,52 @@ namespace Coffee.UIExtensions
|
||||
_Release(true);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
/// <summary>
|
||||
/// Raises the before serialize event.
|
||||
/// </summary>
|
||||
public void OnBeforeSerialize()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raises the after deserialize event.
|
||||
/// </summary>
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raises the validate event.
|
||||
/// </summary>
|
||||
protected override void OnValidate ()
|
||||
{
|
||||
base.OnValidate ();
|
||||
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(false);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the material.
|
||||
/// </summary>
|
||||
/// <param name="ignoreInPlayMode">If set to <c>true</c> ignore in play mode.</param>
|
||||
protected void UpdateMaterial(bool ignoreInPlayMode)
|
||||
{
|
||||
if(!this || ignoreInPlayMode && Application.isPlaying)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var mat = MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ToneMode, m_ColorMode, m_BlurMode);
|
||||
if (m_EffectMaterial != mat)
|
||||
{
|
||||
material = null;
|
||||
m_EffectMaterial = mat;
|
||||
UnityEditor.EditorUtility.SetDirty(this);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
//################################
|
||||
|
||||
@@ -51,21 +51,6 @@ namespace Coffee.UIExtensions
|
||||
public bool useGraphicAlpha = true;
|
||||
}
|
||||
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// Shadow effect style.
|
||||
/// </summary>
|
||||
public enum ShadowStyle
|
||||
{
|
||||
None = 0,
|
||||
Shadow,
|
||||
Outline,
|
||||
Outline8,
|
||||
Shadow3,
|
||||
}
|
||||
|
||||
//################################
|
||||
// Serialize Members.
|
||||
//################################
|
||||
|
||||
@@ -18,10 +18,7 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[DisallowMultipleComponent]
|
||||
public class UIShiny : BaseMeshEffect
|
||||
#if UNITY_EDITOR
|
||||
, ISerializationCallbackReceiver
|
||||
#endif
|
||||
public class UIShiny : UIEffectBase
|
||||
{
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
@@ -39,8 +36,8 @@ namespace Coffee.UIExtensions
|
||||
[FormerlySerializedAs("m_Alpha")]
|
||||
[SerializeField][Range(0, 1)] float m_Brightness = 1f;
|
||||
[SerializeField][Range(0, 1)] float m_Highlight = 1;
|
||||
[SerializeField] Material m_EffectMaterial;
|
||||
[Space]
|
||||
[SerializeField] protected EffectArea m_EffectArea;
|
||||
[Header("Play Effect")]
|
||||
[SerializeField] bool m_Play = false;
|
||||
[SerializeField] bool m_Loop = false;
|
||||
[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
|
||||
@@ -51,10 +48,10 @@ namespace Coffee.UIExtensions
|
||||
//################################
|
||||
// Public Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// Graphic affected by the UIEffect.
|
||||
/// </summary>
|
||||
new public Graphic graphic { get { return base.graphic; } }
|
||||
// /// <summary>
|
||||
// /// Graphic affected by the UIEffect.
|
||||
// /// </summary>
|
||||
// new public Graphic graphic { get { return base.graphic; } }
|
||||
|
||||
/// <summary>
|
||||
/// Location for shiny effect.
|
||||
@@ -68,7 +65,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Location, value))
|
||||
{
|
||||
m_Location = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -85,7 +82,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Width, value))
|
||||
{
|
||||
m_Width = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -102,7 +99,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Softness, value))
|
||||
{
|
||||
m_Softness = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,7 +117,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Brightness, value))
|
||||
{
|
||||
m_Brightness = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -137,7 +134,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Brightness, value))
|
||||
{
|
||||
m_Brightness = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -154,7 +151,7 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Highlight, value))
|
||||
{
|
||||
m_Highlight = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -170,15 +167,26 @@ namespace Coffee.UIExtensions
|
||||
if (!Mathf.Approximately(m_Rotation, value))
|
||||
{
|
||||
m_Rotation = value;
|
||||
_SetDirty();
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Effect material.
|
||||
/// The area for effect.
|
||||
/// </summary>
|
||||
public virtual Material effectMaterial { get { return m_EffectMaterial; } }
|
||||
public EffectArea effectArea
|
||||
{
|
||||
get { return m_EffectArea; }
|
||||
set
|
||||
{
|
||||
if (m_EffectArea != value)
|
||||
{
|
||||
m_EffectArea = value;
|
||||
SetDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Play shinning on enable.
|
||||
@@ -211,52 +219,58 @@ namespace Coffee.UIExtensions
|
||||
protected override void OnEnable()
|
||||
{
|
||||
_time = 0;
|
||||
graphic.material = effectMaterial;
|
||||
// graphic.material = effectMaterial;
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the behaviour becomes disabled () or inactive.
|
||||
/// </summary>
|
||||
protected override void OnDisable()
|
||||
{
|
||||
graphic.material = null;
|
||||
base.OnDisable();
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// This function is called when the behaviour becomes disabled () or inactive.
|
||||
// /// </summary>
|
||||
// protected override void OnDisable()
|
||||
// {
|
||||
// graphic.material = null;
|
||||
// base.OnDisable();
|
||||
// }
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public void OnBeforeSerialize()
|
||||
protected override Material GetMaterial()
|
||||
{
|
||||
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName));
|
||||
}
|
||||
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
var obj = this;
|
||||
EditorApplication.delayCall += () =>
|
||||
{
|
||||
if (Application.isPlaying || !obj)
|
||||
return;
|
||||
|
||||
var mat = GetMaterial(shaderName);
|
||||
if (m_EffectMaterial == mat && graphic.material == mat)
|
||||
return;
|
||||
|
||||
graphic.material = m_EffectMaterial = mat;
|
||||
EditorUtility.SetDirty(this);
|
||||
EditorUtility.SetDirty(graphic);
|
||||
EditorApplication.delayCall += AssetDatabase.SaveAssets;
|
||||
};
|
||||
}
|
||||
|
||||
public static Material GetMaterial(string shaderName)
|
||||
{
|
||||
string name = Path.GetFileName(shaderName);
|
||||
return AssetDatabase.FindAssets("t:Material " + name)
|
||||
.Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
.SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
|
||||
.OfType<Material>()
|
||||
.FirstOrDefault(x => x.name == name);
|
||||
}
|
||||
// public void OnBeforeSerialize()
|
||||
// {
|
||||
// }
|
||||
//
|
||||
// public void OnAfterDeserialize()
|
||||
// {
|
||||
// var obj = this;
|
||||
// EditorApplication.delayCall += () =>
|
||||
// {
|
||||
// if (Application.isPlaying || !obj)
|
||||
// return;
|
||||
//
|
||||
// var mat = GetMaterial(shaderName);
|
||||
// if (m_EffectMaterial == mat && graphic.material == mat)
|
||||
// return;
|
||||
//
|
||||
// graphic.material = m_EffectMaterial = mat;
|
||||
// EditorUtility.SetDirty(this);
|
||||
// EditorUtility.SetDirty(graphic);
|
||||
// EditorApplication.delayCall += AssetDatabase.SaveAssets;
|
||||
// };
|
||||
// }
|
||||
//
|
||||
// public static Material GetMaterial(string shaderName)
|
||||
// {
|
||||
// string name = Path.GetFileName(shaderName);
|
||||
// return AssetDatabase.FindAssets("t:Material " + name)
|
||||
// .Select(x => AssetDatabase.GUIDToAssetPath(x))
|
||||
// .SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
|
||||
// .OfType<Material>()
|
||||
// .FirstOrDefault(x => x.name == name);
|
||||
// }
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
@@ -268,7 +282,7 @@ namespace Coffee.UIExtensions
|
||||
return;
|
||||
|
||||
// rect.
|
||||
Rect rect = graphic.rectTransform.rect;
|
||||
Rect rect = GetEffectArea(vh, m_EffectArea);
|
||||
|
||||
// rotation.
|
||||
float rad = rotation * Mathf.Deg2Rad;
|
||||
@@ -277,6 +291,8 @@ namespace Coffee.UIExtensions
|
||||
dir = dir.normalized;
|
||||
|
||||
// Calculate vertex position.
|
||||
bool effectEachCharacter = graphic is Text && m_EffectArea == EffectArea.Character;
|
||||
|
||||
UIVertex vertex = default(UIVertex);
|
||||
Vector2 nomalizedPos;
|
||||
Matrix2x3 localMatrix = new Matrix2x3(rect, dir.x, dir.y); // Get local matrix.
|
||||
@@ -287,6 +303,17 @@ namespace Coffee.UIExtensions
|
||||
// Normalize vertex position by local matrix.
|
||||
nomalizedPos = localMatrix * vertex.position;
|
||||
|
||||
// Normalize vertex position by local matrix.
|
||||
if (effectEachCharacter)
|
||||
{
|
||||
// Each characters.
|
||||
nomalizedPos = localMatrix * splitedCharacterPosition[i % 4];
|
||||
}
|
||||
else
|
||||
{
|
||||
nomalizedPos = localMatrix * vertex.position;
|
||||
}
|
||||
|
||||
vertex.uv1 = new Vector2(
|
||||
Packer.ToFloat(Mathf.Clamp01(nomalizedPos.y), softness, width, brightness),
|
||||
Packer.ToFloat(location, highlight)
|
||||
@@ -330,13 +357,13 @@ namespace Coffee.UIExtensions
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Mark the UIEffect as dirty.
|
||||
/// </summary>
|
||||
void _SetDirty()
|
||||
{
|
||||
if (graphic)
|
||||
graphic.SetVerticesDirty();
|
||||
}
|
||||
// /// <summary>
|
||||
// /// Mark the UIEffect as dirty.
|
||||
// /// </summary>
|
||||
// void _SetDirty()
|
||||
// {
|
||||
// if (graphic)
|
||||
// graphic.SetVerticesDirty();
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
|
||||
#pragma target 2.0
|
||||
|
||||
#pragma multi_compile __ UNITY_UI_ALPHACLIP
|
||||
#pragma shader_feature __ UI_COLOR_ADD UI_COLOR_SUB UI_COLOR_SET
|
||||
#pragma shader_feature __ ADD SUBTRACT FILL
|
||||
|
||||
#include "UnityCG.cginc"
|
||||
#include "UnityUI.cginc"
|
||||
|
||||
@@ -3,7 +3,9 @@ guid: e1b48dc831eb147e9886c049033213bf
|
||||
timeCreated: 1523859834
|
||||
licenseType: Pro
|
||||
ShaderImporter:
|
||||
defaultTextures: []
|
||||
defaultTextures:
|
||||
- _MainTex: {instanceID: 0}
|
||||
- _NoiseTex: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,26 +1,20 @@
|
||||
#ifndef UI_EFFECT_INCLUDED
|
||||
#define UI_EFFECT_INCLUDED
|
||||
|
||||
//################################
|
||||
// Define
|
||||
//################################
|
||||
#define PACKER_STEP 64
|
||||
|
||||
#if UI_TONE_GRAYSCALE | UI_TONE_SEPIA | UI_TONE_NEGA | UI_TONE_PIXEL | UI_TONE_MONO | UI_TONE_CUTOFF | UI_TONE_HUE
|
||||
#if GRAYSCALE | SEPIA | NEGA | PIXEL | MONO | CUTOFF | HUE
|
||||
#define UI_TONE
|
||||
#endif
|
||||
|
||||
#if UI_COLOR_ADD | UI_COLOR_SUB | UI_COLOR_SET
|
||||
#if ADD | SUBTRACT | FILL
|
||||
#define UI_COLOR
|
||||
#endif
|
||||
|
||||
#if UI_BLUR_FAST | UI_BLUR_MEDIUM | UI_BLUR_DETAIL
|
||||
#if FASTBLUR | MEDIUMBLUR | DETAILBLUR
|
||||
#define UI_BLUR
|
||||
#endif
|
||||
|
||||
//################################
|
||||
// Unpacker to vector
|
||||
//################################
|
||||
// Unpack float to low-precision [0-1] fixed4.
|
||||
fixed4 UnpackToVec4(float value)
|
||||
{
|
||||
@@ -40,117 +34,91 @@ fixed4 UnpackToVec4(float value)
|
||||
return color;
|
||||
}
|
||||
|
||||
//################################
|
||||
// Blur effect
|
||||
//################################
|
||||
// Calculate blur effect.
|
||||
// Sample texture by blured uv, with bias.
|
||||
fixed4 Blur(sampler2D tex, half2 uv, half2 addUv, half bias)
|
||||
{
|
||||
return
|
||||
(
|
||||
tex2D(tex, uv + half2(addUv.x, addUv.y))
|
||||
+ tex2D(tex, uv + half2(-addUv.x, addUv.y))
|
||||
+ tex2D(tex, uv + half2(addUv.x, -addUv.y))
|
||||
+ tex2D(tex, uv + half2(-addUv.x, -addUv.y))
|
||||
#if UI_BLUR_DETAIL
|
||||
+ tex2D(tex, uv + half2(addUv.x, 0))
|
||||
+ tex2D(tex, uv + half2(-addUv.x, 0))
|
||||
+ tex2D(tex, uv + half2(0, addUv.y))
|
||||
+ tex2D(tex, uv + half2(0, -addUv.y))
|
||||
)
|
||||
* bias / 2;
|
||||
#else
|
||||
)
|
||||
* bias;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Sample texture with blurring.
|
||||
// * Fast: Sample texture with 3x4 blurring.
|
||||
// * Medium: Sample texture with 6x4 blurring.
|
||||
// * Detail: Sample texture with 6x8 blurring.
|
||||
fixed4 Tex2DBlurring(sampler2D tex, half2 uv, half2 blur)
|
||||
// * Fast: Sample texture with 3x3 kernel.
|
||||
// * Medium: Sample texture with 5x5 kernel.
|
||||
// * Detail: Sample texture with 7x7 kernel.
|
||||
fixed4 Tex2DBlurring (sampler2D tex, half2 uv, half2 blur)
|
||||
{
|
||||
half4 color = tex2D(tex, uv);
|
||||
|
||||
#if UI_BLUR_FAST
|
||||
return color * 0.41511
|
||||
+ Blur( tex, uv, blur * 3, 0.12924 )
|
||||
+ Blur( tex, uv, blur * 5, 0.01343 )
|
||||
+ Blur( tex, uv, blur * 6, 0.00353 );
|
||||
|
||||
#elif UI_BLUR_MEDIUM | UI_BLUR_DETAIL
|
||||
return color * 0.14387
|
||||
+ Blur( tex, uv, blur * 1, 0.06781 )
|
||||
+ Blur( tex, uv, blur * 2, 0.05791 )
|
||||
+ Blur( tex, uv, blur * 3, 0.04360 )
|
||||
+ Blur( tex, uv, blur * 4, 0.02773 )
|
||||
+ Blur( tex, uv, blur * 5, 0.01343 )
|
||||
+ Blur( tex, uv, blur * 6, 0.00353 );
|
||||
#if FASTBLUR
|
||||
const int KERNEL_SIZE = 3;
|
||||
#elif MEDIUMBLUR
|
||||
const int KERNEL_SIZE = 5;
|
||||
#elif DETAILBLUR
|
||||
const int KERNEL_SIZE = 7;
|
||||
#else
|
||||
return color;
|
||||
const int KERNEL_SIZE = 1;
|
||||
#endif
|
||||
float4 o = 0;
|
||||
float sum = 0;
|
||||
float weight;
|
||||
half2 texcood;
|
||||
for(int x = -KERNEL_SIZE/2; x <= KERNEL_SIZE/2; x++)
|
||||
{
|
||||
for(int y = -KERNEL_SIZE/2; y <= KERNEL_SIZE/2; y++)
|
||||
{
|
||||
texcood = uv;
|
||||
texcood.x += blur.x * x;
|
||||
texcood.y += blur.y * y;
|
||||
weight = 1.0/(abs(x)+abs(y)+2);
|
||||
o += tex2D(tex, texcood)*weight;
|
||||
sum += weight;
|
||||
}
|
||||
}
|
||||
return o / sum;
|
||||
}
|
||||
|
||||
//################################
|
||||
// Tone effect
|
||||
//################################
|
||||
fixed3 shift_hue(fixed3 RGB, half VSU, half VSW)
|
||||
{
|
||||
fixed3 RESULT;
|
||||
RESULT.x = (0.299 + 0.701*VSU + 0.168*VSW)*RGB.x
|
||||
fixed3 result;
|
||||
result.x = (0.299 + 0.701*VSU + 0.168*VSW)*RGB.x
|
||||
+ (0.587 - 0.587*VSU + 0.330*VSW)*RGB.y
|
||||
+ (0.114 - 0.114*VSU - 0.497*VSW)*RGB.z;
|
||||
|
||||
RESULT.y = (0.299 - 0.299*VSU - 0.328*VSW)*RGB.x
|
||||
result.y = (0.299 - 0.299*VSU - 0.328*VSW)*RGB.x
|
||||
+ (0.587 + 0.413*VSU + 0.035*VSW)*RGB.y
|
||||
+ (0.114 - 0.114*VSU + 0.292*VSW)*RGB.z;
|
||||
|
||||
RESULT.z = (0.299 - 0.3*VSU + 1.25*VSW)*RGB.x
|
||||
result.z = (0.299 - 0.3*VSU + 1.25*VSW)*RGB.x
|
||||
+ (0.587 - 0.588*VSU - 1.05*VSW)*RGB.y
|
||||
+ (0.114 + 0.886*VSU - 0.203*VSW)*RGB.z;
|
||||
|
||||
return (RESULT);
|
||||
return result;
|
||||
}
|
||||
|
||||
// Apply tone effect.
|
||||
fixed4 ApplyToneEffect(fixed4 color, fixed factor)
|
||||
{
|
||||
#ifdef UI_TONE_GRAYSCALE // Grayscale
|
||||
#ifdef GRAYSCALE
|
||||
color.rgb = lerp(color.rgb, Luminance(color.rgb), factor);
|
||||
|
||||
#elif UI_TONE_SEPIA // Sepia
|
||||
#elif SEPIA
|
||||
color.rgb = lerp(color.rgb, Luminance(color.rgb) * half3(1.07, 0.74, 0.43), factor);
|
||||
|
||||
#elif UI_TONE_NEGA // Nega
|
||||
#elif NEGA
|
||||
color.rgb = lerp(color.rgb, 1 - color.rgb, factor);
|
||||
#endif
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
|
||||
//################################
|
||||
// Color effect
|
||||
//################################
|
||||
// Apply color effect.
|
||||
half4 ApplyColorEffect(half4 color, half4 factor)
|
||||
{
|
||||
#ifdef UI_COLOR_SET // Set
|
||||
#ifdef FILL
|
||||
color.rgb = lerp(color.rgb, factor.rgb, factor.a);
|
||||
|
||||
#elif UI_COLOR_ADD // Add
|
||||
#elif ADD
|
||||
color.rgb += factor.rgb * factor.a;
|
||||
|
||||
#elif UI_COLOR_SUB // Sub
|
||||
#elif SUBTRACT
|
||||
color.rgb -= factor.rgb * factor.a;
|
||||
|
||||
#else
|
||||
color.rgb = lerp(color.rgb, color.rgb * factor.rgb, factor.a);
|
||||
#endif
|
||||
|
||||
#if UI_TONE_CUTOFF
|
||||
#if CUTOFF
|
||||
color.a = factor.a;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -50,13 +50,17 @@ Shader "UI/Hidden/UI-Effect"
|
||||
CGPROGRAM
|
||||
#pragma vertex vert
|
||||
#pragma fragment frag
|
||||
#if !defined(SHADER_API_D3D11_9X) && !defined(SHADER_API_D3D9)
|
||||
#pragma target 2.0
|
||||
#else
|
||||
#pragma target 3.0
|
||||
#endif
|
||||
|
||||
#pragma multi_compile __ UNITY_UI_ALPHACLIP
|
||||
|
||||
#pragma shader_feature __ UI_TONE_GRAYSCALE UI_TONE_SEPIA UI_TONE_NEGA UI_TONE_PIXEL UI_TONE_MONO UI_TONE_CUTOFF UI_TONE_HUE
|
||||
#pragma shader_feature __ UI_COLOR_ADD UI_COLOR_SUB UI_COLOR_SET
|
||||
#pragma shader_feature __ UI_BLUR_FAST UI_BLUR_MEDIUM UI_BLUR_DETAIL
|
||||
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL MONO CUTOFF HUE
|
||||
#pragma shader_feature __ ADD SUBTRACT FILL
|
||||
#pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR
|
||||
|
||||
#include "UnityCG.cginc"
|
||||
#include "UnityUI.cginc"
|
||||
@@ -87,8 +91,8 @@ Shader "UI/Hidden/UI-Effect"
|
||||
#if defined (UI_TONE) || defined (UI_BLUR)
|
||||
half4 effectFactor : TEXCOORD2;
|
||||
#endif
|
||||
#if UI_TONE_HUE || UI_TONE_PIXEL
|
||||
half4 extraFactor : TEXCOORD3;
|
||||
#if HUE || PIXEL
|
||||
half2 extraFactor : TEXCOORD3;
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -114,10 +118,10 @@ Shader "UI/Hidden/UI-Effect"
|
||||
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
|
||||
#endif
|
||||
|
||||
#if UI_TONE_HUE
|
||||
#if HUE
|
||||
OUT.extraFactor.x = cos(OUT.effectFactor.x*3.14159265359 * 2);
|
||||
OUT.extraFactor.y = sin(OUT.effectFactor.x*3.14159265359 * 2);
|
||||
#elif UI_TONE_PIXEL
|
||||
#elif PIXEL
|
||||
OUT.extraFactor.xy = max(2, (1-OUT.effectFactor.x*0.98) * _MainTex_TexelSize.zw);
|
||||
#endif
|
||||
|
||||
@@ -131,7 +135,7 @@ Shader "UI/Hidden/UI-Effect"
|
||||
|
||||
fixed4 frag(v2f IN) : SV_Target
|
||||
{
|
||||
#if UI_TONE_PIXEL
|
||||
#if PIXEL
|
||||
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
|
||||
#endif
|
||||
|
||||
@@ -142,18 +146,18 @@ Shader "UI/Hidden/UI-Effect"
|
||||
#endif
|
||||
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
|
||||
|
||||
#ifdef UI_TONE_CUTOFF
|
||||
#ifdef CUTOFF
|
||||
clip (color.a - 1 + IN.effectFactor.x * 1.001);
|
||||
#elif UNITY_UI_ALPHACLIP
|
||||
clip (color.a - 0.001);
|
||||
#endif
|
||||
|
||||
#if UI_TONE_MONO
|
||||
#if MONO
|
||||
color.rgb = IN.color.rgb;
|
||||
color.a = color.a * tex2D(_MainTex, IN.texcoord).a + IN.effectFactor.x * 2 - 1;
|
||||
#elif UI_TONE_HUE
|
||||
#elif HUE
|
||||
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
|
||||
#elif defined (UI_TONE) & !UI_TONE_CUTOFF
|
||||
#elif defined (UI_TONE) & !CUTOFF
|
||||
color = ApplyToneEffect(color, IN.effectFactor.x);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -19,11 +19,15 @@ Shader "UI/Hidden/UI-EffectCapture"
|
||||
CGPROGRAM
|
||||
#pragma vertex vert
|
||||
#pragma fragment frag
|
||||
#if !defined(SHADER_API_D3D11_9X) && !defined(SHADER_API_D3D9)
|
||||
#pragma target 2.0
|
||||
#else
|
||||
#pragma target 3.0
|
||||
#endif
|
||||
|
||||
#pragma shader_feature __ UI_TONE_GRAYSCALE UI_TONE_SEPIA UI_TONE_NEGA UI_TONE_PIXEL UI_TONE_MONO UI_TONE_CUTOFF UI_TONE_HUE
|
||||
#pragma shader_feature __ UI_COLOR_ADD UI_COLOR_SUB UI_COLOR_SET
|
||||
#pragma shader_feature __ UI_BLUR_FAST UI_BLUR_MEDIUM UI_BLUR_DETAIL
|
||||
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL MONO CUTOFF HUE
|
||||
#pragma shader_feature __ ADD SUBTRACT FILL
|
||||
#pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR
|
||||
|
||||
#include "UnityCG.cginc"
|
||||
#include "UI-Effect.cginc"
|
||||
@@ -32,12 +36,10 @@ Shader "UI/Hidden/UI-EffectCapture"
|
||||
{
|
||||
float4 vertex : SV_POSITION;
|
||||
float2 texcoord : TEXCOORD0;
|
||||
|
||||
#if defined (UI_COLOR)
|
||||
fixed4 colorFactor : COLOR1;
|
||||
#endif
|
||||
|
||||
half4 effectFactor : TEXCOORD2;
|
||||
#if HUE || PIXEL
|
||||
half2 extraFactor : TEXCOORD1;
|
||||
#endif
|
||||
};
|
||||
|
||||
sampler2D _MainTex;
|
||||
@@ -51,47 +53,46 @@ Shader "UI/Hidden/UI-EffectCapture"
|
||||
OUT.vertex = UnityObjectToClipPos(v.vertex);
|
||||
|
||||
OUT.texcoord = v.texcoord;
|
||||
OUT.effectFactor = _EffectFactor;
|
||||
|
||||
#if UI_TONE_HUE
|
||||
OUT.effectFactor.y = sin(OUT.effectFactor.x*3.14159265359*2);
|
||||
OUT.effectFactor.x = cos(OUT.effectFactor.x*3.14159265359*2);
|
||||
#elif UI_TONE_PIXEL
|
||||
OUT.effectFactor.xy = max(2, (1-OUT.effectFactor.x) * _MainTex_TexelSize.zw);
|
||||
#endif
|
||||
|
||||
#if defined (UI_COLOR)
|
||||
OUT.colorFactor = _ColorFactor;
|
||||
#if HUE
|
||||
OUT.extraFactor.y = sin(_EffectFactor.x*3.14159265359*2);
|
||||
OUT.extraFactor.x = cos(_EffectFactor.x*3.14159265359*2);
|
||||
#elif PIXEL
|
||||
OUT.extraFactor.xy = max(2, (1-_EffectFactor.x) * _MainTex_TexelSize.zw);
|
||||
#endif
|
||||
|
||||
#if UNITY_UV_STARTS_AT_TOP
|
||||
OUT.texcoord.y = lerp(OUT.texcoord.y, 1 - OUT.texcoord.y, OUT.effectFactor.w);
|
||||
fixed flip = _EffectFactor.w;
|
||||
OUT.texcoord.y = lerp(OUT.texcoord.y, 1 - OUT.texcoord.y, flip);
|
||||
#endif
|
||||
|
||||
return OUT;
|
||||
}
|
||||
|
||||
|
||||
fixed4 frag(v2f IN) : SV_Target
|
||||
{
|
||||
#if UI_TONE_PIXEL
|
||||
IN.texcoord = round(IN.texcoord * IN.effectFactor.xy) / IN.effectFactor.xy;
|
||||
fixed effectFactor = _EffectFactor.x;
|
||||
fixed blurFactor = _EffectFactor.z;
|
||||
fixed colorFactor = _ColorFactor;
|
||||
|
||||
#if PIXEL
|
||||
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
|
||||
#endif
|
||||
|
||||
#if defined (UI_BLUR)
|
||||
half4 color = Tex2DBlurring(_MainTex, IN.texcoord, IN.effectFactor.z * _MainTex_TexelSize.xy * 2);
|
||||
half4 color = Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2);
|
||||
#else
|
||||
half4 color = tex2D(_MainTex, IN.texcoord);
|
||||
#endif
|
||||
|
||||
#if UI_TONE_HUE
|
||||
color.rgb = shift_hue(color.rgb, IN.effectFactor.x, IN.effectFactor.y);
|
||||
#if HUE
|
||||
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
|
||||
#elif defined (UI_TONE)
|
||||
color = ApplyToneEffect(color, IN.effectFactor.x);
|
||||
color = ApplyToneEffect(color, effectFactor);
|
||||
#endif
|
||||
|
||||
#if defined (UI_COLOR)
|
||||
color = ApplyColorEffect(color, IN.colorFactor);
|
||||
color = ApplyColorEffect(color, colorFactor);
|
||||
#endif
|
||||
|
||||
color.a = 1;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
@@ -6,10 +8,6 @@ using UnityEngine.UI;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
using BlurMode = UIEffect.BlurMode;
|
||||
using ColorMode = UIEffect.ColorMode;
|
||||
using ToneMode = UIEffect.ToneMode;
|
||||
|
||||
public static class MaterialBundle
|
||||
{
|
||||
[MenuItem("UIEffect/Generate Material Bundle")]
|
||||
@@ -36,6 +34,13 @@ namespace Coffee.UIExtensions
|
||||
, (BlurMode[])Enum.GetValues(typeof(BlurMode))
|
||||
);
|
||||
|
||||
GenerateMaterialVariants(
|
||||
Shader.Find(UIDissolve.shaderName)
|
||||
, new ToneMode[]{ToneMode.None}
|
||||
, (ColorMode[])Enum.GetValues(typeof(ColorMode))
|
||||
, new BlurMode[]{BlurMode.None}
|
||||
);
|
||||
|
||||
AssetDatabase.StopAssetEditing();
|
||||
AssetDatabase.SaveAssets();
|
||||
AssetDatabase.Refresh();
|
||||
@@ -51,9 +56,10 @@ namespace Coffee.UIExtensions
|
||||
for (int i = 0; i < combinations.Length; i++)
|
||||
{
|
||||
var comb = combinations[i];
|
||||
|
||||
EditorUtility.DisplayProgressBar("Genarate Effect Material Bundle", UIEffect.GetVariantName(shader, comb.tone, comb.color, comb.blur), (float)i / combinations.Length);
|
||||
UIEffect.GetOrGenerateMaterialVariant(shader, comb.tone, comb.color, comb.blur);
|
||||
var name = MaterialResolver.GetVariantName(shader, comb.tone, comb.color, comb.blur);
|
||||
EditorUtility.DisplayProgressBar("Genarate Effect Material Bundle", name, (float)i / combinations.Length);
|
||||
|
||||
MaterialResolver.GetOrGenerateMaterialVariant(shader, comb.tone, comb.color, comb.blur);
|
||||
}
|
||||
EditorUtility.ClearProgressBar();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,54 @@
|
||||
# Changelog
|
||||
|
||||
## [v2.6.2](https://github.com/mob-sakai/UIEffect/tree/v2.6.2) (2018-07-18)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.1...v2.6.2)
|
||||
|
||||
**Fixed bugs:**
|
||||
|
||||
- Shader has compile errors in D3D9 or D3D11\_9X\(WSA\) [\#99](https://github.com/mob-sakai/UIEffect/issues/99)
|
||||
|
||||
## [v2.6.1](https://github.com/mob-sakai/UIEffect/tree/v2.6.1) (2018-06-14)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.0...v2.6.1)
|
||||
|
||||
**Fixed bugs:**
|
||||
|
||||
- Errors occurred on build \(v2.6.0\) [\#90](https://github.com/mob-sakai/UIEffect/issues/90)
|
||||
|
||||
## [v2.6.0](https://github.com/mob-sakai/UIEffect/tree/v2.6.0) (2018-06-14)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.2...v2.6.0)
|
||||
|
||||
Blurring effect has been improved about 6 times faster!
|
||||

|
||||
|
||||
You can change noise texture for dissolve effect from inspector or script!
|
||||

|
||||
|
||||
|
||||
|
||||
|
||||
**Implemented enhancements:**
|
||||
|
||||
- Improve blurring performance [\#88](https://github.com/mob-sakai/UIEffect/issues/88)
|
||||
- Separate the effect with a character [\#86](https://github.com/mob-sakai/UIEffect/issues/86)
|
||||
- Change dissolve texture [\#75](https://github.com/mob-sakai/UIEffect/issues/75)
|
||||
|
||||
**Closed issues:**
|
||||
|
||||
- Change BlurMode correctly [\#84](https://github.com/mob-sakai/UIEffect/issues/84)
|
||||
- Refactoring to prepare v3.0.0 [\#83](https://github.com/mob-sakai/UIEffect/issues/83)
|
||||
- Change ColorMode correctly [\#51](https://github.com/mob-sakai/UIEffect/issues/51)
|
||||
|
||||
## [v2.5.2](https://github.com/mob-sakai/UIEffect/tree/v2.5.2) (2018-06-07)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.1...v2.5.2)
|
||||
|
||||
**Fixed bugs:**
|
||||
|
||||
- When `UIEFFECT\_SEPARATE` symbol is defined, UIDissolve does not work well [\#85](https://github.com/mob-sakai/UIEffect/issues/85)
|
||||
|
||||
## [v2.5.1](https://github.com/mob-sakai/UIEffect/tree/v2.5.1) (2018-05-31)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.0...v2.5.1)
|
||||
|
||||
@@ -12,7 +12,7 @@ UIEffect contains visual effect components for uGUI element in Unity.
|
||||
|
||||
<< [Description](#Description) | [WebGL Demo](#demo) | [Download](https://github.com/mob-sakai/UIEffect/releases) | [Usage](#usage) | [Development Note](#development-note) >>
|
||||
|
||||
### [RELEASE NOTE ](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md)
|
||||
### What's new? Please see [RELEASE NOTE ](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md)
|
||||
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ Let's decorate your UI with effects!
|
||||
You can control parameters as you like from the script as well as inspector.
|
||||
AnimationClip is supported as a matter of course!
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
<br><br>
|
||||
@@ -34,8 +34,8 @@ AnimationClip is supported as a matter of course!
|
||||
|-|-|-|
|
||||
|**UIEffect**|Combine some visual effects.<br>See also [Development note](#why-is-uieffect-lightweight).<br><br>**ToneMode:** Grayscale, Sepia, Nega, Pixelation, Hue shift, Cutoff (alpha-based), Mono (alpha-based)<br>**ColorMode:** Overwrite, Additive, Subtract<br>**BlurMode:** Fast, Medium, Detail<br><br>*NOTE: ToneMode, ColorMode and BlurMode are changeable only in editor.*<br>*NOTE: Custom Effect feature will be obsolete. Please use `UICustomEffect` component instead.*<br>*NOTE: Shadow feature will be obsolete. Please use `UIShadow` component instead.*|<img src="https://user-images.githubusercontent.com/12690315/40757428-68277f0c-64c3-11e8-89e5-4a19616a85c1.png" width="1000px">|
|
||||
|**UICaptured EffectImage**|Capture a screenshot of a specific frame with effect, and display it.<br>See also [Development note](#how-does-uieffectcapturedimage-work).<br><br>**ToneMode:** Grayscale, Sepia, Nega, Pixelation, Hue shift<br>**ColorMode:** Overwrite, Additive, Subtract<br>**BlurMode:** Fast, Medium, Detail|<img src="https://user-images.githubusercontent.com/12690315/34619468-97e3c134-f285-11e7-90b2-3a75bde13911.gif" width="1000px">|
|
||||
|**UIShiny**|Apply shinning effect to a graphic.<br><br>**Options:** Location, Width, Rotation, Softness, Brightness, Highlight|<img src="https://user-images.githubusercontent.com/12690315/40716998-cd42e954-6445-11e8-899b-f8ba8f1fea83.gif" width="1000px">|
|
||||
|**UIDissolve**|Apply dissolve effect to a graphic.<br><br>**ColorMode:** Overwrite, Additive, Subtract<br>**Options:** Location, Width, Rotation, Softness, Color|<img src="https://user-images.githubusercontent.com/12690315/40717609-f0c3ca40-6447-11e8-97aa-7c4242d12106.gif" width="1000px">|
|
||||
|**UIShiny**|Apply shinning effect to a graphic.<br>The effect does not require Mask component or normal map.<br><br>**Options:** Location, Width, Rotation, Softness, Brightness, Highlight|<img src="https://user-images.githubusercontent.com/12690315/41398144-5c2ca126-6ff1-11e8-954b-394b611e2316.gif" width="1000px">|
|
||||
|**UIDissolve**|Apply dissolve effect to a graphic.<br><br>**ColorMode:** Overwrite, Additive, Subtract<br>**Options:** Location, Width, Rotation, Softness, Color|<img src="https://user-images.githubusercontent.com/12690315/41397973-d1038f7e-6ff0-11e8-919f-affb427393ee.gif" width="1000px">|
|
||||
|
||||
<br><br>
|
||||
##### The following effects can be used with the above components.
|
||||
@@ -67,6 +67,7 @@ AnimationClip is supported as a matter of course!
|
||||
|
||||
1. Download UIEffect.unitypackage from [Releases](https://github.com/mob-sakai/UIEffect/releases).
|
||||
1. Import the package into your Unity project. Select `Import Package > Custom Package` from the `Assets` menu.
|
||||
1. In Unity5.6+, enable `TexCoord1` channel of canvas. See also [Development Note](##note-unity-56).
|
||||
1. Add any effect component to UI element (Image, RawImage, Text, etc...) from `Add Component` in inspector.
|
||||
1. Enjoy!
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "UIEffect",
|
||||
"version": "2.5.1",
|
||||
"version": "2.6.2",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/mob-sakai/UIEffect.git"
|
||||
|
||||
+1
-74
@@ -2,77 +2,4 @@
|
||||
|
||||
# NOTE: Set an environment variable `CHANGELOG_GITHUB_TOKEN` by running the following command at the prompt, or by adding it to your shell profile (e.g., ~/.bash_profile or ~/.zshrc):
|
||||
# export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"
|
||||
|
||||
# Release the project with the following steps:
|
||||
# 1. Update the release version in package.json.
|
||||
# 2. Open unity project to check compile error.
|
||||
# 3. Update "CHANGELOG.md" using "github_changelog_generator-1.15.0.pre.rc".
|
||||
# 4. Check changelog and continue proccess.
|
||||
# 5. Export unitypackage.
|
||||
# 6. Commit package.json and CHANGELOG.md.
|
||||
# 7. Merge into master branch.
|
||||
# 8. Release using "gh-release-3.2.0". (with upload unitypackage)
|
||||
|
||||
|
||||
# input release version
|
||||
echo -e ">> Start Github Release:"
|
||||
PACKAGE_NAME=`node -pe 'require("./package.json").name'`
|
||||
echo -e ">> Package name: ${PACKAGE_NAME}"
|
||||
CURRENT_VERSION=`grep -o -e "\"version\".*$" package.json | sed -e "s/\"version\": \"\(.*\)\".*$/\1/"`
|
||||
read -p "[? release version (for current: ${CURRENT_VERSION}): " RELEASE_VERSION
|
||||
[ -z "${RELEASE_VERSION}" ] && exit
|
||||
|
||||
|
||||
# update version in package.json
|
||||
echo -e "\n>> Update version... package.json"
|
||||
git checkout -B release develop
|
||||
sed -i -e "s/\"version\": \(.*\)/\"version\": \"${RELEASE_VERSION}\",/g" package.json
|
||||
|
||||
|
||||
# check unity editor
|
||||
UNITY_VER=`sed -e "s/m_EditorVersion: \(.*\)/\1/g" ProjectSettings/ProjectVersion.txt`
|
||||
UNITY_EDITOR="/Applications/Unity/Hub/Editor/${UNITY_VER}/Unity.app/Contents/MacOS/Unity"
|
||||
echo -e "\n>> Check unity editor... ${UNITY_VER} (${UNITY_EDITOR})"
|
||||
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`"
|
||||
echo -e ">> OK"
|
||||
|
||||
# generate change log
|
||||
CHANGELOG_GENERATOR_ARG=`grep -o -e ".*git\"$" package.json | sed -e "s/^.*\/\([^\/]*\)\/\([^\/]*\).git.*$/--user \1 --project \2/"`
|
||||
CHANGELOG_GENERATOR_ARG="--future-release v${RELEASE_VERSION} ${CHANGELOG_GENERATOR_ARG}"
|
||||
echo -e "\n>> Generate change log... ${CHANGELOG_GENERATOR_ARG}"
|
||||
github_changelog_generator ${CHANGELOG_GENERATOR_ARG}
|
||||
|
||||
git diff -- CHANGELOG.md
|
||||
read -p "[? is the change log correct? (y/N):" yn
|
||||
case "$yn" in [yY]*) ;; *) exit ;; esac
|
||||
|
||||
|
||||
# export unitypackage
|
||||
PACKAGE_SRC=`node -pe 'require("./package.json").src'`
|
||||
echo -e "\n>> Export unitypackage... ${PACKAGE_SRC}"
|
||||
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`" -exportpackage "$PACKAGE_SRC" "$PACKAGE_NAME.unitypackage"
|
||||
echo -e ">> OK"
|
||||
|
||||
# commit release files
|
||||
echo -e "\n>> Commit release files..."
|
||||
git add CHANGELOG.md -f
|
||||
git add package.json -f
|
||||
git commit -m "update change log"
|
||||
|
||||
|
||||
# merge and push
|
||||
echo -e "\n>> Merge and push..."
|
||||
git checkout master
|
||||
git merge --no-ff release -m "release $TAG"
|
||||
git branch -D release
|
||||
git push origin master
|
||||
git checkout develop
|
||||
git merge --ff master
|
||||
git push origin develop
|
||||
|
||||
|
||||
# upload unitypackage and release on Github
|
||||
gh-release --assets "$PACKAGE_NAME.unitypackage"
|
||||
|
||||
|
||||
echo -e "\n\n>> $PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"
|
||||
bash <(curl -sL 'https://gist.github.com/mob-sakai/a883999a32dd8b1927639e46b3cd6801/raw/unity_release.sh')
|
||||
Reference in New Issue
Block a user