com.wallstop-studios.unity-helpers 2.0.0-rc17 → 2.0.0-rc18

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.
Files changed (2) hide show
  1. package/Runtime/Utils/MatchColliderToSprite.cs +34 -22
  2. package/package.json +1 -1
package/Runtime/Utils/MatchColliderToSprite.cs CHANGED
@@ -3,19 +3,22 @@
3
3
  using System;
4
4
  using System.Collections.Generic;
5
5
  using UnityEngine;
6
+ using UnityEngine.Serialization;
6
7
  using UnityEngine.UI;
7
8
 
8
9
  [DisallowMultipleComponent]
9
10
  public sealed class MatchColliderToSprite : MonoBehaviour
10
11
  {
11
- [SerializeField]
12
- private SpriteRenderer _spriteRenderer;
12
+ public Func<Sprite> spriteOverrideProducer;
13
13
 
14
- [SerializeField]
15
- private Image _image;
14
+ [FormerlySerializedAs("_spriteRenderer")]
15
+ public SpriteRenderer spriteRenderer;
16
16
 
17
- [SerializeField]
18
- private PolygonCollider2D _collider;
17
+ [FormerlySerializedAs("_image")]
18
+ public Image image;
19
+
20
+ [FormerlySerializedAs("_collider")]
21
+ public PolygonCollider2D polygonCollider;
19
22
 
20
23
  private Sprite _lastHandled;
21
24
 
@@ -26,12 +29,17 @@
26
29
 
27
30
  private void Update()
28
31
  {
29
- if (_spriteRenderer != null && _lastHandled == _spriteRenderer.sprite)
32
+ if (spriteOverrideProducer != null && _lastHandled == spriteOverrideProducer())
33
+ {
34
+ return;
35
+ }
36
+
37
+ if (spriteRenderer != null && _lastHandled == spriteRenderer.sprite)
30
38
  {
31
39
  return;
32
40
  }
33
41
 
34
- if (_image != null && _lastHandled == _image.sprite)
42
+ if (image != null && _lastHandled == image.sprite)
35
43
  {
36
44
  return;
37
45
  }
@@ -41,42 +49,46 @@
41
49
 
42
50
  public void OnValidate()
43
51
  {
52
+ if (polygonCollider == null && !TryGetComponent(out polygonCollider))
53
+ {
54
+ return;
55
+ }
56
+
44
57
  Sprite sprite;
45
- if (_spriteRenderer != null || TryGetComponent(out _spriteRenderer))
58
+ if (spriteOverrideProducer != null)
46
59
  {
47
- sprite = _spriteRenderer.sprite;
60
+ sprite = spriteOverrideProducer();
48
61
  }
49
- else if (_image != null || TryGetComponent(out _image))
62
+ else if (spriteRenderer != null || TryGetComponent(out spriteRenderer))
50
63
  {
51
- sprite = _image.sprite;
64
+ sprite = spriteRenderer.sprite;
52
65
  }
53
- else
66
+ else if (image != null || TryGetComponent(out image))
54
67
  {
55
- sprite = null;
68
+ sprite = image.sprite;
56
69
  }
57
-
58
- if (_collider == null || !TryGetComponent(out _collider))
70
+ else
59
71
  {
60
- return;
72
+ sprite = null;
61
73
  }
62
74
 
63
75
  _lastHandled = sprite;
64
- _collider.points = Array.Empty<Vector2>();
76
+ polygonCollider.points = Array.Empty<Vector2>();
65
77
  if (_lastHandled == null)
66
78
  {
67
- _collider.pathCount = 0;
79
+ polygonCollider.pathCount = 0;
68
80
  return;
69
81
  }
70
82
 
71
83
  int physicsShapes = _lastHandled.GetPhysicsShapeCount();
72
- _collider.pathCount = physicsShapes;
84
+ polygonCollider.pathCount = physicsShapes;
73
85
  List<Vector2> buffer = Buffers<Vector2>.List;
74
86
  for (int i = 0; i < physicsShapes; ++i)
75
87
  {
76
88
  buffer.Clear();
77
89
  _ = _lastHandled.GetPhysicsShape(i, buffer);
78
- _collider.SetPath(i, buffer);
90
+ polygonCollider.SetPath(i, buffer);
79
91
  }
80
92
  }
81
93
  }
82
- }
94
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "com.wallstop-studios.unity-helpers",
3
- "version": "2.0.0-rc17",
3
+ "version": "2.0.0-rc18",
4
4
  "displayName": "Unity Helpers",
5
5
  "description": "Various Unity Helper Library",
6
6
  "dependencies": {},