Compare commits

..

22 Commits

Author SHA1 Message Date
mob-sakai ef89675c6b release 2018-05-29 18:32:32 +09:00
mob-sakai ee7c799ea6 update change log 2018-05-29 18:32:32 +09:00
mob-sakai 0570c22385 update release script 2018-05-29 18:31:12 +09:00
mob-sakai 7112636409 fix #69 : UIEffectCapturedImage: The result image is flipped vertically 2018-05-29 18:31:12 +09:00
Takashi Sakai db8839f3e0 release v2.4.0 2018-05-21 16:45:32 +09:00
Takashi Sakai 3aa186aeaf update change log 2018-05-21 16:45:32 +09:00
Takashi Sakai 237dab7639 Update readme 2018-05-21 16:02:21 +09:00
Takashi Sakai 45520d98c5 Update demo for v.2.4.0 2018-05-21 16:02:21 +09:00
Takashi Sakai 9e830f61f0 Remove shader keyword in material 2018-05-21 16:02:21 +09:00
Takashi Sakai ed9a68c1fa Resolved #64 : UIDissolve: Add color mode option. 2018-05-21 15:23:05 +09:00
Takashi Sakai 772297abd0 release v2.3.2 2018-05-21 15:13:20 +09:00
Takashi Sakai b4cb57e097 update change log 2018-05-21 15:13:19 +09:00
Takashi Sakai 923f74d047 Update release script (use 5.5.0p4 to export package) 2018-05-21 15:09:56 +09:00
Takashi Sakai be90296be7 Add UNITY_STANDALONE_WIN symbol 2018-05-19 13:48:31 +09:00
Takashi Sakai e6027fbec2 Fixed #65 : UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically (other method) 2018-05-19 13:23:29 +09:00
Takashi Sakai 72e2149f70 Revert "Fixed: UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically (on Windows) #62"
This reverts commit 9d911eb581.
2018-05-19 12:12:43 +09:00
Takashi Sakai 8490d11762 Update README.md 2018-05-11 20:39:13 +09:00
Takashi Sakai ed3fce5fa5 release v2.3.1 2018-05-10 12:44:18 +09:00
Takashi Sakai 4bbe569248 update change log 2018-05-10 12:44:18 +09:00
Takashi Sakai 9d911eb581 Fixed: UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically (on Windows) #62 2018-05-10 12:34:39 +09:00
Takashi Sakai bc87c42cdd Remove docs dir 2018-05-08 21:19:12 +09:00
Takashi Sakai 972235ec44 Update readme 2018-05-08 21:10:44 +09:00
33 changed files with 2397 additions and 1582 deletions
+1 -4
View File
@@ -1,6 +1,3 @@
user=mob-sakai
project=UIEffect
issues-wo-labels=false
pr-wo-labels=false
exclude_labels=duplicate,question,invalid,wontfix,Duplicate,Question,Invalid,Wontfix,Meta: Exclude From Changelog,unreleased
unreleased=false
exclude_labels=duplicate,question,invalid,wontfix,Duplicate,Question,Invalid,Wontfix,Meta: Exclude From Changelog
File diff suppressed because it is too large Load Diff
+5
View File
@@ -17,5 +17,10 @@ namespace Coffee.UIExtensions
mask.enabled = true;
}
}
public void SetTimeScale(float scale)
{
Time.timeScale = scale;
}
}
}
@@ -0,0 +1,214 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 8
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21162286589123374
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve-Set
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: UI_COLOR_SET
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21841578701121694
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve-Sub
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: UI_COLOR_SUB
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21939717441729078
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve-Add
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: UI_COLOR_ADD
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 17b17d6effbe14075a3bbdf1fda1f6e1
timeCreated: 1524469054
licenseType: Pro
timeCreated: 1526828325
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
@@ -8,7 +8,7 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Shiny
m_Shader: {fileID: 4800000, guid: 20ffe76c2439c403aabdd25bd94bf011, type: 3}
m_ShaderKeywords: _EMISSION
m_ShaderKeywords:
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
-82
View File
@@ -1,82 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _EdgeWidth
second: 0.1
- first:
name: _InnerSoftClip
second: 0.468
- first:
name: _InnerSoftness
second: 0.5
- first:
name: _OuterSoftClip
second: 0.776
- first:
name: _OuterSoftness
second: 0.5
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EdgeInnerColor
second: {r: 1, g: 0, b: 0, a: 1}
- first:
name: _EdgeOuterColor
second: {r: 1, g: 0.7529412, b: 0, a: 1}
- first:
name: _InnerEdgeColor
second: {r: 1, g: 0, b: 0, a: 1}
- first:
name: _OuterEdgeColor
second: {r: 1, g: 0.75, b: 0, a: 1}
+13 -37
View File
@@ -16,12 +16,7 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
[Header(Dissolve)]
_NoiseTex ("Noise Texture (A)", 2D) = "white" {}
_EdgeWidth ("Edge width", Range (0.0001, 1)) = 0.05
_OuterEdgeColor ("Outer edge color", Color) = (1.0, 0.75, 0.0, 1.0)
_OuterSoftness ("Outer softness", Range (0.0001, 1)) = 0.5
_InnerEdgeColor ("Inner edge color", Color) = (1.0, 0.0, 0.0, 1.0)
_InnerSoftness ("Inner softness", Range (0.0001, 1)) = 0.5
_NoiseTex("Noise Texture (A)", 2D) = "white" {}
}
SubShader
@@ -61,9 +56,11 @@ 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
#include "UnityCG.cginc"
#include "UnityUI.cginc"
#include "UI-Effect.cginc"
struct appdata_t
{
@@ -83,36 +80,15 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
half3 effectFactor : TEXCOORD2;
fixed4 effectFactor : TEXCOORD2;
fixed4 effectFactor2 : TEXCOORD3;
};
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
sampler2D _MainTex;
sampler2D _NoiseTex;
float _EdgeWidth;
float3 _OuterEdgeColor;
float _OuterSoftness;
float3 _InnerEdgeColor;
float _InnerSoftness;
fixed3 UnpackToVec3(float value)
{
const int PACKER_STEP = 256;
const int PRECISION = PACKER_STEP - 1;
fixed3 vec;
vec.x = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
vec.y = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
vec.z = (value % PACKER_STEP) / PRECISION;
return vec;
}
v2f vert(appdata_t IN)
{
@@ -127,9 +103,11 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
OUT.color = IN.color * _Color;
//xy: Noize uv
//z: Dissolve factor
OUT.effectFactor = UnpackToVec3(IN.uv1.x);
//xy: Noize uv, z: Dissolve factor, w: width
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
//xyz: color, w: softness
OUT.effectFactor2 = UnpackToVec4(IN.uv1.y);
return OUT;
}
@@ -146,11 +124,9 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
clip (min(color.a - 0.01, factor));
#endif
fixed edgeLerp = step(cutout, color.a) * saturate((_EdgeWidth - factor)*16/_InnerSoftness);
fixed3 edgeColor = lerp(_OuterEdgeColor, _InnerEdgeColor, (factor)/_EdgeWidth);
color.rgb =lerp(color.rgb, edgeColor, edgeLerp);
color.a *= saturate((factor)*32/_OuterSoftness);
fixed edgeLerp = step(cutout, color.a) * saturate((IN.effectFactor.w/4 - factor)*16/ IN.effectFactor2.w);
color = ApplyColorEffect(color, fixed4(IN.effectFactor2.rgb, edgeLerp));
color.a *= saturate((factor)*32/ IN.effectFactor2.w);
return color;
}
+3
View File
@@ -145,6 +145,9 @@ fixed4 ApplyColorEffect(fixed4 color, fixed4 factor)
#elif UI_COLOR_SUB // Sub
color.rgb -= factor.rgb * factor.a;
#else
color.rgb = lerp(color.rgb, color.rgb * factor.rgb, factor.a);
#endif
#if UI_TONE_CUTOFF
+5 -10
View File
@@ -37,9 +37,7 @@ Shader "UI/Hidden/UI-EffectCapture"
fixed4 colorFactor : COLOR1;
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
half4 effectFactor : TEXCOORD2;
#endif
};
sampler2D _MainTex;
@@ -51,16 +49,9 @@ Shader "UI/Hidden/UI-EffectCapture"
{
v2f OUT;
OUT.vertex = UnityObjectToClipPos(v.vertex);
#if UNITY_UV_STARTS_AT_TOP
OUT.texcoord = half2(v.texcoord.x, 1 - v.texcoord.y);
#else
OUT.texcoord = v.texcoord;
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
OUT.texcoord = v.texcoord;
OUT.effectFactor = _EffectFactor;
#endif
#if UI_TONE_HUE
OUT.effectFactor.y = sin(OUT.effectFactor.x*3.14159265359*2);
@@ -73,6 +64,10 @@ Shader "UI/Hidden/UI-EffectCapture"
OUT.colorFactor = _ColorFactor;
#endif
#if UNITY_UV_STARTS_AT_TOP
OUT.texcoord.y = lerp(OUT.texcoord.y, 1 - OUT.texcoord.y, OUT.effectFactor.w);
#endif
return OUT;
}
+48 -24
View File
@@ -30,7 +30,11 @@ namespace Coffee.UIExtensions
//################################
// Serialize Members.
//################################
[SerializeField] [Range(0, 1)] float m_Location = 0;
[SerializeField] [Range(0, 1)] float m_Location = 0.5f;
[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;
@@ -47,6 +51,26 @@ namespace Coffee.UIExtensions
/// </summary>
public float location { get { return m_Location; } set { m_Location = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Edge width.
/// </summary>
public float width { get { return m_Width; } set { m_Width = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Edge softness.
/// </summary>
public float softness { get { return m_Softness; } set { m_Softness = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Edge color.
/// </summary>
public Color color { get { return m_Color; } set { m_Color = value; _SetDirty(); } }
/// <summary>
/// Color effect mode.
/// </summary>
public UIEffect.ColorMode colorMode { get { return m_ColorMode; } }
/// <summary>
/// Effect material.
/// </summary>
@@ -82,31 +106,18 @@ namespace Coffee.UIExtensions
{
if (Application.isPlaying || !obj || !obj.graphic)
return;
var mat = UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName), UIEffect.ToneMode.None, m_ColorMode, UIEffect.BlurMode.None);
if(!m_EffectMaterial)
{
m_EffectMaterial = GetMaterial(shaderName);
EditorUtility.SetDirty(this);
EditorApplication.delayCall +=AssetDatabase.SaveAssets;
}
if(obj.isActiveAndEnabled && graphic.material != m_EffectMaterial)
{
graphic.material = m_EffectMaterial;
EditorUtility.SetDirty(graphic);
EditorApplication.delayCall +=AssetDatabase.SaveAssets;
}
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>
@@ -129,7 +140,7 @@ namespace Coffee.UIExtensions
var x = Mathf.Clamp01 (vertex.position.x / rect.width + 0.5f);
var y = Mathf.Clamp01 (vertex.position.y / rect.height + 0.5f);
vertex.uv1 = new Vector2 (_PackToFloat (x, y, location), 0);
vertex.uv1 = new Vector2 (_PackToFloat (x, y, location, m_Width), _PackToFloat(m_Color.r, m_Color.g, m_Color.b, m_Softness));
vh.SetUIVertex(vertex, i);
}
@@ -158,5 +169,18 @@ namespace Coffee.UIExtensions
+ (Mathf.FloorToInt(y * PRECISION) << 8)
+ Mathf.FloorToInt(x * PRECISION);
}
/// <summary>
/// Pack 4 low-precision [0-1] floats values to a float.
/// Each value [0-1] has 64 steps(6 bits).
/// </summary>
static float _PackToFloat(float x, float y, float z, float w)
{
const int PRECISION = (1 << 6) - 1;
return (Mathf.FloorToInt(w * PRECISION) << 18)
+ (Mathf.FloorToInt(z * PRECISION) << 12)
+ (Mathf.FloorToInt(y * PRECISION) << 6)
+ Mathf.FloorToInt(x * PRECISION);
}
}
}
+2 -1
View File
@@ -241,7 +241,7 @@ namespace Coffee.UIExtensions
_buffer.Blit(BuiltinRenderTextureType.CurrentActive, s_CopyId);
// Set properties.
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 0));
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 1));
_buffer.SetGlobalVector("_ColorFactor", new Vector4(effectColor.r, effectColor.g, effectColor.b, effectColor.a));
// Blit without effect.
@@ -261,6 +261,7 @@ namespace Coffee.UIExtensions
// Iterate the operation.
if(1 < m_Iterations)
{
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 0));
_buffer.GetTemporaryRT(s_EffectId2, w, h, 0, m_FilterMode);
for (int i = 1; i < m_Iterations; i++)
{
+32
View File
@@ -1,5 +1,37 @@
# Changelog
## [v2.4.1](https://github.com/mob-sakai/UIEffect/tree/v2.4.1) (2018-05-29)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.4.0...v2.4.1)
**Fixed bugs:**
- UIEffectCapturedImage: The result image is flipped vertically [\#69](https://github.com/mob-sakai/UIEffect/issues/69)
## [v2.4.0](https://github.com/mob-sakai/UIEffect/tree/v2.4.0) (2018-05-21)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.2...v2.4.0)
**Implemented enhancements:**
- UIDissolve: Add color mode option. [\#64](https://github.com/mob-sakai/UIEffect/issues/64)
## [v2.3.2](https://github.com/mob-sakai/UIEffect/tree/v2.3.2) (2018-05-21)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.1...v2.3.2)
**Closed issues:**
- Fixed: UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically \(other method\) [\#65](https://github.com/mob-sakai/UIEffect/issues/65)
## [v2.3.1](https://github.com/mob-sakai/UIEffect/tree/v2.3.1) (2018-05-10)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.0...v2.3.1)
**Fixed bugs:**
- UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically \(on Windows\) [\#62](https://github.com/mob-sakai/UIEffect/issues/62)
## [v2.3.0](https://github.com/mob-sakai/UIEffect/tree/v2.3.0) (2018-05-08)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.2.0...v2.3.0)
+18 -7
View File
@@ -4,7 +4,7 @@ UIEffect
UIEffect is an effect component for uGUI in Unity.
Let's decorate your UI with effects!
[![](https://img.shields.io/github/release/mob-sakai/UIEffect.svg?label=latest%20version)](https://github.com/mob-sakai/UIEffect/release)
[![](https://img.shields.io/github/release/mob-sakai/UIEffect.svg?label=latest%20version)](https://github.com/mob-sakai/UIEffect/releases)
[![](https://img.shields.io/github/release-date/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/releases)
![](https://img.shields.io/badge/requirement-Unity%205.5%2B-green.svg)
[![](https://img.shields.io/github/license/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/blob/master/LICENSE.txt)
@@ -17,6 +17,7 @@ Let's decorate your UI with effects!
<br><br><br><br>
## Description
@@ -48,6 +49,7 @@ Let's decorate your UI with effects!
* Diagonal
* Shiny
* Dissolve
* Flip horizontal/vertical
### Easy to control effect parameters!
@@ -70,12 +72,21 @@ Let's decorate your UI with effects!
![image](https://user-images.githubusercontent.com/12690315/34619468-97e3c134-f285-11e7-90b2-3a75bde13911.gif)
* UIGradient: Change vertex color as gradient, with rotation, offset, color correction
![image](https://user-images.githubusercontent.com/12690315/38594997-2a39f03c-3d84-11e8-865d-9ce12a8bb3db.gif)
* UIShiny: Shiny effect WITHOUT Mask component. This will suppress extra draw calls and improve performance.
Merged from [ShinyEffectForUGUI](https://github.com/mob-sakai/ShinyEffectForUGUI).
![image](https://user-images.githubusercontent.com/12690315/38501362-c56e3768-3c47-11e8-9ec1-50343d8b83ad.gif)
* UIDissolve: Dissolve effect WITHOUT material instancing. This will suppress extra draw calls and improve performance.
Merged from [DissolveEffectForUGUI](https://github.com/mob-sakai/DissolveEffectForUGUI).
![demo](https://user-images.githubusercontent.com/12690315/39131616-dcf7ea60-474a-11e8-8e20-f9e5bd8b3f5c.gif)
### New feature in v2.3.0
![v2.3.0](https://user-images.githubusercontent.com/12690315/39756239-bf546ae6-5303-11e8-964a-38aed7ea6096.gif)
* UIShiny: Shiny effect WITHOUT Mask component. This will suppress extra draw calls and improve performance.
* UIDissolve: Dissolve effect WITHOUT material instancing. This will suppress extra draw calls and improve performance.
* UIFlip: Flip graphic horizontal/vertical.
### New feature in v2.4.0
![v2.4.0](https://user-images.githubusercontent.com/12690315/40294019-a0bfb8aa-5d0e-11e8-8451-873502db6a99.gif)
![editor](https://user-images.githubusercontent.com/12690315/40294212-9e1b1ce2-5d0f-11e8-88ce-78a8c0523dc2.png)
* UIDissolve: Add color mode option.
* UIDissolve: You can change the edge color, width, softness, color mode in inspector.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

-122
View File
@@ -1,122 +0,0 @@
function UnityProgress (dom) {
this.progress = 0.0;
this.message = "";
this.dom = dom;
var parent = dom.parentNode;
var background = document.createElement("div");
background.style.background = Module["backgroundColor"] ? Module["backgroundColor"] : "#4D4D4D";
background.style.position = "absolute";
background.style.overflow = "hidden";
parent.appendChild(background);
this.background = background;
if (Module["backgroundImage"])
{
var backgroundImg = document.createElement("img");
backgroundImg.src = Module["backgroundImage"];
backgroundImg.style.position = "absolute";
backgroundImg.style.width = "100%";
backgroundImg.style.height = "auto";
backgroundImg.style.top = "50%";
backgroundImg.style.transform = "translate(0, -50%)";
background.appendChild(backgroundImg);
}
var logoImage = document.createElement("img");
var splashStyle = Module["splashStyle"] ? Module["splashStyle"] : "Light";
logoImage.src = "TemplateData/Logo." + splashStyle + ".png";
logoImage.style.position = "absolute";
parent.appendChild(logoImage);
this.logoImage = logoImage;
var progressFrame = document.createElement("img");
progressFrame.src = "TemplateData/ProgressFrame." + splashStyle + ".png";
progressFrame.style.position = "absolute";
parent.appendChild(progressFrame);
this.progressFrame = progressFrame;
var progressBar = document.createElement("div");
progressBar.style.position = "absolute";
progressBar.style.overflow = "hidden";
parent.appendChild(progressBar);
this.progressBar = progressBar;
var progressBarImg = document.createElement("img");
progressBarImg.src = "TemplateData/ProgressBar." + splashStyle + ".png";
progressBarImg.style.position = "absolute";
progressBar.appendChild(progressBarImg);
this.progressBarImg = progressBarImg;
var messageArea = document.createElement("p");
messageArea.style.position = "absolute";
parent.appendChild(messageArea);
this.messageArea = messageArea;
this.SetProgress = function (progress) {
if (this.progress < progress)
this.progress = progress;
this.messageArea.style.display = "none";
this.progressFrame.style.display = "inline";
this.progressBar.style.display = "inline";
this.Update();
}
this.SetMessage = function (message) {
this.message = message;
this.background.style.display = "inline";
this.logoImage.style.display = "inline";
this.progressFrame.style.display = "none";
this.progressBar.style.display = "none";
this.Update();
}
this.Clear = function() {
this.background.style.display = "none";
this.logoImage.style.display = "none";
this.progressFrame.style.display = "none";
this.progressBar.style.display = "none";
}
this.Update = function() {
this.background.style.top = this.dom.offsetTop + 'px';
this.background.style.left = this.dom.offsetLeft + 'px';
this.background.style.width = this.dom.offsetWidth + 'px';
this.background.style.height = this.dom.offsetHeight + 'px';
var logoImg = new Image();
logoImg.src = this.logoImage.src;
var progressFrameImg = new Image();
progressFrameImg.src = this.progressFrame.src;
this.logoImage.style.top = this.dom.offsetTop + (this.dom.offsetHeight * 0.5 - logoImg.height * 0.5) + 'px';
this.logoImage.style.left = this.dom.offsetLeft + (this.dom.offsetWidth * 0.5 - logoImg.width * 0.5) + 'px';
this.logoImage.style.width = logoImg.width+'px';
this.logoImage.style.height = logoImg.height+'px';
this.progressFrame.style.top = this.dom.offsetTop + (this.dom.offsetHeight * 0.5 + logoImg.height * 0.5 + 10) + 'px';
this.progressFrame.style.left = this.dom.offsetLeft + (this.dom.offsetWidth * 0.5 - progressFrameImg.width * 0.5) + 'px';
this.progressFrame.width = progressFrameImg.width;
this.progressFrame.height = progressFrameImg.height;
this.progressBarImg.style.top = '0px';
this.progressBarImg.style.left = '0px';
this.progressBarImg.width = progressFrameImg.width;
this.progressBarImg.height = progressFrameImg.height;
this.progressBar.style.top = this.progressFrame.style.top;
this.progressBar.style.left = this.progressFrame.style.left;
this.progressBar.style.width = (progressFrameImg.width * this.progress) + 'px';
this.progressBar.style.height = progressFrameImg.height + 'px';
this.messageArea.style.top = this.progressFrame.style.top;
this.messageArea.style.left = 0;
this.messageArea.style.width = '100%';
this.messageArea.style.textAlign = 'center';
this.messageArea.innerHTML = this.message;
}
this.Update ();
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

-22
View File
@@ -1,22 +0,0 @@
/****************************************
==== RESETS
****************************************/
html,body,div,canvas { margin: 0; padding: 0; }
::-moz-selection { color: #333; text-shadow: none; }
::selection { color: #333; text-shadow: none; }
.clear:after { visibility: hidden; display: block; font-size: 0; content: " "; clear: both; height: 0; }
.clear { display: inline-table; clear: both; }
/* Hides from IE-mac \*/ * html .clear { height: 1%; } .clear { display: block; } /* End hide from IE-mac */
/****************************************
==== LAYOUT
****************************************/
html, body { width: 100%; height: 100%; font-family: Helvetica, Verdana, Arial, sans-serif; }
div.logo { width: 204px; height: 38px; float: left; background: url(logo.png) 0 0 no-repeat; position: relative; z-index: 10; }
div.title { height: 38px; line-height: 38px; padding: 0 10px; margin: 0 1px 0 0; float: right; color: #333; text-align: right; font-size: 18px; position: relative; z-index: 10; }
.template-wrap { position: absolute; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); }
.template-wrap canvas { margin: 0 0 10px 0; position: relative; z-index: 9; box-shadow: 0 10px 30px rgba(0,0,0,0.2); -moz-box-shadow: 0 10px 30px rgba(0,0,0,0.2); }
.fullscreen { float: right; position: relative; z-index: 10; }
-35
View File
@@ -1,35 +0,0 @@
<!doctype html>
<html lang="en-us">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity WebGL Player | UIEffect</title>
<link rel="stylesheet" href="TemplateData/style.css">
<link rel="shortcut icon" href="TemplateData/favicon.ico" />
<script src="TemplateData/UnityProgress.js"></script>
</head>
<body class="template">
<div class="template-wrap clear">
<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" height="600px" width="960px"></canvas>
<br>
<div class="logo"></div>
<div class="fullscreen"><img src="TemplateData/fullscreen.png" width="38" height="38" alt="Fullscreen" title="Fullscreen" onclick="SetFullscreen(1);" /></div>
<div class="title">UIEffect</div>
</div>
<script type='text/javascript'>
var Module = {
TOTAL_MEMORY: 268435456,
errorhandler: null, // arguments: err, url, line. This function must return 'true' if the error is handled, otherwise 'false'
compatibilitycheck: null,
backgroundColor: "#222C36",
splashStyle: "Light",
dataUrl: "Release/build.data",
codeUrl: "Release/build.js",
asmUrl: "Release/build.asm.js",
memUrl: "Release/build.mem",
};
</script>
<script src="Release/UnityLoader.js"></script>
</body>
</html>
+2 -2
View File
@@ -1,11 +1,11 @@
{
"name": "UIEffect",
"version": "2.3.0",
"version": "2.4.1",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
},
"src": "Assets/UIEffect",
"unity": "/Applications/Unity2017.1.0p5/Unity2017.1.0p5.app/Contents/MacOS/Unity",
"unity": "/Applications/Unity/Hub/Editor/5.5.0p4/Unity.app/Contents/MacOS/Unity",
"license": "MIT"
}
+35 -20
View File
@@ -13,44 +13,52 @@
# input release version
echo -e "\n>> Start Github Release:"
PACKAGE_NAME=`node -pe 'require("./package.json").name'`
echo Github Release: $PACKAGE_NAME
read -p "[? release version (for example: 1.0.0): " RELEASE_VERSION
[ -z "$RELEASE_VERSION" ] && exit
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
# generate change log
TAG=v$RELEASE_VERSION
git tag $TAG
git push --tags
github_changelog_generator
git tag -d $TAG
git push --delete origin $TAG
# 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}"
# TAG=v$RELEASE_VERSION
# git tag $TAG
# git push --tags
github_changelog_generator ${CHANGELOG_GENERATOR_ARG}
# git tag -d $TAG
# git push --delete origin $TAG
git diff -- CHANGELOG.md
read -p "[? continue? (y/N):" yn
read -p "[? is the change log correct? (y/N):" yn
case "$yn" in [yY]*) ;; *) exit ;; esac
# export unitypackage
UNITY_EDITOR=`node -pe 'require("./package.json").unity'`
PACKAGE_SRC=`node -pe 'require("./package.json").src'`
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`" -exportpackage "$PACKAGE_SRC" "$PACKAGE_NAME.unitypackage"
# commit files
# 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
@@ -60,8 +68,15 @@ git merge --ff master
git push origin develop
# 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"
# upload unitypackage and release on Github
gh-release --draft --assets "$PACKAGE_NAME.unitypackage"
gh-release --assets "$PACKAGE_NAME.unitypackage"
echo "\n\n$PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"
echo -e "\n\n>> $PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"