mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-20 01:42:37 +08:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| aaf79b76a9 | |||
| 2c8b994aa0 | |||
| 49c3855c49 | |||
| 537784c0f3 | |||
| bf8b4833fd | |||
| c78bc86cf1 | |||
| 0ad6bd7693 | |||
| 3fda891b35 | |||
| efefad1a73 | |||
| 1e9cea00cb |
@@ -1,6 +1,7 @@
|
||||
using UnityEditor;
|
||||
using UnityEditor.UI;
|
||||
using UnityEngine;
|
||||
using DesamplingRate = Coffee.UIExtensions.UIEffectCapturedImage.DesamplingRate;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
@@ -11,6 +12,41 @@ namespace Coffee.UIExtensions
|
||||
[CanEditMultipleObjects]
|
||||
public class UIEffectCapturedImageEditor : RawImageEditor
|
||||
{
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
//################################
|
||||
|
||||
public enum QualityMode : int
|
||||
{
|
||||
Fast = (DesamplingRate.x2 << 0) + (DesamplingRate.x2 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
|
||||
Medium = (DesamplingRate.x1 << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
|
||||
Detail = (DesamplingRate.None << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
|
||||
Custom = -1,
|
||||
}
|
||||
|
||||
|
||||
//################################
|
||||
// Public/Protected Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
_spTexture = serializedObject.FindProperty("m_Texture");
|
||||
_spColor = serializedObject.FindProperty("m_Color");
|
||||
_spRaycastTarget = serializedObject.FindProperty("m_RaycastTarget");
|
||||
_spDesamplingRate = serializedObject.FindProperty("m_DesamplingRate");
|
||||
_spReductionRate = serializedObject.FindProperty("m_ReductionRate");
|
||||
_spFilterMode = serializedObject.FindProperty("m_FilterMode");
|
||||
_spIterations = serializedObject.FindProperty("m_Iterations");
|
||||
_spKeepSizeToRootCanvas = serializedObject.FindProperty("m_KeepCanvasSize");
|
||||
|
||||
|
||||
_customAdvancedOption = (qualityMode == QualityMode.Custom);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implement this function to make a custom inspector.
|
||||
/// </summary>
|
||||
@@ -21,9 +57,9 @@ namespace Coffee.UIExtensions
|
||||
//================
|
||||
// Basic properties.
|
||||
//================
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Texture"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Color"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_RaycastTarget"));
|
||||
EditorGUILayout.PropertyField(_spTexture);
|
||||
EditorGUILayout.PropertyField(_spColor);
|
||||
EditorGUILayout.PropertyField(_spRaycastTarget);
|
||||
|
||||
//================
|
||||
// Capture effect.
|
||||
@@ -38,17 +74,24 @@ namespace Coffee.UIExtensions
|
||||
GUILayout.Space(10);
|
||||
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
|
||||
|
||||
// Desampling rate.
|
||||
DrawDesamplingRate(serializedObject.FindProperty("m_DesamplingRate"));
|
||||
EditorGUI.BeginChangeCheck();
|
||||
QualityMode quality = qualityMode;
|
||||
quality = (QualityMode)EditorGUILayout.EnumPopup("Quality Mode", quality);
|
||||
if(EditorGUI.EndChangeCheck())
|
||||
{
|
||||
_customAdvancedOption = (quality == QualityMode.Custom);
|
||||
qualityMode = quality;
|
||||
}
|
||||
|
||||
// Reduction rate.
|
||||
DrawDesamplingRate(serializedObject.FindProperty("m_ReductionRate"));
|
||||
|
||||
// Filter Mode.
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_FilterMode"));
|
||||
|
||||
// Iterations.
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Iterations"));
|
||||
// When qualityMode is `Custom`, show advanced option.
|
||||
if (_customAdvancedOption)
|
||||
{
|
||||
DrawDesamplingRate(_spDesamplingRate);// Desampling rate.
|
||||
DrawDesamplingRate(_spReductionRate);// Reduction rate.
|
||||
EditorGUILayout.PropertyField(_spFilterMode);// Filter Mode.
|
||||
EditorGUILayout.PropertyField(_spIterations);// Iterations.
|
||||
}
|
||||
EditorGUILayout.PropertyField(_spKeepSizeToRootCanvas);// Iterations.
|
||||
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
|
||||
@@ -67,6 +110,48 @@ namespace Coffee.UIExtensions
|
||||
}
|
||||
}
|
||||
|
||||
//################################
|
||||
// Private Members.
|
||||
//################################
|
||||
const int Bits4 = (1 << 4) - 1;
|
||||
const int Bits2 = (1 << 2) - 1;
|
||||
bool _customAdvancedOption = false;
|
||||
SerializedProperty _spTexture;
|
||||
SerializedProperty _spColor;
|
||||
SerializedProperty _spRaycastTarget;
|
||||
SerializedProperty _spDesamplingRate;
|
||||
SerializedProperty _spReductionRate;
|
||||
SerializedProperty _spFilterMode;
|
||||
SerializedProperty _spIterations;
|
||||
SerializedProperty _spKeepSizeToRootCanvas;
|
||||
|
||||
QualityMode qualityMode
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_customAdvancedOption)
|
||||
return QualityMode.Custom;
|
||||
|
||||
int qualityValue = (_spDesamplingRate.intValue << 0)
|
||||
+ (_spReductionRate.intValue << 4)
|
||||
+ (_spFilterMode.intValue << 8)
|
||||
+ (_spIterations.intValue << 10);
|
||||
|
||||
return System.Enum.IsDefined(typeof(QualityMode), qualityValue) ? (QualityMode)qualityValue : QualityMode.Custom;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (value != QualityMode.Custom)
|
||||
{
|
||||
int qualityValue = (int)value;
|
||||
_spDesamplingRate.intValue = (qualityValue >> 0) & Bits4;
|
||||
_spReductionRate.intValue = (qualityValue >> 4) & Bits4;
|
||||
_spFilterMode.intValue = (qualityValue >> 8) & Bits2;
|
||||
_spIterations.intValue = (qualityValue >> 10) & Bits4;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Draws the desampling rate.
|
||||
/// </summary>
|
||||
|
||||
@@ -11,12 +11,11 @@ namespace Coffee.UIExtensions
|
||||
[CanEditMultipleObjects]
|
||||
public class UIEffectEditor : Editor
|
||||
{
|
||||
ReorderableList roAdditionalShadows;
|
||||
SerializedProperty spAdditionalShadows;
|
||||
SerializedProperty spBlurMode;
|
||||
|
||||
//################################
|
||||
// Constant or Static Members.
|
||||
//################################
|
||||
/// <summary>
|
||||
/// Implement this function to make a custom inspector.
|
||||
/// Draw effect properties.
|
||||
/// </summary>
|
||||
public static void DrawEffectProperties(string shaderName, SerializedObject serializedObject)
|
||||
{
|
||||
@@ -93,23 +92,46 @@ namespace Coffee.UIExtensions
|
||||
}
|
||||
}
|
||||
|
||||
//################################
|
||||
// Private Members.
|
||||
//################################
|
||||
ReorderableList _roAdditionalShadows;
|
||||
SerializedProperty _spAdditionalShadows;
|
||||
SerializedProperty _spBlurMode;
|
||||
SerializedProperty _spCustomEffect;
|
||||
SerializedProperty _spEffectMaterial;
|
||||
SerializedProperty _spEffectColor;
|
||||
SerializedProperty _spCustomFactorX;
|
||||
SerializedProperty _spCustomFactorY;
|
||||
SerializedProperty _spCustomFactorZ;
|
||||
SerializedProperty _spCustomFactorW;
|
||||
|
||||
void OnEnable()
|
||||
{
|
||||
spAdditionalShadows = serializedObject.FindProperty("m_AdditionalShadows");
|
||||
spBlurMode = serializedObject.FindProperty("m_BlurMode");
|
||||
_spAdditionalShadows = serializedObject.FindProperty("m_AdditionalShadows");
|
||||
_spBlurMode = serializedObject.FindProperty("m_BlurMode");
|
||||
_spEffectColor = serializedObject.FindProperty("m_EffectColor");
|
||||
|
||||
roAdditionalShadows = new ReorderableList(serializedObject, spAdditionalShadows, true, true, true, true);
|
||||
roAdditionalShadows.drawElementCallback = DrawElementCallback;
|
||||
roAdditionalShadows.drawHeaderCallback = (rect) => EditorGUI.LabelField(rect, "Additional Shadows");
|
||||
roAdditionalShadows.onAddCallback = OnAddCallback;
|
||||
roAdditionalShadows.elementHeightCallback = ElementHeightCallback;
|
||||
_spCustomEffect = serializedObject.FindProperty("m_CustomEffect");
|
||||
_spEffectMaterial = serializedObject.FindProperty("m_EffectMaterial");
|
||||
var spFactor = serializedObject.FindProperty("m_CustomFactor");
|
||||
_spCustomFactorX = spFactor.FindPropertyRelative("x");
|
||||
_spCustomFactorY = spFactor.FindPropertyRelative("y");
|
||||
_spCustomFactorZ = spFactor.FindPropertyRelative("z");
|
||||
_spCustomFactorW = spFactor.FindPropertyRelative("w");
|
||||
|
||||
_roAdditionalShadows = new ReorderableList(serializedObject, _spAdditionalShadows, true, true, true, true);
|
||||
_roAdditionalShadows.drawElementCallback = DrawElementCallback;
|
||||
_roAdditionalShadows.drawHeaderCallback = (rect) => EditorGUI.LabelField(rect, "Additional Shadows");
|
||||
_roAdditionalShadows.onAddCallback = OnAddCallback;
|
||||
_roAdditionalShadows.elementHeightCallback = ElementHeightCallback;
|
||||
|
||||
}
|
||||
|
||||
void OnAddCallback(ReorderableList ro)
|
||||
{
|
||||
spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
|
||||
var element = spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
|
||||
_spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
|
||||
var element = _spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
|
||||
element.FindPropertyRelative("shadowMode").intValue = (int)UIEffect.ShadowStyle.Shadow;
|
||||
element.FindPropertyRelative("shadowColor").colorValue = Color.black;
|
||||
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
|
||||
@@ -119,11 +141,11 @@ namespace Coffee.UIExtensions
|
||||
|
||||
float ElementHeightCallback(int index)
|
||||
{
|
||||
var element = spAdditionalShadows.GetArrayElementAtIndex(index);
|
||||
var element = _spAdditionalShadows.GetArrayElementAtIndex(index);
|
||||
if (element.FindPropertyRelative("shadowMode").intValue == (int)UIEffect.ShadowStyle.None)
|
||||
return 16;
|
||||
|
||||
return (spBlurMode.intValue == (int)UIEffect.BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
return (_spBlurMode.intValue == (int)UIEffect.BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -131,7 +153,7 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
void DrawElementCallback(Rect rect, int index, bool isActive, bool isFocused)
|
||||
{
|
||||
var sp = roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
|
||||
var sp = _roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
|
||||
|
||||
Rect r = new Rect(rect);
|
||||
r.height = EditorGUIUtility.singleLineHeight;
|
||||
@@ -147,7 +169,7 @@ namespace Coffee.UIExtensions
|
||||
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
|
||||
|
||||
if (spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
{
|
||||
r.y += r.height;
|
||||
EditorGUI.PropertyField(r, sp.FindPropertyRelative("shadowBlur"));
|
||||
@@ -160,7 +182,25 @@ namespace Coffee.UIExtensions
|
||||
public override void OnInspectorGUI()
|
||||
{
|
||||
serializedObject.Update();
|
||||
DrawEffectProperties(UIEffect.shaderName, serializedObject);
|
||||
|
||||
// Custom effect.
|
||||
EditorGUILayout.PropertyField(_spCustomEffect);
|
||||
if(_spCustomEffect.boolValue)
|
||||
{
|
||||
EditorGUILayout.PropertyField(_spEffectMaterial);
|
||||
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.Slider(_spCustomFactorX, 0, 1, new GUIContent("Effect Factor X"));
|
||||
EditorGUILayout.Slider(_spCustomFactorY, 0, 1, new GUIContent("Effect Factor Y"));
|
||||
EditorGUILayout.Slider(_spCustomFactorZ, 0, 1, new GUIContent("Effect Factor Z"));
|
||||
EditorGUILayout.Slider(_spCustomFactorW, 0, 1, new GUIContent("Effect Factor W"));
|
||||
EditorGUILayout.PropertyField(_spEffectColor);
|
||||
EditorGUI.indentLevel--;
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawEffectProperties(UIEffect.shaderName, serializedObject);
|
||||
}
|
||||
|
||||
//================
|
||||
// Shadow setting.
|
||||
@@ -176,7 +216,7 @@ namespace Coffee.UIExtensions
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowColor"));
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_UseGraphicAlpha"));
|
||||
|
||||
if (spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
|
||||
{
|
||||
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowBlur"));
|
||||
}
|
||||
@@ -186,7 +226,7 @@ namespace Coffee.UIExtensions
|
||||
//================
|
||||
// Additional shadow setting.
|
||||
//================
|
||||
roAdditionalShadows.DoLayoutList();
|
||||
_roAdditionalShadows.DoLayoutList();
|
||||
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
|
||||
|
||||
@@ -85,7 +85,10 @@ Shader "UI/Hidden/UI-Effect"
|
||||
#endif
|
||||
|
||||
#if defined (UI_TONE) || defined (UI_BLUR)
|
||||
half3 effectFactor : TEXCOORD2;
|
||||
half4 effectFactor : TEXCOORD2;
|
||||
#endif
|
||||
#if UI_TONE_HUE || UI_TONE_PIXEL
|
||||
half4 extraFactor : TEXCOORD3;
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -112,10 +115,10 @@ Shader "UI/Hidden/UI-Effect"
|
||||
#endif
|
||||
|
||||
#if UI_TONE_HUE
|
||||
OUT.effectFactor.y = sin(OUT.effectFactor.x*3.14159265359*2);
|
||||
OUT.effectFactor.x = cos(OUT.effectFactor.x*3.14159265359*2);
|
||||
OUT.extraFactor.x = cos(OUT.effectFactor.x*3.14159265359 * 2);
|
||||
OUT.extraFactor.y = sin(OUT.effectFactor.x*3.14159265359 * 2);
|
||||
#elif UI_TONE_PIXEL
|
||||
OUT.effectFactor.xy = max(2, (1-OUT.effectFactor.x) * _MainTex_TexelSize.zw);
|
||||
OUT.extraFactor.xy = max(2, (1-OUT.effectFactor.x*0.98) * _MainTex_TexelSize.zw);
|
||||
#endif
|
||||
|
||||
#if defined (UI_COLOR)
|
||||
@@ -129,7 +132,7 @@ Shader "UI/Hidden/UI-Effect"
|
||||
fixed4 frag(v2f IN) : SV_Target
|
||||
{
|
||||
#if UI_TONE_PIXEL
|
||||
IN.texcoord = round(IN.texcoord * IN.effectFactor.xy) / IN.effectFactor.xy;
|
||||
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
|
||||
#endif
|
||||
|
||||
#if defined (UI_BLUR)
|
||||
@@ -149,7 +152,7 @@ Shader "UI/Hidden/UI-Effect"
|
||||
color.rgb = IN.color.rgb;
|
||||
color.a = color.a * tex2D(_MainTex, IN.texcoord).a + IN.effectFactor.x * 2 - 1;
|
||||
#elif UI_TONE_HUE
|
||||
color.rgb = shift_hue(color.rgb, IN.effectFactor.x, IN.effectFactor.y);
|
||||
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
|
||||
#elif defined (UI_TONE) & !UI_TONE_CUTOFF
|
||||
color = ApplyToneEffect(color, IN.effectFactor.x);
|
||||
#endif
|
||||
|
||||
@@ -127,6 +127,9 @@ namespace Coffee.UIExtensions
|
||||
[SerializeField] List<AdditionalShadow> m_AdditionalShadows = new List<AdditionalShadow>();
|
||||
|
||||
|
||||
[SerializeField] bool m_CustomEffect = false;
|
||||
[SerializeField] Vector4 m_CustomFactor = new Vector4();
|
||||
|
||||
//################################
|
||||
// Public Members.
|
||||
//################################
|
||||
@@ -200,6 +203,11 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
public List<AdditionalShadow> additionalShadows { get { return m_AdditionalShadows; } }
|
||||
|
||||
/// <summary>
|
||||
/// Custom effect factor.
|
||||
/// </summary>
|
||||
public Vector4 customFactor { get { return m_CustomFactor; } set { m_CustomFactor = value; _SetDirty(); } }
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
@@ -237,7 +245,7 @@ namespace Coffee.UIExtensions
|
||||
{
|
||||
// Pack some effect factors to 1 float.
|
||||
Vector2 factor = new Vector2(
|
||||
_PackToFloat(toneLevel, 0, blur, 0),
|
||||
m_CustomEffect ? _PackToFloat(m_CustomFactor) : _PackToFloat(toneLevel, 0, blur, 0),
|
||||
_PackToFloat(effectColor.r, effectColor.g, effectColor.b, effectColor.a)
|
||||
);
|
||||
|
||||
@@ -284,6 +292,9 @@ namespace Coffee.UIExtensions
|
||||
|
||||
public void OnAfterDeserialize()
|
||||
{
|
||||
if (m_CustomEffect)
|
||||
return;
|
||||
|
||||
var obj = this;
|
||||
EditorApplication.delayCall += () =>
|
||||
{
|
||||
@@ -392,7 +403,7 @@ namespace Coffee.UIExtensions
|
||||
/// Append shadow vertices.
|
||||
/// * It is similar to Shadow component implementation.
|
||||
/// </summary>
|
||||
static void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle mode, float toneLevel, float blur, Vector2 effectDistance, Color color, bool useGraphicAlpha)
|
||||
void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle mode, float toneLevel, float blur, Vector2 effectDistance, Color color, bool useGraphicAlpha)
|
||||
{
|
||||
if (ShadowStyle.None == mode)
|
||||
return;
|
||||
@@ -437,7 +448,7 @@ namespace Coffee.UIExtensions
|
||||
/// Append shadow vertices.
|
||||
/// * It is similar to Shadow component implementation.
|
||||
/// </summary>
|
||||
static void _ApplyShadowZeroAlloc(List<UIVertex> verts, ref int start, ref int end, float x, float y, Vector2 factor, Color color, bool useGraphicAlpha)
|
||||
void _ApplyShadowZeroAlloc(List<UIVertex> verts, ref int start, ref int end, float x, float y, Vector2 factor, Color color, bool useGraphicAlpha)
|
||||
{
|
||||
// Check list capacity.
|
||||
var neededCapacity = verts.Count + end - start;
|
||||
@@ -456,6 +467,12 @@ namespace Coffee.UIExtensions
|
||||
vt.position.Set(v.x + x, v.y + y, v.z);
|
||||
|
||||
Color vertColor = color;
|
||||
|
||||
if(colorMode != ColorMode.None)
|
||||
{
|
||||
vertColor.r = vertColor.g = vertColor.b = 1;
|
||||
}
|
||||
|
||||
vertColor.a = useGraphicAlpha ? color.a * vt.color.a / 255 : color.a;
|
||||
vt.color = vertColor;
|
||||
|
||||
@@ -490,5 +507,14 @@ namespace Coffee.UIExtensions
|
||||
+ (Mathf.FloorToInt(y * PRECISION) << 6)
|
||||
+ 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(Vector4 factor)
|
||||
{
|
||||
return _PackToFloat(Mathf.Clamp01(factor.x), Mathf.Clamp01(factor.y), Mathf.Clamp01(factor.z), Mathf.Clamp01(factor.w));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,6 +54,7 @@ namespace Coffee.UIExtensions
|
||||
[SerializeField] FilterMode m_FilterMode = FilterMode.Bilinear;
|
||||
[SerializeField] Material m_EffectMaterial;
|
||||
[SerializeField][Range(1, 8)] int m_Iterations = 1;
|
||||
[SerializeField] bool m_KeepCanvasSize = true;
|
||||
|
||||
|
||||
//################################
|
||||
@@ -119,6 +120,11 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
public int iterations { get { return m_Iterations; } set { m_Iterations = value; } }
|
||||
|
||||
/// <summary>
|
||||
/// Fits graphic size to the root canvas.
|
||||
/// </summary>
|
||||
public bool keepCanvasSize { get { return m_KeepCanvasSize; } set { m_KeepCanvasSize = value; } }
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the MonoBehaviour will be destroyed.
|
||||
/// </summary>
|
||||
@@ -276,11 +282,15 @@ namespace Coffee.UIExtensions
|
||||
_camera.AddCommandBuffer(kCameraEvent, _buffer);
|
||||
|
||||
// StartCoroutine by CanvasScaler.
|
||||
#if UNITY_5_4_OR_NEWER
|
||||
canvas.rootCanvas.GetComponent<CanvasScaler>().StartCoroutine(_CoUpdateTextureOnNextFrame());
|
||||
#else
|
||||
canvas.GetComponentInParent<CanvasScaler>().StartCoroutine(_CoUpdateTextureOnNextFrame());
|
||||
#endif
|
||||
var rootCanvas = canvas.rootCanvas;
|
||||
var scaler = rootCanvas.GetComponent<CanvasScaler>();
|
||||
scaler.StartCoroutine(_CoUpdateTextureOnNextFrame());
|
||||
if (m_KeepCanvasSize)
|
||||
{
|
||||
var size = (rootCanvas.transform as RectTransform).rect.size;
|
||||
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
|
||||
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+20
-2
@@ -1,4 +1,22 @@
|
||||
# Change Log
|
||||
# Changelog
|
||||
|
||||
## [v2.2.0](https://github.com/mob-sakai/UIEffect/tree/v2.2.0) (2018-04-12)
|
||||
|
||||
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.1.0...v2.2.0)
|
||||
|
||||
**Implemented enhancements:**
|
||||
|
||||
- Feature: Customize shader/material. You can create a custom ui shader and control it with UIEffct. [\#46](https://github.com/mob-sakai/UIEffect/issues/46)
|
||||
- Feature: UIEffectCapturedImage supports keep canvas size. [\#54](https://github.com/mob-sakai/UIEffect/issues/54)
|
||||
- Feature: UIEffectCapturedImage supports `Quality Type` to easy setup. [\#53](https://github.com/mob-sakai/UIEffect/issues/53)
|
||||
|
||||
**Fixed bugs:**
|
||||
|
||||
- Bug: Color effect on shadow is incorrect. [\#55](https://github.com/mob-sakai/UIEffect/issues/55)
|
||||
|
||||
**Closed issues:**
|
||||
|
||||
- Change: Reduce the pixelation effect when tone level = 1. [\#57](https://github.com/mob-sakai/UIEffect/issues/57)
|
||||
|
||||
## [v2.1.0](https://github.com/mob-sakai/UIEffect/tree/v2.1.0) (2018-04-04)
|
||||
|
||||
@@ -134,4 +152,4 @@
|
||||
|
||||
|
||||
|
||||
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
|
||||
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
|
||||
@@ -1,16 +1,16 @@
|
||||
UIEffect
|
||||
===
|
||||
|
||||
UIEffect is an effect component for uGUI.
|
||||
Controls and manipulate visual effect is very easy!
|
||||
UIEffect is an effect component for uGUI in Unity.
|
||||
Let's decorate your UI with effects!
|
||||
|
||||
[](https://github.com/mob-sakai/UIEffect/release)
|
||||
[](https://github.com/mob-sakai/UIEffect/releases)
|
||||

|
||||
[](https://github.com/mob-sakai/UIEffect/blob/master/LICENSE.txt)
|
||||
[](https://github.com/mob-sakai/UIEffect/commits/develop)
|
||||
[](https://github.com/mob-sakai/UIEffect/commits/develop)
|
||||
[](https://github.com/mob-sakai/UIEffect/issues)
|
||||
[](https://github.com/mob-sakai/UIEffect/compare/master...develop)
|
||||
|
||||
|
||||
|
||||
<< [Description](#Description) | [WebGL Demo](#demo) | [Download](https://github.com/mob-sakai/UIEffect/releases) | [Usage](#usage) | [Development Note](#development-note) | [Change log](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md) >>
|
||||
@@ -48,22 +48,26 @@ Controls and manipulate visual effect is very easy!
|
||||
* Diagonal
|
||||
|
||||
|
||||
### Easy to control effect parameters!
|
||||
|
||||

|
||||
|
||||
|
||||
### And, more features!
|
||||
|
||||
* Control the effect parameters without instantiating the material
|
||||
* Control the effect parameter with AnimationClip
|
||||
* Control the effect parameters with AnimationClip
|
||||

|
||||
* Use for screen transition
|
||||

|
||||
* Multiple shadow effect to reduce rendering vertices
|
||||

|
||||
* The captured image with effect, like post effect
|
||||
* UICapturedEffectImage: The captured image with effect, like post effect
|
||||

|
||||
* Dialog window with the captured image effect
|
||||
* UICapturedEffectImage: Dialog window with the captured image effect
|
||||

|
||||
* Change vertex color as gradient, with rotation, offset, color correction
|
||||

|
||||

|
||||
* UIGradient: Change vertex color as gradient, with rotation, offset, color correction
|
||||

|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "UIEffect",
|
||||
"version": "2.1.0",
|
||||
"version": "2.2.0",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/mob-sakai/UIEffect.git"
|
||||
|
||||
+8
-3
@@ -1,8 +1,8 @@
|
||||
#!/bin/bash -xe
|
||||
#!/bin/bash -e
|
||||
|
||||
# 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.beta".
|
||||
# 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.
|
||||
@@ -26,11 +26,16 @@ sed -i -e "s/\"version\": \(.*\)/\"version\": \"${RELEASE_VERSION}\",/g" package
|
||||
TAG=v$RELEASE_VERSION
|
||||
git tag $TAG
|
||||
git push --tags
|
||||
github_changelog_generator
|
||||
github_changelog_generator -t $GITHUB_TOKEN
|
||||
git tag -d $TAG
|
||||
git push --delete origin $TAG
|
||||
|
||||
|
||||
git diff -- CHANGELOG.md
|
||||
read -p "[? continue? (y/N):" yn
|
||||
case "$yn" in [yY]*) ;; *) exit ;; esac
|
||||
|
||||
|
||||
# commit files
|
||||
git add CHANGELOG.md -f
|
||||
git add package.json -f
|
||||
|
||||
Reference in New Issue
Block a user