Compare commits

..

8 Commits

Author SHA1 Message Date
mob-sakai 60d0df6171 release v2.6.2 2018-07-18 10:53:23 +09:00
mob-sakai e031e57f23 update change log 2018-07-18 10:53:23 +09:00
mob-sakai c919449629 fix #99; Shader has compile errors in D3D9 or D3D11_9X(WSA) 2018-07-18 10:46:55 +09:00
mob-sakai 6bfc676bee update release script 2018-07-17 17:28:11 +09:00
mob-sakai 346b1c8ec6 release 2018-06-14 18:15:29 +09:00
mob-sakai be86d169bf update change log 2018-06-14 18:15:28 +09:00
mob-sakai ee452d6794 fix #90; Errors occurred on build (v2.6.0) 2018-06-14 18:10:57 +09:00
Takashi Sakai e0c660773f Update CHANGELOG.md 2018-06-14 17:58:20 +09:00
8 changed files with 39 additions and 88 deletions
+3 -1
View File
@@ -33,4 +33,6 @@ sysinfo.txt
# Packages
*.unitypackage
*.unitypackage
build.app
unity.log
@@ -11,11 +11,13 @@ namespace Coffee.UIExtensions
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>();
@@ -10,7 +10,10 @@ namespace Coffee.UIExtensions
[ExecuteInEditMode]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public abstract class UIEffectBase : BaseMeshEffect, ISerializationCallbackReceiver
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 };
@@ -28,15 +31,14 @@ namespace Coffee.UIExtensions
/// </summary>
public Material effectMaterial { get { return m_EffectMaterial; } }
#if UNITY_EDITOR
/// <summary>
/// Raises the validate event.
/// </summary>
protected override void OnValidate ()
{
base.OnValidate ();
#if UNITY_EDITOR
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(false);
#endif
}
/// <summary>
@@ -51,12 +53,9 @@ namespace Coffee.UIExtensions
/// </summary>
public virtual void OnAfterDeserialize()
{
#if UNITY_EDITOR
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(true);
#endif
}
#if UNITY_EDITOR
/// <summary>
/// Updates the material.
/// </summary>
@@ -50,7 +50,11 @@ 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
@@ -88,7 +92,7 @@ Shader "UI/Hidden/UI-Effect"
half4 effectFactor : TEXCOORD2;
#endif
#if HUE || PIXEL
half4 extraFactor : TEXCOORD3;
half2 extraFactor : TEXCOORD3;
#endif
};
@@ -19,7 +19,11 @@ 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 __ GRAYSCALE SEPIA NEGA PIXEL MONO CUTOFF HUE
#pragma shader_feature __ ADD SUBTRACT FILL
+18 -5
View File
@@ -1,10 +1,26 @@
# 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!
Blurring effect has been improved about 6 times faster!
![](https://user-images.githubusercontent.com/12690315/41393724-08420b1e-6fe2-11e8-8741-721789c2d029.png)
You can change noise texture for dissolve effect from inspector or script!
@@ -22,6 +38,7 @@ You can change noise texture for dissolve effect from inspector or script!
**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)
@@ -32,10 +49,6 @@ You can change noise texture for dissolve effect from inspector or script!
- When `UIEFFECT\_SEPARATE` symbol is defined, UIDissolve does not work well [\#85](https://github.com/mob-sakai/UIEffect/issues/85)
**Closed issues:**
- Refactoring to prepare v3.0.0 [\#83](https://github.com/mob-sakai/UIEffect/issues/83)
## [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)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "UIEffect",
"version": "2.6.0",
"version": "2.6.2",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
+1 -74
View File
@@ -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')