Skip to content

Commit 60cf4a1

Browse files
GuillemscGuillemsc
committed
Cleaning up code
1 parent cb5870b commit 60cf4a1

21 files changed

+114
-269
lines changed

‎Editor/Validation/ValidationEditorUtils.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
using Juce.Core.Validation;
2+
using Juce.Core.Validation.Data;
3+
using Juce.Core.Validation.Enums;
4+
using Juce.Core.Validation.Results;
25
using System.Linq;
36
using UnityEditor;
47

58
namespace Juce.CoreUnity.Validation
69
{
710
public static class ValidationEditorUtils
811
{
9-
public static void DrawValidationResult(ValidationResult validationResult)
12+
public static void DrawValidationResult(IValidationResult validationResult)
1013
{
1114
using (new EditorGUILayout.VerticalScope(EditorStyles.helpBox))
1215
{
1316
EditorGUILayout.LabelField("Validation", EditorStyles.boldLabel);
1417
EditorGUILayout.LabelField($"Result: {validationResult.ValidationResultType}");
1518

16-
IOrderedEnumerable<ValidationLog> validationLogs = validationResult.ValidationLogs.OrderBy(i => i.LogType);
19+
IOrderedEnumerable<IValidationLog> validationLogs = validationResult.ValidationLogs.OrderBy(i => i.ValidationLogType);
1720

18-
foreach (ValidationLog validationLog in validationLogs)
21+
foreach (IValidationLog validationLog in validationLogs)
1922
{
20-
switch (validationLog.LogType)
23+
switch (validationLog.ValidationLogType)
2124
{
2225
case ValidationLogType.Info:
2326
{

‎Examples/Scripts/Ui/Utils/ScreenCornersExample.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ public class ScreenCornersExample : MonoBehaviour
77
[SerializeField] private RectTransform rectTransform = default;
88
[SerializeField] private RectTransform parentRectTransform = default;
99

10-
private void Start()
11-
{
12-
13-
}
14-
1510
private void Update()
1611
{
1712
Rect screenBoundsRectPosition = UiUtils.GetScreenBoundsRectPositionOverlayCamera(

‎Runtime/Animation2D/Animation2D.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
namespace Juce.CoreUnity.Animation2D
55
{
66
[System.Serializable]
7-
public class Animation2D
7+
public sealed class Animation2D
88
{
99
[SerializeField] private string name = default;
1010
[SerializeField] private bool loop = default;
11-
[SerializeField] private float playback_speed = default;
11+
[SerializeField] private float playbackSpeed = default;
1212
[SerializeField] private List<Sprite> sprites = default;
1313

1414
public string Name => name;
1515
public bool Loop => loop;
16-
public float PlaybackSpeed => playback_speed;
16+
public float PlaybackSpeed => playbackSpeed;
1717
public IReadOnlyList<Sprite> Sprites => sprites;
1818
}
1919
}

‎Runtime/Animation2D/Animation2DPack.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Juce.CoreUnity.Animation2D
55
{
66
[CreateAssetMenu(fileName = "Animation2DPack", menuName = "Juce/Animation2D/Animation2DPack", order = 1)]
7-
public class Animation2DPack : ScriptableObject
7+
public sealed class Animation2DPack : ScriptableObject
88
{
99
[SerializeField] private List<Animation2D> animations = new List<Animation2D>();
1010

‎Runtime/Animation2D/Animator2D.cs‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Juce.Core.Time;
2+
using Juce.CoreUnity.Time;
23
using Juce.Extensions;
34
using System;
45
using UnityEngine;
@@ -7,7 +8,7 @@ namespace Juce.CoreUnity.Animation2D
78
{
89
[RequireComponent(typeof(SpriteRenderer))]
910
[ExecuteAlways]
10-
public class Animator2D : MonoBehaviour
11+
public sealed class Animator2D : MonoBehaviour
1112
{
1213
[SerializeField] [HideInInspector] private SpriteRenderer spriteRenderer = default;
1314
[SerializeField] [HideInInspector] private Animation2DPack animationPack = default;
@@ -16,7 +17,7 @@ public class Animator2D : MonoBehaviour
1617
private bool playinganimationNeedsToStart;
1718
private int playingAnimationSpriteIndex;
1819

19-
public ITimer Timer { get; set; }
20+
public ITimer Timer { get; set; } = new ScaledUnityTimer();
2021

2122
public bool FlipX
2223
{
@@ -36,22 +37,6 @@ private void Update()
3637
UpdatePlayingAnimation();
3738
}
3839

39-
private void Init(Animation2DPack animationPack, ITimer timer)
40-
{
41-
if (animationPack == null)
42-
{
43-
throw new ArgumentNullException($"{nameof(Animation2DPack)} cannot be null on {nameof(Animator2D)}");
44-
}
45-
46-
if (timer == null)
47-
{
48-
throw new ArgumentNullException($"{nameof(ITimer)} cannot be null on {nameof(Animator2D)}");
49-
}
50-
51-
this.animationPack = animationPack;
52-
Timer = timer;
53-
}
54-
5540
private void TryGetSpriteRenderer()
5641
{
5742
if (spriteRenderer != null)
@@ -62,11 +47,12 @@ private void TryGetSpriteRenderer()
6247
spriteRenderer = gameObject.GetOrAddComponent<SpriteRenderer>();
6348
}
6449

65-
private Animation2D GetAnimation(string name)
50+
private bool TryGetAnimation(string name, out Animation2D animation2D)
6651
{
6752
if (animationPack == null)
6853
{
69-
throw new Exception($"{nameof(Animation2DPack)} cannot be null on {nameof(Animator2D)}");
54+
animation2D = default;
55+
return false;
7056
}
7157

7258
for (int i = 0; i < animationPack.Animations.Count; ++i)
@@ -75,31 +61,33 @@ private Animation2D GetAnimation(string name)
7561

7662
if (string.Equals(currAnimation.Name, name))
7763
{
78-
return currAnimation;
64+
animation2D = currAnimation;
65+
return true;
7966
}
8067
}
8168

82-
return null;
69+
animation2D = default;
70+
return false;
8371
}
8472

85-
public void PlayAnimation(string name)
73+
public void PlayAnimation(string animationName)
8674
{
8775
if (playingAnimation != null)
8876
{
89-
if (string.Equals(playingAnimation.Name, name))
77+
if (string.Equals(playingAnimation.Name, animationName))
9078
{
9179
return;
9280
}
9381
}
9482

95-
Animation2D animationToPlay = GetAnimation(name);
83+
bool animationFound = TryGetAnimation(animationName, out Animation2D animaion);
9684

97-
if (animationToPlay == null)
85+
if (!animationFound)
9886
{
9987
return;
10088
}
10189

102-
playingAnimation = animationToPlay;
90+
playingAnimation = animaion;
10391
playinganimationNeedsToStart = true;
10492
}
10593

@@ -115,11 +103,6 @@ private void UpdatePlayingAnimation()
115103
return;
116104
}
117105

118-
if (Timer == null)
119-
{
120-
throw new Exception($"{nameof(ITimer)} cannot be null on {nameof(Animator2D)}");
121-
}
122-
123106
if (playinganimationNeedsToStart)
124107
{
125108
playinganimationNeedsToStart = false;

‎Runtime/Contexts/ContextFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Juce.CoreUnity.Contexts
1010
{
11-
public class ContextFactory<TInteractor, TInstance> : IContextFactory<TInteractor, TInstance> where TInstance : MonoBehaviour
11+
public sealed class ContextFactory<TInteractor, TInstance> : IContextFactory<TInteractor, TInstance> where TInstance : MonoBehaviour
1212
{
1313
private readonly string contextSceneName;
1414
private readonly bool setAsActiveScene;

‎Runtime/Contracts/Contract.cs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Runtime/Contracts/Contract.cs.meta‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

Runtime/Contracts.meta renamed to Runtime/Physics/Callbacks.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Runtime/Physics/Callbacks/PhysicsCallbacks.cs‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
using Juce.Core.Events.Generic;
2+
using UnityEngine;
3+
4+
namespace Juce.CoreUnity.Physics.Callbacks
5+
{
6+
public class PhysicsCallbacks : MonoBehaviour
7+
{
8+
public event GenericEvent<PhysicsCallbacks, Collision> OnPhysicsCollisionEnter;
9+
public event GenericEvent<PhysicsCallbacks, Collision> OnPhysicsCollisionStay;
10+
public event GenericEvent<PhysicsCallbacks, Collision> OnPhysicsCollisionExit;
11+
12+
public event GenericEvent<PhysicsCallbacks, Collision2D> OnPhysicsCollisionEnter2D;
13+
public event GenericEvent<PhysicsCallbacks, Collision2D> OnPhysicsCollisionStay2D;
14+
public event GenericEvent<PhysicsCallbacks, Collision2D> OnPhysicsCollisionExit2D;
15+
16+
public event GenericEvent<PhysicsCallbacks, Collider> OnPhysicsTriggerEnter;
17+
public event GenericEvent<PhysicsCallbacks, Collider> OnPhysicsTriggerStay;
18+
public event GenericEvent<PhysicsCallbacks, Collider> OnPhysicsTriggerExit;
19+
20+
public event GenericEvent<PhysicsCallbacks, Collider2D> OnPhysicsTriggerEnter2D;
21+
public event GenericEvent<PhysicsCallbacks, Collider2D> OnPhysicsTriggerStay2D;
22+
public event GenericEvent<PhysicsCallbacks, Collider2D> OnPhysicsTriggerExit2D;
23+
24+
private void OnCollisionEnter(Collision collision)
25+
{
26+
OnPhysicsCollisionEnter?.Invoke(this, collision);
27+
}
28+
29+
private void OnCollisionStay(Collision collision)
30+
{
31+
OnPhysicsCollisionStay?.Invoke(this, collision);
32+
}
33+
34+
private void OnCollisionExit(Collision collision)
35+
{
36+
OnPhysicsCollisionExit?.Invoke(this, collision);
37+
}
38+
39+
private void OnCollisionEnter2D(Collision2D collision)
40+
{
41+
OnPhysicsCollisionEnter2D?.Invoke(this, collision);
42+
}
43+
44+
private void OnCollisionStay2D(Collision2D collision)
45+
{
46+
OnPhysicsCollisionStay2D?.Invoke(this, collision);
47+
}
48+
49+
private void OnCollisionExit2D(Collision2D collision)
50+
{
51+
OnPhysicsCollisionExit2D?.Invoke(this, collision);
52+
}
53+
54+
private void OnTriggerEnter(Collider collision)
55+
{
56+
OnPhysicsTriggerEnter?.Invoke(this, collision);
57+
}
58+
59+
private void OnTriggerStay(Collider collision)
60+
{
61+
OnPhysicsTriggerStay?.Invoke(this, collision);
62+
}
63+
64+
private void OnTriggerExit(Collider collision)
65+
{
66+
OnPhysicsTriggerExit?.Invoke(this, collision);
67+
}
68+
69+
private void OnTriggerEnter2D(Collider2D collision)
70+
{
71+
OnPhysicsTriggerEnter2D?.Invoke(this, collision);
72+
}
73+
74+
private void OnTriggerStay2D(Collider2D collision)
75+
{
76+
OnPhysicsTriggerStay2D?.Invoke(this, collision);
77+
}
78+
79+
private void OnTriggerExit2D(Collider2D collision)
80+
{
81+
OnPhysicsTriggerExit2D?.Invoke(this, collision);
82+
}
83+
}
84+
}

0 commit comments

Comments
 (0)