1.2.1

vonderborch · Apr 13, 2021 · 10b4d1c · 10b4d1c
1 parent fc07fbd
commit 10b4d1c
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 44 deletions.
diff --git a/Velentr.Input/FNA/Velentr.Input.FNA/Velentr.Input.FNA.csproj b/Velentr.Input/FNA/Velentr.Input.FNA/Velentr.Input.FNA.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/vonderborch/Velentr.Input</RepositoryUrl>
     <PackageTags>FNA, Input, Keyboard, Mouse, GamePad, Touch, Voice</PackageTags>
     <Description>A simple and easy-to-use input library for XNA/Monogame/FNA.</Description>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
     <PackageProjectUrl>https://github.com/vonderborch/Velentr.Input</PackageProjectUrl>
     <PackageLicenseExpression></PackageLicenseExpression>
   </PropertyGroup>

diff --git a/Velentr.Input/Monogame/Velentr.Input.Monogame/Velentr.Input.Monogame.csproj b/Velentr.Input/Monogame/Velentr.Input.Monogame/Velentr.Input.Monogame.csproj
@@ -10,7 +10,7 @@
     <PackageTags>Monogame, Input, Keyboard, Mouse, GamePad, Touch, Voice</PackageTags>
     <Description>A simple and easy-to-use input library for XNA/Monogame/FNA.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
     <PackageProjectUrl>https://github.com/vonderborch/Velentr.Input</PackageProjectUrl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Velentr.Input/Velentr.Input.Core/Conditions/AllCondition.cs b/Velentr.Input/Velentr.Input.Core/Conditions/AllCondition.cs
@@ -68,7 +68,7 @@ public AllCondition(InputManager manager, params InputCondition[] conditions) :
         /// <returns></returns>
         public override bool InternalConditionMet(bool consumable, bool allowedIfConsumed)
         {
-            GameTime time = null;
+            TimeSpan time;
             _arguments = new List<ConditionEventArguments>(Conditions.Length);
 
             for (var i = 0; i < Conditions.Length; i++)
@@ -84,7 +84,7 @@ public override bool InternalConditionMet(bool consumable, bool allowedIfConsume
                         return false;
                     }
 
-                    if (time == null || time.TotalGameTime <= Conditions[i].CurrentStateStart.TotalGameTime)
+                    if (time == null || time <= Conditions[i].CurrentStateStart)
                     {
                         time = Conditions[i].CurrentStateStart;
                         _arguments.Add(Conditions[i].GetArguments());

diff --git a/Velentr.Input/Velentr.Input.Core/Conditions/InputCondition.cs b/Velentr.Input/Velentr.Input.Core/Conditions/InputCondition.cs
@@ -1,6 +1,8 @@
-using Microsoft.Xna.Framework;
+using System;
+using Microsoft.Xna.Framework;
 using Velentr.Input.Enums;
 using Velentr.Input.EventArguments;
+using ValueType = Velentr.Input.Enums.ValueType;
 
 namespace Velentr.Input.Conditions
 {
@@ -83,7 +85,7 @@ protected InputCondition(InputManager manager, InputSource source, bool windowMu
         /// <value>
         /// The current state start.
         /// </value>
-        public GameTime CurrentStateStart { get; protected set; }
+        public TimeSpan CurrentStateStart { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether [window must be active].
@@ -115,7 +117,7 @@ protected InputCondition(InputManager manager, InputSource source, bool windowMu
         /// <value>
         /// The last fire time.
         /// </value>
-        public GameTime LastFireTime { get; protected set; }
+        public TimeSpan LastFireTime { get; protected set; }
 
         /// <summary>
         /// Gets the milliseconds when inputs are valid between the condition being met.
@@ -210,11 +212,11 @@ protected void UpdateState(bool newState)
             if (newState != ConditionMetState)
             {
                 ConditionMetState = newState;
-                CurrentStateStart = Manager.CurrentTime;
+                CurrentStateStart = Manager.CurrentTime.TotalGameTime;
 
                 if (newState)
                 {
-                    LastFireTime = null;
+                    LastFireTime = TimeSpan.Zero;
                 }
             }
         }
@@ -231,7 +233,7 @@ protected void ConditionMetCleanup(bool consumable, ConditionEventArguments argu
                 Consume();
             }
 
-            LastFireTime = Manager.CurrentTime;
+            LastFireTime = Manager.CurrentTime.TotalGameTime;
             if (Event.Delegates.Count > 0)
             {
                 Event.TriggerEvent(this, arguments);

diff --git a/Velentr.Input/Velentr.Input.Core/EventArguments/ConditionEventArguments.cs b/Velentr.Input/Velentr.Input.Core/EventArguments/ConditionEventArguments.cs
@@ -13,7 +13,7 @@ public abstract class ConditionEventArguments : EventArgs
 
         public InputCondition Condition { get; internal set; }
 
-        public GameTime ConditionStateStartTime { get; internal set; }
+        public TimeSpan ConditionStateStartTime { get; internal set; }
 
         public uint ConditionStateTimeMilliSeconds { get; internal set; }
 

diff --git a/Velentr.Input/Velentr.Input.Core/Helpers/Helper.cs b/Velentr.Input/Velentr.Input.Core/Helpers/Helper.cs
@@ -12,35 +12,9 @@ public static bool CoordinateInRectangle(Point point, Rectangle rectangle)
             return rectangle.X <= point.X && point.X <= rectangle.Width && rectangle.Y <= point.Y && point.Y <= rectangle.Height;
         }
 
-        public static uint ElapsedSeconds(GameTime startTime, GameTime endTime)
+        public static uint ElapsedMilliSeconds(TimeSpan startTime, GameTime endTime)
         {
-            return Convert.ToUInt32((endTime.TotalGameTime - startTime.TotalGameTime).TotalSeconds);
-        }
-
-        public static uint ElapsedMilliSeconds(GameTime startTime, GameTime endTime)
-        {
-            if (startTime == null && endTime == null)
-            {
-                throw new ArgumentException("At least one time must not be null!");
-            }
-            if (startTime == null)
-            {
-                return Convert.ToUInt32(endTime.TotalGameTime.TotalMilliseconds);
-            }
-            if (endTime == null)
-            {
-                return Convert.ToUInt32(startTime.TotalGameTime.TotalMilliseconds);
-            }
-
-            var start = startTime;
-            var end = endTime;
-            if (start.TotalGameTime > end.TotalGameTime)
-            {
-                start = endTime;
-                end = startTime;
-            }
-
-            return Convert.ToUInt32((end.TotalGameTime - start.TotalGameTime).TotalMilliseconds);
+            return Convert.ToUInt32(Math.Abs((endTime.TotalGameTime - startTime).TotalMilliseconds));
         }
 
         public static Point ScalePointToChild(Point coordinates, Rectangle parentArea, Rectangle childArea)

diff --git a/Velentr.Input/Velentr.Input.Core/Velentr.Input.Core.csproj b/Velentr.Input/Velentr.Input.Core/Velentr.Input.Core.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Velentr.Input</RootNamespace>
     <AssemblyName>Velentr.Input</AssemblyName>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">

diff --git a/Velentr.Input/Velentr.Input.Core/Voice/DefaultVoiceService.cs b/Velentr.Input/Velentr.Input.Core/Voice/DefaultVoiceService.cs
@@ -192,7 +192,7 @@ public override void RemovePhrases(List<string> phrases)
         /// <param name="phrase">The phrase.</param>
         public override void PhraseRecognized(string phrase)
         {
-            _availablePhrases[phrase] = new RecognizedPhrase(phrase, false, Manager.CurrentTime);
+            _availablePhrases[phrase] = new RecognizedPhrase(phrase, false, Manager.CurrentTime.TotalGameTime);
         }
     }
 

diff --git a/Velentr.Input/Velentr.Input.Core/Voice/RecognizedPhrase.cs b/Velentr.Input/Velentr.Input.Core/Voice/RecognizedPhrase.cs
@@ -1,11 +1,12 @@
-using Microsoft.Xna.Framework;
+using System;
+using Microsoft.Xna.Framework;
 
 namespace Velentr.Input.Voice
 {
     public class RecognizedPhrase
     {
 
-        public RecognizedPhrase(string phrase, bool consumed, GameTime timeStamp)
+        public RecognizedPhrase(string phrase, bool consumed, TimeSpan timeStamp)
         {
             Phrase = phrase;
             Consumed = consumed;
@@ -16,6 +17,6 @@ public RecognizedPhrase(string phrase, bool consumed, GameTime timeStamp)
 
         public string Phrase { get; }
 
-        public GameTime PhraseSaid { get; }
+        public TimeSpan PhraseSaid { get; }
     }
 }