com.wallstop-studios.unity-helpers 1.0.0-rc8 → 1.0.1-rc01
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Editor/AnimationEventEditor.cs +21 -5
- package/Runtime/Core/Attributes/ChildComponentAttribute.cs +17 -12
- package/Runtime/Core/Attributes/ParentComponent.cs +15 -12
- package/Runtime/Core/Attributes/SiblingComponentAttribute.cs +10 -7
- package/Runtime/Core/Attributes/ValidateAssignmentAttribute.cs +43 -14
- package/Runtime/Core/Extension/StringExtensions.cs +65 -10
- package/Runtime/Core/Helper/Helpers.cs +107 -51
- package/Runtime/Utils/SpriteRendererMetadata.cs +273 -0
- package/Runtime/Utils/SpriteRendererMetadata.cs.meta +3 -0
- package/Runtime/Utils/SpriteRendererSyncer.cs +98 -0
- package/Runtime/Utils/SpriteRendererSyncer.cs.meta +3 -0
- package/Tests/Runtime/Extensions/StringExtensionTests.cs +31 -0
- package/Tests/Runtime/Extensions/StringExtensionTests.cs.meta +3 -0
- package/Tests/Runtime/Extensions.meta +3 -0
- package/Tests/Runtime/Random/RandomTestBase.cs +16 -8
- package/Tests/Runtime/Utils/SpriteRendererMetadataTests.cs +395 -0
- package/Tests/Runtime/Utils/SpriteRendererMetadataTests.cs.meta +3 -0
- package/Tests/Runtime/Utils.meta +3 -0
- package/package.json +2 -1
- package/Runtime/Core/Attributes/AutomaticallyFindAttribute.cs +0 -43
- package/Runtime/Core/Attributes/AutomaticallyFindAttribute.cs.meta +0 -11
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
namespace UnityHelpers.Utils
|
|
2
|
+
{
|
|
3
|
+
using System;
|
|
4
|
+
using Core.Attributes;
|
|
5
|
+
using UnityEngine;
|
|
6
|
+
using UnityEngine.Serialization;
|
|
7
|
+
|
|
8
|
+
[DisallowMultipleComponent]
|
|
9
|
+
public sealed class SpriteRendererSync : MonoBehaviour
|
|
10
|
+
{
|
|
11
|
+
public int? DynamicSortingOrderOverride { get; set; }
|
|
12
|
+
|
|
13
|
+
public SpriteRenderer DynamicToMatch
|
|
14
|
+
{
|
|
15
|
+
get => GetDynamicSpriteRenderer();
|
|
16
|
+
set => _cachedSpriteRenderer = value;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
[FormerlySerializedAs("_toMatch")]
|
|
20
|
+
public SpriteRenderer toMatch;
|
|
21
|
+
|
|
22
|
+
[FormerlySerializedAs("_matchColor")]
|
|
23
|
+
public bool matchColor;
|
|
24
|
+
|
|
25
|
+
[FormerlySerializedAs("_matchMaterial")]
|
|
26
|
+
public bool matchMaterial;
|
|
27
|
+
|
|
28
|
+
public bool matchSortingLayer = true;
|
|
29
|
+
|
|
30
|
+
public bool matchOrderInLayer = true;
|
|
31
|
+
|
|
32
|
+
public Func<SpriteRenderer> dynamicToMatch;
|
|
33
|
+
|
|
34
|
+
[SerializeField]
|
|
35
|
+
[SiblingComponent]
|
|
36
|
+
private SpriteRenderer _spriteRenderer;
|
|
37
|
+
|
|
38
|
+
private SpriteRenderer _cachedSpriteRenderer;
|
|
39
|
+
|
|
40
|
+
private void Awake()
|
|
41
|
+
{
|
|
42
|
+
if (_spriteRenderer == null)
|
|
43
|
+
{
|
|
44
|
+
this.AssignSiblingComponents();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
private void LateUpdate()
|
|
49
|
+
{
|
|
50
|
+
SpriteRenderer localToMatch = dynamicToMatch != null ? GetDynamicSpriteRenderer() : toMatch;
|
|
51
|
+
if (localToMatch == null)
|
|
52
|
+
{
|
|
53
|
+
_spriteRenderer.sprite = null;
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
_spriteRenderer.sprite = localToMatch.sprite;
|
|
58
|
+
_spriteRenderer.enabled = localToMatch.enabled;
|
|
59
|
+
_spriteRenderer.flipX = localToMatch.flipX;
|
|
60
|
+
_spriteRenderer.flipY = localToMatch.flipY;
|
|
61
|
+
if (matchColor)
|
|
62
|
+
{
|
|
63
|
+
_spriteRenderer.color = localToMatch.color;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
if (matchMaterial)
|
|
67
|
+
{
|
|
68
|
+
_spriteRenderer.material = localToMatch.material;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (matchSortingLayer)
|
|
72
|
+
{
|
|
73
|
+
_spriteRenderer.sortingLayerName = localToMatch.sortingLayerName;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
if (matchOrderInLayer)
|
|
77
|
+
{
|
|
78
|
+
_spriteRenderer.sortingOrder = DynamicSortingOrderOverride ?? localToMatch.sortingOrder;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
_spriteRenderer.size = localToMatch.size;
|
|
82
|
+
_spriteRenderer.spriteSortPoint = localToMatch.spriteSortPoint;
|
|
83
|
+
_spriteRenderer.drawMode = localToMatch.drawMode;
|
|
84
|
+
_spriteRenderer.tileMode = localToMatch.tileMode;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
private SpriteRenderer GetDynamicSpriteRenderer()
|
|
88
|
+
{
|
|
89
|
+
if (_cachedSpriteRenderer != null && _cachedSpriteRenderer.gameObject.activeSelf)
|
|
90
|
+
{
|
|
91
|
+
return _cachedSpriteRenderer;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
_cachedSpriteRenderer = dynamicToMatch();
|
|
95
|
+
return _cachedSpriteRenderer;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
namespace UnityHelpers.Tests.Extensions
|
|
2
|
+
{
|
|
3
|
+
using Core.Extension;
|
|
4
|
+
using NUnit.Framework;
|
|
5
|
+
|
|
6
|
+
public sealed class StringExtensionTests
|
|
7
|
+
{
|
|
8
|
+
[Test]
|
|
9
|
+
public void ToPascalCaseNominal()
|
|
10
|
+
{
|
|
11
|
+
Assert.AreEqual("PascalCase", "PascalCase".ToPascalCase());
|
|
12
|
+
Assert.AreEqual("PascalCase", "pascalCase".ToPascalCase());
|
|
13
|
+
Assert.AreEqual("PascalCase", "_pascalCase".ToPascalCase());
|
|
14
|
+
Assert.AreEqual("PascalCase", "_PascalCase".ToPascalCase());
|
|
15
|
+
Assert.AreEqual("PascalCase", "pascal case".ToPascalCase());
|
|
16
|
+
Assert.AreEqual("PascalCase", " __Pascal____ ___Case__ ".ToPascalCase());
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
[Test]
|
|
20
|
+
public void ToPascalCaseCustomSeparator()
|
|
21
|
+
{
|
|
22
|
+
const string separator = ".";
|
|
23
|
+
Assert.AreEqual("Pascal.Case", "PascalCase".ToPascalCase(separator));
|
|
24
|
+
Assert.AreEqual("Pascal.Case", "pascalCase".ToPascalCase(separator));
|
|
25
|
+
Assert.AreEqual("Pascal.Case", "_pascalCase".ToPascalCase(separator));
|
|
26
|
+
Assert.AreEqual("Pascal.Case", "_PascalCase".ToPascalCase(separator));
|
|
27
|
+
Assert.AreEqual("Pascal.Case", "pascal case".ToPascalCase(separator));
|
|
28
|
+
Assert.AreEqual("Pascal.Case", " __Pascal____ ___Case__ ".ToPascalCase(separator));
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
{
|
|
3
3
|
using System;
|
|
4
4
|
using System.Collections.Generic;
|
|
5
|
-
using System.Diagnostics;
|
|
6
5
|
using System.Linq;
|
|
7
6
|
using NUnit.Framework;
|
|
8
7
|
using UnityHelpers.Core.Random;
|
|
@@ -11,7 +10,7 @@
|
|
|
11
10
|
{
|
|
12
11
|
protected const int SampleCount = 10_000_000;
|
|
13
12
|
|
|
14
|
-
protected int[] _samples = new int[1_000];
|
|
13
|
+
protected readonly int[] _samples = new int[1_000];
|
|
15
14
|
|
|
16
15
|
protected abstract IRandom NewRandom();
|
|
17
16
|
|
|
@@ -48,19 +47,23 @@
|
|
|
48
47
|
[Test]
|
|
49
48
|
public void Byte()
|
|
50
49
|
{
|
|
51
|
-
TestAndVerify(
|
|
50
|
+
TestAndVerify(
|
|
51
|
+
random => random.NextByte(0, (byte)(_samples.Length < byte.MaxValue ? _samples.Length : byte.MaxValue)),
|
|
52
|
+
byte.MaxValue);
|
|
52
53
|
}
|
|
53
54
|
|
|
54
55
|
[Test]
|
|
55
56
|
public void Float()
|
|
56
57
|
{
|
|
57
|
-
TestAndVerify(
|
|
58
|
+
TestAndVerify(
|
|
59
|
+
random => Math.Clamp((int)Math.Floor(random.NextFloat(0, _samples.Length)), 0, _samples.Length - 1));
|
|
58
60
|
}
|
|
59
61
|
|
|
60
62
|
[Test]
|
|
61
63
|
public void Double()
|
|
62
64
|
{
|
|
63
|
-
TestAndVerify(
|
|
65
|
+
TestAndVerify(
|
|
66
|
+
random => Math.Clamp((int)Math.Floor(random.NextDouble(0, _samples.Length)), 0, _samples.Length - 1));
|
|
64
67
|
}
|
|
65
68
|
|
|
66
69
|
[Test]
|
|
@@ -110,8 +113,13 @@
|
|
|
110
113
|
}
|
|
111
114
|
}
|
|
112
115
|
|
|
113
|
-
Assert.AreEqual(
|
|
114
|
-
|
|
116
|
+
Assert.AreEqual(
|
|
117
|
+
0, zeroCountIndexes.Count, "No samples at {0} indices: [{1}]", zeroCountIndexes.Count,
|
|
118
|
+
string.Join(",", zeroCountIndexes));
|
|
119
|
+
Assert.AreEqual(
|
|
120
|
+
0, outsideRange.Count, "{0} indexes outside of dev {1:0.00}. Expected: {2:0.00}. Found: [{3}]",
|
|
121
|
+
outsideRange.Count, deviationAllowed, average,
|
|
122
|
+
string.Join(",", outsideRange.Select(index => _samples[index])));
|
|
115
123
|
}
|
|
116
124
|
}
|
|
117
|
-
}
|
|
125
|
+
}
|
|
@@ -0,0 +1,395 @@
|
|
|
1
|
+
namespace UnityHelpers.Tests.Utils
|
|
2
|
+
{
|
|
3
|
+
using System.Collections;
|
|
4
|
+
using System.Collections.Generic;
|
|
5
|
+
using System.Linq;
|
|
6
|
+
using Core.Helper;
|
|
7
|
+
using Core.Random;
|
|
8
|
+
using NUnit.Framework;
|
|
9
|
+
using UnityEngine;
|
|
10
|
+
using UnityEngine.TestTools;
|
|
11
|
+
using UnityHelpers.Utils;
|
|
12
|
+
|
|
13
|
+
public sealed class SpriteRendererMetadataTests
|
|
14
|
+
{
|
|
15
|
+
private readonly List<GameObject> _spawned = new();
|
|
16
|
+
|
|
17
|
+
[TearDown]
|
|
18
|
+
public void Cleanup()
|
|
19
|
+
{
|
|
20
|
+
foreach (GameObject spawned in _spawned)
|
|
21
|
+
{
|
|
22
|
+
if (spawned == null)
|
|
23
|
+
{
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
Object.Destroy(spawned);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
_spawned.Clear();
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
private SpriteRendererMetadata CreateMetadata()
|
|
34
|
+
{
|
|
35
|
+
GameObject go = new("TestSpriteRendererMetadata", typeof(SpriteRenderer), typeof(SpriteRendererMetadata));
|
|
36
|
+
_spawned.Add(go);
|
|
37
|
+
return go.GetComponent<SpriteRendererMetadata>();
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
private Material CreateMaterial()
|
|
41
|
+
{
|
|
42
|
+
return new Material(Shader.Find("Sprites/Default"));
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
private Color CreateColor()
|
|
46
|
+
{
|
|
47
|
+
IRandom random = PcgRandom.Instance;
|
|
48
|
+
Color color = new(random.NextFloat(), random.NextFloat(), random.NextFloat(), random.NextFloat());
|
|
49
|
+
return color;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
[UnityTest]
|
|
53
|
+
public IEnumerator Initialization()
|
|
54
|
+
{
|
|
55
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
56
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
57
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
58
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
59
|
+
Assert.AreEqual(metadata.OriginalColor, metadata.CurrentColor);
|
|
60
|
+
Assert.AreEqual(metadata.OriginalMaterial, metadata.CurrentMaterial);
|
|
61
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
62
|
+
Assert.IsTrue(metadata.Colors.Contains(metadata.OriginalColor));
|
|
63
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
64
|
+
Assert.IsTrue(metadata.Materials.Contains(metadata.OriginalMaterial));
|
|
65
|
+
yield break;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
[UnityTest]
|
|
69
|
+
public IEnumerator PushColor()
|
|
70
|
+
{
|
|
71
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
72
|
+
Color originalColor = metadata.OriginalColor;
|
|
73
|
+
Color newColor = originalColor;
|
|
74
|
+
Material originalMaterial = metadata.OriginalMaterial;
|
|
75
|
+
do
|
|
76
|
+
{
|
|
77
|
+
newColor.r = PcgRandom.Instance.NextFloat();
|
|
78
|
+
}
|
|
79
|
+
while (newColor == originalColor);
|
|
80
|
+
|
|
81
|
+
SpriteRendererMetadata second = CreateMetadata();
|
|
82
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
83
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
84
|
+
metadata.PushColor(second, newColor);
|
|
85
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
86
|
+
Assert.AreEqual(newColor, metadata.CurrentColor);
|
|
87
|
+
Assert.IsTrue(metadata.Colors.Contains(newColor));
|
|
88
|
+
Assert.AreEqual(originalColor, metadata.OriginalColor);
|
|
89
|
+
Assert.AreEqual(originalMaterial, metadata.CurrentMaterial);
|
|
90
|
+
|
|
91
|
+
Color updatedColor = newColor;
|
|
92
|
+
do
|
|
93
|
+
{
|
|
94
|
+
updatedColor.g = PcgRandom.Instance.NextFloat();
|
|
95
|
+
}
|
|
96
|
+
while (updatedColor == newColor);
|
|
97
|
+
|
|
98
|
+
metadata.PushColor(spriteRenderer, updatedColor);
|
|
99
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
100
|
+
Assert.AreEqual(updatedColor, metadata.CurrentColor);
|
|
101
|
+
Assert.AreEqual(3, metadata.Colors.Count());
|
|
102
|
+
Assert.IsTrue(metadata.Colors.Contains(originalColor));
|
|
103
|
+
Assert.IsTrue(metadata.Colors.Contains(newColor));
|
|
104
|
+
Assert.IsTrue(metadata.Colors.Contains(updatedColor));
|
|
105
|
+
Assert.AreEqual(originalColor, metadata.OriginalColor);
|
|
106
|
+
Assert.AreEqual(originalMaterial, metadata.CurrentMaterial);
|
|
107
|
+
|
|
108
|
+
Color latestColor = updatedColor;
|
|
109
|
+
do
|
|
110
|
+
{
|
|
111
|
+
latestColor.b = PcgRandom.Instance.NextFloat();
|
|
112
|
+
}
|
|
113
|
+
while (latestColor == updatedColor);
|
|
114
|
+
|
|
115
|
+
metadata.PushColor(second, latestColor);
|
|
116
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
117
|
+
Assert.AreEqual(latestColor, metadata.CurrentColor);
|
|
118
|
+
Assert.AreEqual(3, metadata.Colors.Count());
|
|
119
|
+
// Should be replaced
|
|
120
|
+
Assert.IsFalse(metadata.Colors.Contains(newColor));
|
|
121
|
+
do
|
|
122
|
+
{
|
|
123
|
+
newColor.a = PcgRandom.Instance.NextFloat();
|
|
124
|
+
}
|
|
125
|
+
while (newColor == latestColor);
|
|
126
|
+
|
|
127
|
+
metadata.PushColor(second, newColor);
|
|
128
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
129
|
+
Assert.AreEqual(newColor, metadata.CurrentColor);
|
|
130
|
+
Assert.AreEqual(3, metadata.Colors.Count());
|
|
131
|
+
Assert.IsTrue(metadata.Colors.Contains(originalColor));
|
|
132
|
+
Assert.IsTrue(metadata.Colors.Contains(newColor));
|
|
133
|
+
Assert.IsTrue(metadata.Colors.Contains(updatedColor));
|
|
134
|
+
|
|
135
|
+
metadata.PushColor(second, newColor);
|
|
136
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
137
|
+
Assert.AreEqual(newColor, metadata.CurrentColor);
|
|
138
|
+
Assert.AreEqual(3, metadata.Colors.Count());
|
|
139
|
+
Assert.IsTrue(metadata.Colors.Contains(originalColor));
|
|
140
|
+
Assert.IsTrue(metadata.Colors.Contains(newColor));
|
|
141
|
+
Assert.IsTrue(metadata.Colors.Contains(updatedColor));
|
|
142
|
+
yield break;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
[UnityTest]
|
|
146
|
+
public IEnumerator PushColorIdempotent()
|
|
147
|
+
{
|
|
148
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
149
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
150
|
+
Color color = CreateColor();
|
|
151
|
+
|
|
152
|
+
void Verify()
|
|
153
|
+
{
|
|
154
|
+
metadata.PushColor(spriteRenderer, color);
|
|
155
|
+
Assert.AreEqual(spriteRenderer.color, color);
|
|
156
|
+
Assert.AreEqual(color, metadata.CurrentColor);
|
|
157
|
+
Assert.AreEqual(2, metadata.Colors.Count());
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
for (int i = 0; i < 100; ++i)
|
|
161
|
+
{
|
|
162
|
+
Verify();
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
yield break;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
[UnityTest]
|
|
169
|
+
public IEnumerator PushMaterialIdempotent()
|
|
170
|
+
{
|
|
171
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
172
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
173
|
+
Material material = CreateMaterial();
|
|
174
|
+
|
|
175
|
+
void Verify()
|
|
176
|
+
{
|
|
177
|
+
metadata.PushMaterial(spriteRenderer, material);
|
|
178
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
179
|
+
Assert.AreEqual(2, metadata.Materials.Count());
|
|
180
|
+
Assert.IsTrue(metadata.Materials.Contains(spriteRenderer.material));
|
|
181
|
+
Assert.IsTrue(metadata.Materials.Contains(metadata.OriginalMaterial));
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
for (int i = 0; i < 100; ++i)
|
|
185
|
+
{
|
|
186
|
+
Verify();
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
yield break;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
|
|
193
|
+
[UnityTest]
|
|
194
|
+
public IEnumerator PopColorIdempotent()
|
|
195
|
+
{
|
|
196
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
197
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
198
|
+
Color originalColor = spriteRenderer.color;
|
|
199
|
+
Color color = CreateColor();
|
|
200
|
+
metadata.PushColor(spriteRenderer, color);
|
|
201
|
+
|
|
202
|
+
void Verify()
|
|
203
|
+
{
|
|
204
|
+
metadata.PopColor(spriteRenderer);
|
|
205
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
206
|
+
Assert.AreEqual(originalColor, metadata.CurrentColor);
|
|
207
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
for (int i = 0; i < 100; ++i)
|
|
211
|
+
{
|
|
212
|
+
Verify();
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
yield break;
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
[UnityTest]
|
|
219
|
+
public IEnumerator PopMaterialIdempotent()
|
|
220
|
+
{
|
|
221
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
222
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
223
|
+
Material material = CreateMaterial();
|
|
224
|
+
|
|
225
|
+
metadata.PushMaterial(spriteRenderer, material);
|
|
226
|
+
|
|
227
|
+
void Verify()
|
|
228
|
+
{
|
|
229
|
+
metadata.PopMaterial(spriteRenderer);
|
|
230
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
231
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
232
|
+
Assert.IsTrue(metadata.Materials.Contains(spriteRenderer.material));
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
for (int i = 0; i < 100; ++i)
|
|
236
|
+
{
|
|
237
|
+
Verify();
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
yield break;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
[UnityTest]
|
|
244
|
+
public IEnumerator CannotSelfPushColor()
|
|
245
|
+
{
|
|
246
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
247
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
248
|
+
Color color = CreateColor();
|
|
249
|
+
Color originalColor = metadata.OriginalColor;
|
|
250
|
+
metadata.PushColor(metadata, color);
|
|
251
|
+
Assert.AreEqual(originalColor, metadata.CurrentColor);
|
|
252
|
+
Assert.AreEqual(originalColor, spriteRenderer.color);
|
|
253
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
254
|
+
yield break;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
[UnityTest]
|
|
258
|
+
public IEnumerator CannotSelfPopColor()
|
|
259
|
+
{
|
|
260
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
261
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
262
|
+
Color originalColor = metadata.OriginalColor;
|
|
263
|
+
metadata.PopColor(metadata);
|
|
264
|
+
Assert.AreEqual(originalColor, metadata.CurrentColor);
|
|
265
|
+
Assert.AreEqual(originalColor, spriteRenderer.color);
|
|
266
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
267
|
+
yield break;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
[UnityTest]
|
|
271
|
+
public IEnumerator CannotSelfPopMaterial()
|
|
272
|
+
{
|
|
273
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
274
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
275
|
+
Material originalMaterial = metadata.OriginalMaterial;
|
|
276
|
+
metadata.PopMaterial(metadata);
|
|
277
|
+
Assert.AreEqual(originalMaterial, metadata.CurrentMaterial);
|
|
278
|
+
Assert.AreEqual(originalMaterial, spriteRenderer.material);
|
|
279
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
280
|
+
yield break;
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
[UnityTest]
|
|
284
|
+
public IEnumerator CannotSelfPushMaterial()
|
|
285
|
+
{
|
|
286
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
287
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
288
|
+
Material material = CreateMaterial();
|
|
289
|
+
Material originalMaterial = metadata.OriginalMaterial;
|
|
290
|
+
metadata.PushMaterial(metadata, material);
|
|
291
|
+
Assert.AreEqual(originalMaterial, metadata.CurrentMaterial);
|
|
292
|
+
Assert.AreEqual(originalMaterial, spriteRenderer.material);
|
|
293
|
+
Assert.AreNotEqual(material, spriteRenderer.material);
|
|
294
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
295
|
+
yield break;
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
[UnityTest]
|
|
299
|
+
public IEnumerator EnableDisableColor()
|
|
300
|
+
{
|
|
301
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
302
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
303
|
+
Color color = CreateColor();
|
|
304
|
+
metadata.PushColor(spriteRenderer, color);
|
|
305
|
+
Assert.AreEqual(color, metadata.CurrentColor);
|
|
306
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
307
|
+
Assert.AreEqual(2, metadata.Colors.Count());
|
|
308
|
+
|
|
309
|
+
metadata.enabled = false;
|
|
310
|
+
Assert.AreEqual(metadata.OriginalColor, metadata.CurrentColor);
|
|
311
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
312
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
313
|
+
|
|
314
|
+
metadata.enabled = true;
|
|
315
|
+
Assert.AreEqual(color, metadata.CurrentColor);
|
|
316
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
317
|
+
Assert.AreEqual(2, metadata.Colors.Count());
|
|
318
|
+
yield break;
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
[UnityTest]
|
|
322
|
+
public IEnumerator EnableDisableMaterial()
|
|
323
|
+
{
|
|
324
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
325
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
326
|
+
Material material = CreateMaterial();
|
|
327
|
+
metadata.PushMaterial(spriteRenderer, material);
|
|
328
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
329
|
+
Assert.AreEqual(2, metadata.Materials.Count());
|
|
330
|
+
|
|
331
|
+
metadata.enabled = false;
|
|
332
|
+
Assert.AreEqual(metadata.OriginalMaterial, metadata.CurrentMaterial);
|
|
333
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
334
|
+
|
|
335
|
+
metadata.enabled = true;
|
|
336
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
337
|
+
Assert.AreEqual(2, metadata.Materials.Count());
|
|
338
|
+
yield break;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
[UnityTest]
|
|
342
|
+
public IEnumerator EnableDisableWithRemoveColor()
|
|
343
|
+
{
|
|
344
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
345
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
346
|
+
Color color = CreateColor();
|
|
347
|
+
metadata.PushColor(spriteRenderer, color);
|
|
348
|
+
Assert.AreEqual(color, metadata.CurrentColor);
|
|
349
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
350
|
+
Assert.AreEqual(2, metadata.Colors.Count());
|
|
351
|
+
|
|
352
|
+
metadata.enabled = false;
|
|
353
|
+
Assert.AreEqual(metadata.OriginalColor, metadata.CurrentColor);
|
|
354
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
355
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
356
|
+
|
|
357
|
+
metadata.PopColor(spriteRenderer);
|
|
358
|
+
|
|
359
|
+
Assert.AreEqual(metadata.OriginalColor, metadata.CurrentColor);
|
|
360
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
361
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
362
|
+
|
|
363
|
+
metadata.enabled = true;
|
|
364
|
+
Assert.AreEqual(metadata.OriginalColor, metadata.CurrentColor);
|
|
365
|
+
Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
|
|
366
|
+
Assert.AreEqual(1, metadata.Colors.Count());
|
|
367
|
+
yield break;
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
[UnityTest]
|
|
371
|
+
public IEnumerator EnableDisableWithRemoveMaterial()
|
|
372
|
+
{
|
|
373
|
+
SpriteRendererMetadata metadata = CreateMetadata();
|
|
374
|
+
SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
|
|
375
|
+
Material material = CreateMaterial();
|
|
376
|
+
metadata.PushMaterial(spriteRenderer, material);
|
|
377
|
+
Assert.AreEqual(spriteRenderer.material, metadata.CurrentMaterial);
|
|
378
|
+
Assert.AreEqual(2, metadata.Materials.Count());
|
|
379
|
+
|
|
380
|
+
metadata.enabled = false;
|
|
381
|
+
Assert.AreEqual(metadata.OriginalMaterial, metadata.CurrentMaterial);
|
|
382
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
383
|
+
|
|
384
|
+
metadata.PopMaterial(spriteRenderer);
|
|
385
|
+
|
|
386
|
+
Assert.AreEqual(metadata.OriginalMaterial, metadata.CurrentMaterial);
|
|
387
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
388
|
+
|
|
389
|
+
metadata.enabled = true;
|
|
390
|
+
Assert.AreEqual(metadata.OriginalMaterial, metadata.CurrentMaterial);
|
|
391
|
+
Assert.AreEqual(1, metadata.Materials.Count());
|
|
392
|
+
yield break;
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "com.wallstop-studios.unity-helpers",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1-rc01",
|
|
4
4
|
"displayName": "Unity Helpers",
|
|
5
5
|
"description": "Various Unity Helper Library",
|
|
6
6
|
"dependencies": {
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
"random",
|
|
17
17
|
"pcg random",
|
|
18
18
|
"protobuf",
|
|
19
|
+
"pascal",
|
|
19
20
|
"rtree",
|
|
20
21
|
"r tree",
|
|
21
22
|
"kd tree",
|
|
@@ -1,43 +0,0 @@
|
|
|
1
|
-
namespace UnityHelpers.Core.Attributes
|
|
2
|
-
{
|
|
3
|
-
using System;
|
|
4
|
-
using System.Linq;
|
|
5
|
-
using System.Reflection;
|
|
6
|
-
using JetBrains.Annotations;
|
|
7
|
-
using UnityEngine;
|
|
8
|
-
|
|
9
|
-
[AttributeUsage(AttributeTargets.Field)]
|
|
10
|
-
[MeansImplicitUse]
|
|
11
|
-
public sealed class AutomaticallyFindAttribute : Attribute
|
|
12
|
-
{
|
|
13
|
-
public readonly string Tag = string.Empty;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
public static class AutomaticallyFindExtensions
|
|
17
|
-
{
|
|
18
|
-
public static void AutomaticallyFind(this Component component)
|
|
19
|
-
{
|
|
20
|
-
var properties = component
|
|
21
|
-
.GetType()
|
|
22
|
-
.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
|
|
23
|
-
.Where(prop => Attribute.IsDefined(prop, typeof(AutomaticallyFindAttribute)));
|
|
24
|
-
|
|
25
|
-
foreach (FieldInfo field in properties)
|
|
26
|
-
{
|
|
27
|
-
Type fieldType = field.FieldType;
|
|
28
|
-
Type type = fieldType.IsArray ? fieldType.GetElementType() : fieldType;
|
|
29
|
-
|
|
30
|
-
if (type == typeof(GameObject))
|
|
31
|
-
{
|
|
32
|
-
var attribute = field.GetCustomAttributes(typeof(AutomaticallyFindAttribute), false)[0] as AutomaticallyFindAttribute;
|
|
33
|
-
GameObject gameObject = GameObject.FindWithTag(attribute.Tag);
|
|
34
|
-
field.SetValue(component, gameObject);
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
object foundObject = type.GetMethod("Find", BindingFlags.Public | BindingFlags.Static).Invoke(null, null);
|
|
39
|
-
field.SetValue(component, foundObject);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|