Compare commits

..

6 Commits

Author SHA1 Message Date
semantic-release-bot 91e5be706d chore(release): 5.5.2 [skip ci]
## [5.5.2](https://github.com/mob-sakai/UIEffect/compare/5.5.1...5.5.2) (2025-02-28)

### Bug Fixes

* `PlayOnEnable.Reverse` in UIEffectTweener does not work ([3f5a7dc](https://github.com/mob-sakai/UIEffect/commit/3f5a7dcd2d8248b9e47fb9d38c083f26b798e063)), closes [#310](https://github.com/mob-sakai/UIEffect/issues/310)
* `TransitionFilter` and `GradationMode` do not work correctly when the initial scale is 0 ([bdbf293](https://github.com/mob-sakai/UIEffect/commit/bdbf293c1489c0b248078969b37ec66890620d44)), closes [#311](https://github.com/mob-sakai/UIEffect/issues/311)
* component icons will no longer be displayed in the scene view (Unity 2021.2 or later) ([40ff828](https://github.com/mob-sakai/UIEffect/commit/40ff828ff0697dc8f6597cfcf094cc63532a19dd))
* fix potential issues ([a748adf](https://github.com/mob-sakai/UIEffect/commit/a748adf1bde5e400fcc84ec902a1438867105f75))
* reset time button does not work correctly in the inspector when `UIEffectTweener.direction=Reverse` in the editor ([8513970](https://github.com/mob-sakai/UIEffect/commit/8513970e6f71d393430a573bfb0207428998bee1)), closes [#310](https://github.com/mob-sakai/UIEffect/issues/310)
2025-02-28 09:04:55 +00:00
mob-sakai 8513970e6f fix: reset time button does not work correctly in the inspector when UIEffectTweener.direction=Reverse in the editor
close #310
2025-02-28 17:37:37 +09:00
mob-sakai 3f5a7dcd2d fix: PlayOnEnable.Reverse in UIEffectTweener does not work
close #310
2025-02-27 18:41:37 +09:00
mob-sakai a748adf1bd fix: fix potential issues 2025-02-27 17:43:54 +09:00
mob-sakai 40ff828ff0 fix: component icons will no longer be displayed in the scene view (Unity 2021.2 or later) 2025-02-27 17:43:54 +09:00
mob-sakai bdbf293c14 fix: TransitionFilter and GradationMode do not work correctly when the initial scale is 0
close #311
2025-02-27 09:29:51 +09:00
16 changed files with 152 additions and 22 deletions
+11
View File
@@ -1,3 +1,14 @@
## [5.5.2](https://github.com/mob-sakai/UIEffect/compare/5.5.1...5.5.2) (2025-02-28)
### Bug Fixes
* `PlayOnEnable.Reverse` in UIEffectTweener does not work ([3f5a7dc](https://github.com/mob-sakai/UIEffect/commit/3f5a7dcd2d8248b9e47fb9d38c083f26b798e063)), closes [#310](https://github.com/mob-sakai/UIEffect/issues/310)
* `TransitionFilter` and `GradationMode` do not work correctly when the initial scale is 0 ([bdbf293](https://github.com/mob-sakai/UIEffect/commit/bdbf293c1489c0b248078969b37ec66890620d44)), closes [#311](https://github.com/mob-sakai/UIEffect/issues/311)
* component icons will no longer be displayed in the scene view (Unity 2021.2 or later) ([40ff828](https://github.com/mob-sakai/UIEffect/commit/40ff828ff0697dc8f6597cfcf094cc63532a19dd))
* fix potential issues ([a748adf](https://github.com/mob-sakai/UIEffect/commit/a748adf1bde5e400fcc84ec902a1438867105f75))
* reset time button does not work correctly in the inspector when `UIEffectTweener.direction=Reverse` in the editor ([8513970](https://github.com/mob-sakai/UIEffect/commit/8513970e6f71d393430a573bfb0207428998bee1)), closes [#310](https://github.com/mob-sakai/UIEffect/issues/310)
## [5.5.1](https://github.com/mob-sakai/UIEffect/compare/5.5.0...5.5.1) (2025-02-14)
+9 -1
View File
@@ -77,7 +77,7 @@ namespace Coffee.UIEffects.Editors
var rResetTimeButton = new Rect(r.x, r.y, 20, r.height);
if (GUI.Button(rResetTimeButton, EditorGUIUtility.IconContent("animation.firstkey"), "IconButton"))
{
SetTime(0);
ResetTime();
}
var rPlayButton = new Rect(r.x + 20, r.y, 20, r.height);
@@ -149,6 +149,14 @@ namespace Coffee.UIEffects.Editors
}
}
private void ResetTime()
{
foreach (var tweener in targets.OfType<UIEffectTweener>())
{
tweener.ResetTime(tweener.direction);
}
}
private void SetPlaying(bool enable)
{
if (!EditorApplication.isPlaying)
@@ -204,7 +204,7 @@ namespace Coffee.UIEffectInternal
target.enabled = false;
// Find MonoScript of the specified component.
foreach (var script in Resources.FindObjectsOfTypeAll<MonoScript>())
foreach (var script in MonoImporter.GetAllRuntimeMonoScripts())
{
if (script.GetClass() != typeof(T))
{
@@ -3,11 +3,16 @@ using System.Diagnostics;
using UnityEditor;
using UnityEngine;
using Object = UnityEngine.Object;
#if UNITY_EDITOR && UNITY_2021_2_OR_NEWER
#if UNITY_EDITOR
using System.IO;
using System.Linq;
using System.Reflection;
#if UNITY_2021_2_OR_NEWER
using UnityEditor.SceneManagement;
#elif UNITY_EDITOR
#else
using UnityEditor.Experimental.SceneManagement;
#endif
#endif
namespace Coffee.UIEffectInternal
{
@@ -72,5 +77,56 @@ namespace Coffee.UIEffectInternal
public static bool isBatchOrBuilding => Application.isBatchMode || BuildPipeline.isBuildingPlayer;
#endif
[Conditional("UNITY_EDITOR")]
public static void QueuePlayerLoopUpdate()
{
#if UNITY_EDITOR
if (!EditorApplication.isPlaying)
{
EditorApplication.QueuePlayerLoopUpdate();
}
#endif
}
}
#if !UNITY_2021_2_OR_NEWER
[AttributeUsage(AttributeTargets.Class)]
[Conditional("UNITY_EDITOR")]
internal class IconAttribute : Attribute
{
private readonly string _path;
public IconAttribute(string path)
{
_path = path;
}
#if UNITY_EDITOR
private static Action<Object, Texture2D> s_SetIconForObject = typeof(EditorGUIUtility)
.GetMethod("SetIconForObject", BindingFlags.Static | BindingFlags.NonPublic)
.CreateDelegate(typeof(Action<Object, Texture2D>), null) as Action<Object, Texture2D>;
[InitializeOnLoadMethod]
private static void InitializeOnLoadMethod()
{
if (Misc.isBatchOrBuilding) return;
var types = TypeCache.GetTypesWithAttribute<IconAttribute>();
var scripts = MonoImporter.GetAllRuntimeMonoScripts();
foreach (var type in types)
{
var script = scripts.FirstOrDefault(x => x.GetClass() == type);
if (!script) continue;
var path = type.GetCustomAttribute<IconAttribute>()?._path;
var icon = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
if (!icon) continue;
s_SetIconForObject(script, icon);
}
}
#endif
}
#endif
}
@@ -1,10 +1,12 @@
using System;
using System.Diagnostics;
using UnityEditor;
using UnityEngine;
namespace Coffee.UIEffectInternal
{
[AttributeUsage(AttributeTargets.Field)]
[Conditional("UNITY_EDITOR")]
public sealed class PowerRangeAttribute : PropertyAttribute
{
public readonly float min;
+1
View File
@@ -5,6 +5,7 @@ using UnityEngine.Rendering;
namespace Coffee.UIEffects
{
[Icon("Packages/com.coffee.ui-effect/Editor/UIEffectIconIcon.png")]
[ExecuteAlways]
[DisallowMultipleComponent]
public class UIEffect : UIEffectBase
+1 -1
View File
@@ -5,7 +5,7 @@ MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 5b93acc4527c740459bbfbd3404191be, type: 3}
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+40 -8
View File
@@ -1,3 +1,4 @@
using System;
using System.Runtime.CompilerServices;
using Coffee.UIEffectInternal;
using UnityEngine;
@@ -21,6 +22,7 @@ namespace Coffee.UIEffects
private Graphic _graphic;
private Material _material;
private UIEffectContext _context;
private Action _setVerticesDirtyIfVisible;
public Graphic graphic => _graphic ? _graphic : _graphic = GetComponent<Graphic>();
public virtual uint effectId => (uint)GetInstanceID();
@@ -52,6 +54,11 @@ namespace Coffee.UIEffects
protected override void OnDisable()
{
if (_setVerticesDirtyIfVisible != null)
{
UIExtraCallbacks.onBeforeCanvasRebuild -= _setVerticesDirtyIfVisible;
}
MaterialRepository.Release(ref _material);
SetMaterialDirty();
SetVerticesDirty();
@@ -59,6 +66,8 @@ namespace Coffee.UIEffects
protected override void OnDestroy()
{
_setVerticesDirtyIfVisible = null;
_graphic = null;
s_ContextPool.Return(ref _context);
}
@@ -70,7 +79,27 @@ namespace Coffee.UIEffects
{
if (!isActiveAndEnabled || context == null) return;
context.ModifyMesh(graphic, transitionRoot, vh, canModifyShape);
if (CanModifyMesh())
{
context.ModifyMesh(graphic, transitionRoot, vh, canModifyShape);
}
// If you can't modify the mesh, retry next frame.
else
{
UIExtraCallbacks.onBeforeCanvasRebuild += _setVerticesDirtyIfVisible ??= SetVerticesDirtyIfVisible;
}
}
private bool CanModifyMesh()
{
// The transitionRoot is same as the transform => true.
var root = transitionRoot;
if (transform == root) return true;
// The transitionRoot is not visible => false.
var scale1 = root.lossyScale;
var scale2 = transform.lossyScale;
return !Mathf.Approximately(scale1.x * scale1.y * scale2.x * scale2.y, 0);
}
public virtual Material GetModifiedMaterial(Material baseMaterial)
@@ -107,14 +136,8 @@ namespace Coffee.UIEffects
protected override void OnValidate()
{
UpdateContext(context);
ApplyContextToMaterial(graphic ? graphic.canvasRenderer.GetMaterial() : _material);
SetVerticesDirty();
SetMaterialDirty();
if (!EditorApplication.isPlaying)
{
EditorApplication.QueuePlayerLoopUpdate();
}
}
protected override void Reset()
@@ -141,13 +164,22 @@ namespace Coffee.UIEffects
if (graphic)
{
graphic.SetVerticesDirty();
GraphicProxy.Find(graphic).SetVerticesDirty(graphic, false);
GraphicProxy.Find(graphic).SetVerticesDirty(graphic, enabled);
#if UNITY_EDITOR
EditorApplication.QueuePlayerLoopUpdate();
#endif
}
}
private void SetVerticesDirtyIfVisible()
{
if (CanModifyMesh())
{
UIExtraCallbacks.onBeforeCanvasRebuild -= _setVerticesDirtyIfVisible ??= SetVerticesDirtyIfVisible;
SetVerticesDirty();
}
}
public virtual void SetMaterialDirty()
{
if (graphic)
+6 -2
View File
@@ -462,8 +462,12 @@ namespace Coffee.UIEffects
if (transitionRoot)
{
rect = transitionRoot.rect;
rectMatrix = transitionRoot.worldToLocalMatrix
* graphic.transform.localToWorldMatrix;
if (transitionRoot != graphic.transform)
{
rectMatrix = transitionRoot.worldToLocalMatrix
* graphic.transform.localToWorldMatrix;
}
rot *= Matrix4x4.Scale(new Vector3(1 / multiplier, 1 / multiplier, 1))
* rectMatrix;
}
@@ -8,6 +8,7 @@ using UnityEngine;
namespace Coffee.UIEffects
{
[Icon("Packages/com.coffee.ui-effect/Editor/UIEffectIconIcon.png")]
public class UIEffectProjectSettings : PreloadedProjectSettings<UIEffectProjectSettings>
{
[Tooltip(
@@ -5,7 +5,7 @@ MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 5b93acc4527c740459bbfbd3404191be, type: 3}
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+1
View File
@@ -3,6 +3,7 @@ using UnityEngine;
namespace Coffee.UIEffects
{
[Icon("Packages/com.coffee.ui-effect/Editor/UIEffectIconIcon.png")]
public class UIEffectReplica : UIEffectBase
{
[SerializeField] private UIEffect m_Target;
+1 -1
View File
@@ -5,7 +5,7 @@ MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 5b93acc4527c740459bbfbd3404191be, type: 3}
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+17 -3
View File
@@ -1,10 +1,12 @@
using System;
using Coffee.UIEffectInternal;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.Serialization;
namespace Coffee.UIEffects
{
[Icon("Packages/com.coffee.ui-effect/Editor/UIEffectIconIcon.png")]
[ExecuteAlways]
[RequireComponent(typeof(UIEffectBase))]
public class UIEffectTweener : MonoBehaviour
@@ -343,7 +345,7 @@ namespace Coffee.UIEffects
{
if (resetTime)
{
ResetTime();
ResetTime(direction);
}
Play();
@@ -363,7 +365,7 @@ namespace Coffee.UIEffects
{
if (resetTime)
{
ResetTime();
ResetTime(Direction.Forward);
}
PlayForward();
@@ -384,7 +386,7 @@ namespace Coffee.UIEffects
{
if (resetTime)
{
ResetTime();
ResetTime(Direction.Reverse);
}
PlayReverse();
@@ -417,6 +419,18 @@ namespace Coffee.UIEffects
SetTime(0);
}
public void ResetTime(Direction dir)
{
if (dir == Direction.Forward)
{
SetTime(0);
}
else
{
SetTime(totalTime - 0.0001f);
}
}
[Obsolete(
"UIEffectTweener.Restart has been deprecated. Use UIEffectTweener.ResetTime instead (UnityUpgradable) -> ResetTime")]
public void Restart()
+1 -1
View File
@@ -5,7 +5,7 @@ MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 5b93acc4527c740459bbfbd3404191be, type: 3}
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "com.coffee.ui-effect",
"displayName": "UI Effect",
"description": "UIEffect is an open-source package that allows you to intuitively apply rich UI effects directly from the Inspector or via code.\nCombine various filters, such as grayscale, blur, and dissolve, to decorate your UI with a unique visual style!",
"version": "5.5.1",
"version": "5.5.2",
"unity": "2020.3",
"license": "MIT",
"repository": {