release v2.3.1

mob-sakai · May 10, 2018 · ed3fce5 · ed3fce5
2 parents e4fa6af + 4bbe569
commit ed3fce5
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 193 deletions.
diff --git a/Assets/UIEffect/UI-EffectCapture.shader b/Assets/UIEffect/UI-EffectCapture.shader
@@ -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;
 			}
 

diff --git a/Assets/UIEffect/UIEffectCapturedImage.cs b/Assets/UIEffect/UIEffectCapturedImage.cs
@@ -241,7 +241,7 @@ public void Capture()
 				_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 @@ public void Capture()
 					// 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++)
 						{

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [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)

diff --git a/README.md b/README.md
@@ -20,6 +20,9 @@ Let's decorate your UI with effects!
 <br><br><br><br>
 ## Description
 
+### New feature in v2.3.0!
+![v2.3.0](https://user-images.githubusercontent.com/12690315/39756239-bf546ae6-5303-11e8-964a-38aed7ea6096.gif)
+
 ### Supports following effects!
 ![image](https://user-images.githubusercontent.com/12690315/35077815-5ff8094e-fc42-11e7-92dd-99916c9f9da7.png)
 
@@ -48,6 +51,7 @@ Let's decorate your UI with effects!
     * Diagonal
 * Shiny
 * Dissolve
+* Flip horizontal/vertical
 
 
 ### Easy to control effect parameters!
@@ -76,6 +80,7 @@ Merged from [ShinyEffectForUGUI](https://github.com/mob-sakai/ShinyEffectForUGUI
 * 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)
+* UIFlip: Flip horizontal/vertical.
 
 
 

diff --git a/docs/Release/UnityLoader.js b/docs/Release/UnityLoader.js
diff --git a/docs/Release/build.asm.jsgz b/docs/Release/build.asm.jsgz
diff --git a/docs/Release/build.datagz b/docs/Release/build.datagz
diff --git a/docs/Release/build.jsgz b/docs/Release/build.jsgz
diff --git a/docs/Release/build.memgz b/docs/Release/build.memgz
diff --git a/docs/TemplateData/Logo.Dark.png b/docs/TemplateData/Logo.Dark.png
diff --git a/docs/TemplateData/Logo.Light.png b/docs/TemplateData/Logo.Light.png
diff --git a/docs/TemplateData/ProgressBar.Dark.png b/docs/TemplateData/ProgressBar.Dark.png
diff --git a/docs/TemplateData/ProgressBar.Light.png b/docs/TemplateData/ProgressBar.Light.png
diff --git a/docs/TemplateData/ProgressFrame.Dark.png b/docs/TemplateData/ProgressFrame.Dark.png
diff --git a/docs/TemplateData/ProgressFrame.Light.png b/docs/TemplateData/ProgressFrame.Light.png
diff --git a/docs/TemplateData/UnityProgress.js b/docs/TemplateData/UnityProgress.js
diff --git a/docs/TemplateData/favicon.ico b/docs/TemplateData/favicon.ico
diff --git a/docs/TemplateData/fullscreen.png b/docs/TemplateData/fullscreen.png
diff --git a/docs/TemplateData/logo.png b/docs/TemplateData/logo.png
diff --git a/docs/TemplateData/style.css b/docs/TemplateData/style.css
diff --git a/docs/index.html b/docs/index.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "UIEffect",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mob-sakai/UIEffect.git"