Skip to content

Commit b70c066

Browse files
committed
release v1.0.0
2 parents f3f27bd + 308dd3b commit b70c066

File tree

5 files changed

+47
-16
lines changed

5 files changed

+47
-16
lines changed

Assets/Coffee/UIExtensions/UnmaskForUGUI/Demo/Unmask_Demo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Unmask_Demo : MonoBehaviour
1616

1717
public void AutoFitToButton(bool flag)
1818
{
19-
unmask.autoFitTarget = flag ? (target.transform as RectTransform) : null;
19+
unmask.fitOnLateUpdate = flag;
2020
}
2121

2222
public void SetTransitionColor(bool flag)

Assets/Coffee/UIExtensions/UnmaskForUGUI/Demo/Unmask_Demo.unity

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,8 @@ MonoBehaviour:
675675
m_Script: {fileID: 11500000, guid: f752d3a51152f4e44a3ebe45ae24abcc, type: 3}
676676
m_Name:
677677
m_EditorClassIdentifier:
678-
m_AutoFitTarget: {fileID: 0}
678+
m_FitTarget: {fileID: 0}
679+
m_FitOnLateUpdate: 0
679680
m_ShowUnmaskGraphic: 0
680681
--- !u!114 &323196831
681682
MonoBehaviour:
@@ -995,7 +996,8 @@ MonoBehaviour:
995996
m_Script: {fileID: 11500000, guid: f752d3a51152f4e44a3ebe45ae24abcc, type: 3}
996997
m_Name:
997998
m_EditorClassIdentifier:
998-
m_AutoFitTarget: {fileID: 0}
999+
m_FitTarget: {fileID: 0}
1000+
m_FitOnLateUpdate: 0
9991001
m_ShowUnmaskGraphic: 0
10001002
--- !u!114 &427535255
10011003
MonoBehaviour:
@@ -1316,7 +1318,8 @@ MonoBehaviour:
13161318
m_Script: {fileID: 11500000, guid: f752d3a51152f4e44a3ebe45ae24abcc, type: 3}
13171319
m_Name:
13181320
m_EditorClassIdentifier:
1319-
m_AutoFitTarget: {fileID: 0}
1321+
m_FitTarget: {fileID: 0}
1322+
m_FitOnLateUpdate: 0
13201323
m_ShowUnmaskGraphic: 1
13211324
--- !u!114 &474546653
13221325
MonoBehaviour:
@@ -1541,7 +1544,8 @@ MonoBehaviour:
15411544
m_Script: {fileID: 11500000, guid: f752d3a51152f4e44a3ebe45ae24abcc, type: 3}
15421545
m_Name:
15431546
m_EditorClassIdentifier:
1544-
m_AutoFitTarget: {fileID: 0}
1547+
m_FitTarget: {fileID: 0}
1548+
m_FitOnLateUpdate: 0
15451549
m_ShowUnmaskGraphic: 0
15461550
--- !u!114 &653262226
15471551
MonoBehaviour:
@@ -4051,7 +4055,8 @@ MonoBehaviour:
40514055
m_Script: {fileID: 11500000, guid: f752d3a51152f4e44a3ebe45ae24abcc, type: 3}
40524056
m_Name:
40534057
m_EditorClassIdentifier:
4054-
m_AutoFitTarget: {fileID: 2026878700}
4058+
m_FitTarget: {fileID: 2026878700}
4059+
m_FitOnLateUpdate: 1
40554060
m_ShowUnmaskGraphic: 0
40564061
--- !u!114 &1934621014
40574062
MonoBehaviour:

Assets/Coffee/UIExtensions/UnmaskForUGUI/Scripts/Unmask.cs

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ public class Unmask : MonoBehaviour, IMaterialModifier
2323
//################################
2424
// Serialize Members.
2525
//################################
26-
[Tooltip("Fit graphic's transform to target transform on LateUpdate.")]
27-
[SerializeField] RectTransform m_AutoFitTarget;
26+
[Tooltip("Fit graphic's transform to target transform.")]
27+
[SerializeField] RectTransform m_FitTarget;
28+
[Tooltip("Fit graphic's transform to target transform on LateUpdate every frame.")]
29+
[SerializeField] bool m_FitOnLateUpdate;
2830
[Tooltip("Show the graphic that is associated with the unmask render area.")]
2931
[SerializeField] bool m_ShowUnmaskGraphic = false;
3032

@@ -38,9 +40,22 @@ public class Unmask : MonoBehaviour, IMaterialModifier
3840
public Graphic graphic{ get { return _graphic ?? (_graphic = GetComponent<Graphic>()); } }
3941

4042
/// <summary>
41-
/// Fit graphic's transform to target transform on LateUpdate.
43+
/// Fit graphic's transform to target transform.
4244
/// </summary>
43-
public RectTransform autoFitTarget{ get { return m_AutoFitTarget; } set { m_AutoFitTarget = value; } }
45+
public RectTransform fitTarget
46+
{
47+
get { return m_FitTarget; }
48+
set
49+
{
50+
m_FitTarget = value;
51+
FitTo(m_FitTarget);
52+
}
53+
}
54+
55+
/// <summary>
56+
/// Fit graphic's transform to target transform on LateUpdate every frame.
57+
/// </summary>
58+
public bool fitOnLateUpdate{ get { return m_FitOnLateUpdate; } set { m_FitOnLateUpdate = value; } }
4459

4560
/// <summary>
4661
/// Show the graphic that is associated with the unmask render area.
@@ -72,7 +87,6 @@ public Material GetModifiedMaterial(Material baseMaterial)
7287

7388
StencilMaterial.Remove(_unmaskMaterial);
7489
_unmaskMaterial = StencilMaterial.Add(baseMaterial, (1 << stencilDepth) - 1, StencilOp.Zero, CompareFunction.Always, m_ShowUnmaskGraphic ? ColorWriteMask.All : (ColorWriteMask)0, 0, (1 << stencilDepth) - 1);
75-
//StencilMaterial.Remove (baseMaterial);
7690

7791
return _unmaskMaterial;
7892
}
@@ -107,9 +121,9 @@ public void FitTo(RectTransform target)
107121
/// </summary>
108122
void OnEnable()
109123
{
110-
if (m_AutoFitTarget)
124+
if (m_FitTarget)
111125
{
112-
FitTo(m_AutoFitTarget);
126+
FitTo(m_FitTarget);
113127
}
114128
SetDirty();
115129
}
@@ -129,9 +143,13 @@ void OnDisable()
129143
/// </summary>
130144
void LateUpdate()
131145
{
132-
if (m_AutoFitTarget)
146+
#if UNITY_EDITOR
147+
if (m_FitTarget && (m_FitOnLateUpdate || !Application.isPlaying))
148+
#else
149+
if (m_FitTarget && m_FitOnLateUpdate)
150+
#endif
133151
{
134-
FitTo(m_AutoFitTarget);
152+
FitTo(m_FitTarget);
135153
}
136154
}
137155

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [v1.0.0](https://github.com/mob-sakai/UnmaskForUGUI/tree/v1.0.0) (2018-10-19)
4+
5+
[Full Changelog](https://github.com/mob-sakai/UnmaskForUGUI/compare/v0.2.0...v1.0.0)
6+
7+
**Implemented enhancements:**
8+
9+
- Add `Fit On LateUpdate` option [\#10](https://github.com/mob-sakai/UnmaskForUGUI/issues/10)
10+
311
## [v0.2.0](https://github.com/mob-sakai/UnmaskForUGUI/tree/v0.2.0) (2018-10-16)
412

513
[Full Changelog](https://github.com/mob-sakai/UnmaskForUGUI/compare/v0.1.0...v0.2.0)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "UnmaskForUGUI",
3-
"version": "0.2.0",
3+
"version": "1.0.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/mob-sakai/UnmaskForUGUI.git"

0 commit comments

Comments
 (0)