com.wallstop-studios.unity-helpers 1.0.1-rc07 → 1.0.1-rc08

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 +19 -21
  2. package/package.json +1 -1
package/Runtime/Utils/MatchColliderToSprite.cs CHANGED
@@ -2,26 +2,25 @@
2
2
  {
3
3
  using System;
4
4
  using System.Collections.Generic;
5
- using Core.Attributes;
6
- using Core.Extension;
7
5
  using UnityEngine;
6
+ using UnityEngine.UI;
8
7
 
9
8
  [DisallowMultipleComponent]
10
9
  public sealed class MatchColliderToSprite : MonoBehaviour
11
10
  {
12
11
  [SerializeField]
13
- [SiblingComponent]
14
12
  private SpriteRenderer _spriteRenderer;
15
-
13
+
14
+ [SerializeField]
15
+ private Image _image;
16
+
16
17
  [SerializeField]
17
- [SiblingComponent]
18
18
  private PolygonCollider2D _collider;
19
19
 
20
20
  private Sprite _lastHandled;
21
21
 
22
22
  private void Awake()
23
23
  {
24
- this.AssignSiblingComponents();
25
24
  OnValidate();
26
25
  }
27
26
 
@@ -38,27 +37,26 @@
38
37
  // Visible for testing
39
38
  public void OnValidate()
40
39
  {
41
- if (_spriteRenderer == null)
40
+ Sprite sprite;
41
+ if (_spriteRenderer != null || TryGetComponent(out _spriteRenderer))
42
+ {
43
+ sprite = _spriteRenderer.sprite;
44
+ }
45
+ else if (_image != null || TryGetComponent(out _image))
46
+ {
47
+ sprite = _image.sprite;
48
+ }
49
+ else
42
50
  {
43
- _spriteRenderer = GetComponent<SpriteRenderer>();
44
- if (_spriteRenderer == null)
45
- {
46
- this.LogError("No SpriteRenderer detected - cannot match collider shape.");
47
- return;
48
- }
51
+ sprite = null;
49
52
  }
50
53
 
51
- if (_collider == null)
54
+ if (_collider == null || !TryGetComponent(out _collider))
52
55
  {
53
- _collider = GetComponent<PolygonCollider2D>();
54
- if (_collider == null)
55
- {
56
- this.LogError("No PolygonCollider2D detected - cannot match collider shape.");
57
- return;
58
- }
56
+ return;
59
57
  }
60
58
 
61
- _lastHandled = _spriteRenderer.sprite;
59
+ _lastHandled = sprite;
62
60
  _collider.points = Array.Empty<Vector2>();
63
61
  if (_lastHandled == null)
64
62
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "com.wallstop-studios.unity-helpers",
3
- "version": "1.0.1-rc07",
3
+ "version": "1.0.1-rc08",
4
4
  "displayName": "Unity Helpers",
5
5
  "description": "Various Unity Helper Library",
6
6
  "dependencies": {