Clearning + fixes

Author: Dimonik333

Assets/Plugins/CatCode/IntervalTimers/Scripts/Processors/DeltaTimeProcessors/SingleInvokeDeltaTimeProcessor.cs

@@ -33,15 +33,15 @@ protected override bool MoveNextCore()
             var completedTicks = TickData.CompletedTicks;
             var totalTicks = TickData.TotalTicks;
 
-            var ticks = Mathf.FloorToInt(elapsedTime / interval);            
+            var ticks = Mathf.FloorToInt(elapsedTime / interval);
             var remainingTime = elapsedTime % interval;
             var newCompletedTicks = completedTicks + ticks;
 
             var result = true;
             if (totalTicks > 0 && newCompletedTicks >= totalTicks)
             {
                 ticks = Mathf.Min(newCompletedTicks, totalTicks) - completedTicks;
-                remainingTime = ticks * interval;
+                remainingTime = elapsedTime - ticks * interval;
                 result = false;
             }
 

Assets/Plugins/CatCode/IntervalTimers/Scripts/Timers/DateTimeTimer.cs

@@ -58,8 +58,8 @@ protected override TimerProcessor GetProcessor(Action onFinished)
         private DateTimeProcessor CreateProcessor(TimerMode mode)
             => mode switch
             {
-                TimerMode.Dynamic => DynamicDateTimeProcessor.Create(),
-                TimerMode.Multi => MultiInvokeDateTimeProcessor.Create(),
+                TimerMode.MultipleDynamic => DynamicDateTimeProcessor.Create(),
+                TimerMode.MultiplePrecalc => MultiInvokeDateTimeProcessor.Create(),
                 TimerMode.Single => SingleInvokeDateTimeProcessor.Create(),
                 _ => DynamicDateTimeProcessor.Create(),
             };

Assets/Plugins/CatCode/IntervalTimers/Scripts/Timers/DeltaTimeTimer.cs

@@ -62,8 +62,8 @@ protected override TimerProcessor GetProcessor(Action onFinished)
         private DeltaTimeProcessor CreateProcessor(TimerMode mode)
             => mode switch
             {
-                TimerMode.Dynamic => DynamicDeltaTimeProcessor.Create(),
-                TimerMode.Multi => MultiInvokeDeltaTimeProcessor.Create(),
+                TimerMode.MultipleDynamic => DynamicDeltaTimeProcessor.Create(),
+                TimerMode.MultiplePrecalc => MultiInvokeDeltaTimeProcessor.Create(),
                 TimerMode.Single => SingleInvokeDeltaTimeProcessor.Create(),
                 _ => DynamicDeltaTimeProcessor.Create(),
             };

Assets/Plugins/CatCode/IntervalTimers/Scripts/Timers/IntervalTimer.cs

@@ -8,7 +8,7 @@ public abstract class IntervalTimer
         private TimerState _state = TimerState.Idle;
         private PlayerLoopTiming _playerLoopTiming = PlayerLoopTiming.Update;
 
-        protected TimerMode _mode = TimerMode.Dynamic;
+        protected TimerMode _mode = TimerMode.MultipleDynamic;
         protected TimerProcessor _processor;
 
         protected readonly TimerTickData _tickData = new();
@@ -43,6 +43,16 @@ public int TotalTicks
             set => _tickData.TotalTicks = value;
         }
 
+        public int CompletedTicks
+        {
+            get => _tickData.CompletedTicks;
+            set
+            {
+                _tickData.CompletedTicks = value;
+                SetInitialized();
+            }
+        }
+
         public TimerMode Mode
         {
             get => _mode;
@@ -55,17 +65,7 @@ public PlayerLoopTiming PlayerLoopTimiming
             set => _playerLoopTiming = value;
         }
 
-        public int CompletedTicks
-        {
-            get => _tickData.CompletedTicks;
-            set
-            {
-                _tickData.CompletedTicks = value;
-                SetInitialized();
-            }
-        }
-
-        public int TicksCount => _tickInfo.TicksCount;
+        public int FrameTicksCount => _tickInfo.TicksCount;
 
         public event Action Started;
         public event Action Stopped;

Assets/Plugins/CatCode/IntervalTimers/Scripts/Timers/RealtimeTimer.cs

@@ -59,8 +59,8 @@ protected override TimerProcessor GetProcessor(Action onFinished)
         private RealtimeProcessor CreateProcessor(TimerMode mode)
             => mode switch
             {
-                TimerMode.Dynamic => DynamicRealtimeProcessor.Create(),
-                TimerMode.Multi => MultiInvokeRealtimeProcessor.Create(),
+                TimerMode.MultipleDynamic => DynamicRealtimeProcessor.Create(),
+                TimerMode.MultiplePrecalc => MultiInvokeRealtimeProcessor.Create(),
                 TimerMode.Single => SingleInvokeRealtimeProcessor.Create(),
                 _ => DynamicRealtimeProcessor.Create()
             };

Assets/Plugins/CatCode/IntervalTimers/Scripts/Timers/TimerMode.cs

@@ -3,8 +3,8 @@ namespace CatCode.Timers
 {
     public enum TimerMode
     {
-        Dynamic,
-        Multi,
+        MultipleDynamic,
+        MultiplePrecalc,
         Single
     }
 }