release v0.3.0

Takashi Sakai · Takashi Sakai · commit 3d2c5c8a51f3 · 2018-04-24T12:29:18.000+09:00
diff --git a/Assets/DissolveEffectForUGUI/Demo/Dissolve.controller b/Assets/DissolveEffectForUGUI/Demo/Dissolve.controller
@@ -34,7 +34,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: A
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -56,7 +56,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: B
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -78,7 +78,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: C
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -100,7 +100,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: D
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -176,7 +176,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: A
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -198,7 +198,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: B
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -220,7 +220,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: C
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
@@ -242,7 +242,7 @@ AnimationClip:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-    attribute: m_Location
+    attribute: m_DissolveFactor
     path: D
     classID: 114
     script: {fileID: 11500000, guid: 7f9a4349581d64dcabe67c494ee1d531, type: 3}
diff --git a/Assets/DissolveEffectForUGUI/UI-Effect-Dissolve.shader b/Assets/DissolveEffectForUGUI/UI-Effect-Dissolve.shader
@@ -3,23 +3,26 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
 	Properties
 	{
 		[PerRendererData] _MainTex ("Main Texture", 2D) = "white" {}
-		_Color ("Tint", Color) = (1,1,1,1)
-		
-		_StencilComp ("Stencil Comparison", Float) = 8
-		_Stencil ("Stencil ID", Float) = 0
-		_StencilOp ("Stencil Operation", Float) = 0
-		_StencilWriteMask ("Stencil Write Mask", Float) = 255
-		_StencilReadMask ("Stencil Read Mask", Float) = 255
+		[HideInInspector] _Color ("Tint", Color) = (1,1,1,1)
+
+		[HideInInspector] _StencilComp ("Stencil Comparison", Float) = 8
+		[HideInInspector] _Stencil ("Stencil ID", Float) = 0
+		[HideInInspector] _StencilOp ("Stencil Operation", Float) = 0
+		[HideInInspector] _StencilWriteMask ("Stencil Write Mask", Float) = 255
+		[HideInInspector] _StencilReadMask ("Stencil Read Mask", Float) = 255
 
-		_ColorMask ("Color Mask", Float) = 15
+		[HideInInspector] _ColorMask ("Color Mask", Float) = 15
 
-		[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
+		[HideInInspector] [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
+
+		[Header(Outer Setting)]
 		_OuterEdgeColor ("Outer edge color", Color) = (1.0, 0.75, 0.0, 1.0)
 		_OuterSoftness ("Outer softness", Range (0.0001, 1)) = 0.5
+
+		[Header(Inner Setting)]
 		_InnerEdgeColor ("Inner edge color", Color) = (1.0, 0.0, 0.0, 1.0)
 		_InnerSoftness ("Inner softness", Range (0.0001, 1)) = 0.5
 	}
diff --git a/Assets/DissolveEffectForUGUI/UIDissolve.cs b/Assets/DissolveEffectForUGUI/UIDissolve.cs
@@ -30,7 +30,7 @@ public class UIDissolve : BaseMeshEffect
 		//################################
 		// Serialize Members.
 		//################################
-		[SerializeField] [Range(0, 1)] float m_Location = 0;
+		[SerializeField] [Range(0, 1)] float m_DissolveFactor = 0;
 		[SerializeField] Material m_EffectMaterial;
 
 
@@ -45,7 +45,7 @@ public class UIDissolve : BaseMeshEffect
 		/// <summary>
 		/// Location for effect.
 		/// </summary>
-		public float location { get { return m_Location; } set { m_Location = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
+		public float dissolveFactor { get { return m_DissolveFactor; } set { m_DissolveFactor = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
 
 		/// <summary>
 		/// Effect material.
@@ -114,9 +114,14 @@ public static Material GetMaterial(string shaderName)
 		/// </summary>
 		public override void ModifyMesh(VertexHelper vh)
 		{
+			if (!IsActive() || dissolveFactor <= 0)
+				return;
 
-			if (!IsActive())
+			// Skip process.
+			if (1 <= dissolveFactor) {
+				vh.Clear ();
 				return;
+			}
 
 			// rect.
 			Rect rect = graphic.rectTransform.rect;
@@ -129,7 +134,7 @@ public override void ModifyMesh(VertexHelper vh)
 
 				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, dissolveFactor), 0);
 
 				vh.SetUIVertex(vertex, i);
 			}
@@ -159,4 +164,38 @@ static float _PackToFloat(float x, float y, float z)
 			+ Mathf.FloorToInt(x * PRECISION);
 		}
 	}
+
+
+	[CanEditMultipleObjects, CustomEditor (typeof(UIDissolve))]
+	public class UIDissolveEditor : Editor
+	{
+		private Editor materialEditor;
+		private Material material;
+
+		void OnDisable()
+		{
+			if (materialEditor) {
+				DestroyImmediate (materialEditor);
+			}
+		}
+
+		public override void OnInspectorGUI ()
+		{
+			base.OnInspectorGUI ();
+
+			var current = target as UIDissolve;
+			if (current.effectMaterial) {
+				if (material != current.effectMaterial) {
+					material = current.effectMaterial;
+					DestroyImmediate (materialEditor);
+				}
+				if (!materialEditor) {
+					materialEditor = Editor.CreateEditor (current.effectMaterial);
+				}
+				materialEditor.DrawHeader ();
+				materialEditor.OnInspectorGUI ();
+			}
+
+		}
+	}
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [v0.3.0](https://github.com/mob-sakai/DissolveEffectForUGUI/tree/v0.3.0) (2018-04-24)
+
+[Full Changelog](https://github.com/mob-sakai/DissolveEffectForUGUI/compare/v0.2.0...v0.3.0)
+
+**Implemented enhancements:**
+
+- Feature: Skip process when dissolve factor equal 1 [\#5](https://github.com/mob-sakai/DissolveEffectForUGUI/issues/5)
+- Feature: Skip process when dissolve factor equal 0 [\#4](https://github.com/mob-sakai/DissolveEffectForUGUI/issues/4)
+
+## [v0.2.0](https://github.com/mob-sakai/DissolveEffectForUGUI/tree/v0.2.0) (2018-04-23)
+
+[Full Changelog](https://github.com/mob-sakai/DissolveEffectForUGUI/compare/v0.1.0...v0.2.0)
+
+**Implemented enhancements:**
+
+- Feature: Show material editor in inspector [\#3](https://github.com/mob-sakai/DissolveEffectForUGUI/issues/3)
+
 ## [v0.1.0](https://github.com/mob-sakai/DissolveEffectForUGUI/tree/v0.1.0) (2018-04-23)
 
 [Full Changelog](https://github.com/mob-sakai/DissolveEffectForUGUI/compare/45db49cc27f879ae4ed460c55e50b592aaded503...v0.1.0)
diff --git a/README.md b/README.md
@@ -4,7 +4,8 @@ DissolveEffectForUGUI
 ### NOTE: This project *will* be merged to [UIEffect](https://github.com/mob-sakai/UIEffect).
 
 A dissolve effect for uGUI, without material instancing.
-![image](https://user-images.githubusercontent.com/12690315/39131615-dccdc2bc-474a-11e8-84b2-0513b64168a7.png)
+
+![image](https://user-images.githubusercontent.com/12690315/39158165-6f8d68fc-4799-11e8-837f-4b74943d3f36.png)
 
 [![](https://img.shields.io/github/release/mob-sakai/DissolveEffectForUGUI.svg?label=latest%20version)](https://github.com/mob-sakai/DissolveEffectForUGUI/release)
 [![](https://img.shields.io/github/release-date/mob-sakai/DissolveEffectForUGUI.svg)](https://github.com/mob-sakai/DissolveEffectForUGUI/releases)
@@ -22,19 +23,27 @@ A dissolve effect for uGUI, without material instancing.
 <br><br><br><br>
 ## Description
 
+![image](https://user-images.githubusercontent.com/12690315/39131615-dccdc2bc-474a-11e8-84b2-0513b64168a7.png)
+
 DissolveEffectForUGUI applies _dissolve-effect_ to uGUI element (Image, RawImage, Text, etc...) **WITHOUT material instancing**.  
 This will suppress extra draw calls and improve performance.
 
-* Noise pattern image
-* Edge width
-* Outer/inner edge color
-* Outer/inner edge softness
+* Parameters
+    * Dissolve factor
+    * Noise pattern image (in material)
+    * Edge width (in material)
+    * Outer/inner edge color (in material)
+    * Outer/inner edge softness (in material)
+
+![image](https://user-images.githubusercontent.com/12690315/39143377-b9e632c0-4768-11e8-9d26-717304df41fb.png)
+
 
 
 <br><br><br><br>
 ## Demo
 
-![demo](https://user-images.githubusercontent.com/12690315/39131616-dcf7ea60-474a-11e8-8e20-f9e5bd8b3f5c.gif)
+* ![demo](https://user-images.githubusercontent.com/12690315/39131616-dcf7ea60-474a-11e8-8e20-f9e5bd8b3f5c.gif)
+    * Just 1 draw call!
 
 
 
@@ -44,7 +53,7 @@ This will suppress extra draw calls and improve performance.
 1. Download DissolveEffectForUGUI.unitypackage from [Releases](https://github.com/mob-sakai/DissolveEffectForUGUI/releases).
 1. Import the package into your Unity project. Select `Import Package > Custom Package` from the `Assets` menu.
 1. Add `DissolveEffectForUGUI` component to UI element (Image, RawImage, Text, etc...) from `Add Component` in inspector.
-1. Choose effect type and adjust values in inspector.  
+1. Control effect parameters in inspector.  
 1. Enjoy!
 
 
diff --git a/package.json b/package.json
@@ -1,10 +1,11 @@
 {
   "name": "DissolveEffectForUGUI",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mob-sakai/DissolveEffectForUGUI.git"
   },
   "src": "Assets/DissolveEffectForUGUI",
+  "unity": "/Applications/Unity5.5.0p4/Unity5.5.0p4.app/Contents/MacOS/Unity",
   "license": "MIT"
 }
diff --git a/release.sh b/release.sh
@@ -1,23 +1,25 @@
 #!/bin/bash -e
 
+# 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. Update "CHANGELOG.md" using "github_changelog_generator-1.15.0.pre.rc".
 #   3. Commit package.json and CHANGELOG.md.
 #   4. Merge into master branch.
 #   5. Export unitypackage.
 #   6. Release using "gh-release-3.2.0". (Upload unitypackage)
-UNITY_PATH=/Applications/Unity5.5.0p4/Unity5.5.0p4.app/Contents/MacOS/Unity
 
 
-# input version
+# input release version
 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
 
 
-# update version
+# update version in package.json
 git checkout -B release develop
 sed -i -e "s/\"version\": \(.*\)/\"version\": \"${RELEASE_VERSION}\",/g" package.json
 
@@ -36,6 +38,12 @@ read -p "[? continue? (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
 git add CHANGELOG.md -f
 git add package.json -f
@@ -49,10 +57,8 @@ git branch -D release
 git push origin master
 
 
-# export .unitypackage and release on Github
-PACKAGE_SRC=`node -pe 'require("./package.json").src'`
-$UNITY_PATH -quit -batchmode -projectPath "`pwd`" -exportpackage $PACKAGE_SRC $PACKAGE_NAME.unitypackage
-gh-release  --draft --assets $PACKAGE_NAME.unitypackage
+# upload unitypackage and release on Github
+gh-release  --draft --assets "$PACKAGE_NAME.unitypackage"
 
 
 echo "\n\n$PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "DissolveEffectForUGUI",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.3.0",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "git+https://github.com/mob-sakai/DissolveEffectForUGUI.git"`
`7`	`7`	`},`
`8`	`8`	`"src": "Assets/DissolveEffectForUGUI",`
	`9`	`+ "unity": "/Applications/Unity5.5.0p4/Unity5.5.0p4.app/Contents/MacOS/Unity",`
`9`	`10`	`"license": "MIT"`
`10`	`11`	`}`