rename Haptics (#2176)

kniEngine · Jan 8, 2025 · 47be096 · 47be096
1 parent 21216ef
commit 47be096
Show file tree

Hide file tree

Showing 29 changed files with 55 additions and 55 deletions.
diff --git a/Platforms/Devices/.Android/ConcreteDevicesFactory.cs b/Platforms/Devices/.Android/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/...orms/Devices/.Android/ConcreteVibrator.cs → ...forms/Devices/.Android/ConcreteHaptics.cs b/...orms/Devices/.Android/ConcreteVibrator.cs → ...forms/Devices/.Android/ConcreteHaptics.cs
@@ -6,12 +6,12 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
         Android.OS.Vibrator _nativeVibrator;
         private bool _hasVibrator = true;
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
             _nativeVibrator = (Android.OS.Vibrator)Android.App.Application.Context.GetSystemService(Android.Content.Context.VibratorService);
             try

diff --git a/Platforms/Devices/.Blazor/ConcreteDevicesFactory.cs b/Platforms/Devices/.Blazor/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/...forms/Devices/.Blazor/ConcreteVibrator.cs → Platforms/Devices/.Blazor/ConcreteHaptics.cs b/...forms/Devices/.Blazor/ConcreteVibrator.cs → Platforms/Devices/.Blazor/ConcreteHaptics.cs
@@ -7,10 +7,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
         }
 

diff --git a/Platforms/Devices/.Ref/ConcreteDevicesFactory.cs b/Platforms/Devices/.Ref/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/Platforms/Devices/.Ref/ConcreteVibrator.cs → Platforms/Devices/.Ref/ConcreteHaptics.cs b/Platforms/Devices/.Ref/ConcreteVibrator.cs → Platforms/Devices/.Ref/ConcreteHaptics.cs
@@ -6,10 +6,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
             throw new PlatformNotSupportedException();
         }

diff --git a/Platforms/Devices/.SDL2/ConcreteDevicesFactory.cs b/Platforms/Devices/.SDL2/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/Platforms/Devices/.UAP/ConcreteVibrator.cs → Platforms/Devices/.SDL2/ConcreteHaptics.cs b/Platforms/Devices/.UAP/ConcreteVibrator.cs → Platforms/Devices/.SDL2/ConcreteHaptics.cs
@@ -6,10 +6,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
         }
 

diff --git a/Platforms/Devices/.UAP/ConcreteDevicesFactory.cs b/Platforms/Devices/.UAP/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/Platforms/Devices/.iOS/ConcreteVibrator.cs → Platforms/Devices/.UAP/ConcreteHaptics.cs b/Platforms/Devices/.iOS/ConcreteVibrator.cs → Platforms/Devices/.UAP/ConcreteHaptics.cs
@@ -6,10 +6,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
         }
 

diff --git a/Platforms/Devices/.WindowsDX/ConcreteDevicesFactory.cs b/Platforms/Devices/.WindowsDX/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/...ms/Devices/.WindowsDX/ConcreteVibrator.cs → ...rms/Devices/.WindowsDX/ConcreteHaptics.cs b/...ms/Devices/.WindowsDX/ConcreteVibrator.cs → ...rms/Devices/.WindowsDX/ConcreteHaptics.cs
@@ -6,10 +6,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
         }
 

diff --git a/Platforms/Devices/.iOS/ConcreteDevicesFactory.cs b/Platforms/Devices/.iOS/ConcreteDevicesFactory.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Xna.Platform.Devices
     public sealed class ConcreteDevicesFactory : DevicesFactory
     {
 
-        public override VibratorStrategy CreateVibratorStrategy()
+        public override HapticsStrategy CreateConcreteHapticsStrategy()
         {
-            return new ConcreteVibrator();
+            return new ConcreteHaptics();
         }
 
         public override SensorServiceStrategy CreateSensorServiceStrategy()

diff --git a/Platforms/Devices/.SDL2/ConcreteVibrator.cs → Platforms/Devices/.iOS/ConcreteHaptics.cs b/Platforms/Devices/.SDL2/ConcreteVibrator.cs → Platforms/Devices/.iOS/ConcreteHaptics.cs
@@ -6,10 +6,10 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public sealed class ConcreteVibrator : VibratorStrategy
+    public sealed class ConcreteHaptics : HapticsStrategy
     {
 
-        public ConcreteVibrator()
+        public ConcreteHaptics()
         {
         }
 

diff --git a/Platforms/Kni.Platform.Android.GL.Xamarin.csproj b/Platforms/Kni.Platform.Android.GL.Xamarin.csproj
@@ -204,7 +204,7 @@
     <Compile Include="Game\.Android\AndroidSurfaceView.cs" />
 
     <Compile Include="Devices\.Android\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Android\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Android\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.Android.GL.csproj b/Platforms/Kni.Platform.Android.GL.csproj
@@ -125,7 +125,7 @@
     <Compile Include="Game\.Android\AndroidGameWindow.cs" />
 
     <Compile Include="Devices\.Android\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Android\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Android\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.Blazor.GL.csproj b/Platforms/Kni.Platform.Blazor.GL.csproj
@@ -100,7 +100,7 @@
 
   <ItemGroup>
     <Compile Include="Devices\.Blazor\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Blazor\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Blazor\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Blazor\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Blazor\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Blazor\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.Cardboard.GL.csproj b/Platforms/Kni.Platform.Cardboard.GL.csproj
@@ -155,7 +155,7 @@
     <Compile Include="Content\.Android\ConcreteTitleContainerFactory.cs" />
 
     <Compile Include="Devices\.Android\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Android\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Android\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.Oculus.GL.csproj b/Platforms/Kni.Platform.Oculus.GL.csproj
@@ -125,7 +125,7 @@
     <Compile Include="Game\.Android\AndroidGameWindow.cs" />
 
     <Compile Include="Devices\.Android\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Android\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Android\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Android\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.Ref.csproj b/Platforms/Kni.Platform.Ref.csproj
@@ -99,7 +99,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net40' ">
     <Compile Include="Devices\.Ref\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.Ref\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.Ref\ConcreteHaptics.cs" />
     <Compile Include="Devices\.Ref\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.Ref\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.Ref\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.SDL2.GL.csproj b/Platforms/Kni.Platform.SDL2.GL.csproj
@@ -186,7 +186,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net40' ">
     <Compile Include="Devices\.SDL2\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.SDL2\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.SDL2\ConcreteHaptics.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.UAP.DX11.csproj b/Platforms/Kni.Platform.UAP.DX11.csproj
@@ -189,7 +189,7 @@
     <Compile Include="Media\WME\MusicProperties.cs" />
 
     <Compile Include="Devices\.UAP\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.UAP\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.UAP\ConcreteHaptics.cs" />
     <Compile Include="Devices\.UAP\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.UAP\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.UAP\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.WinForms.DX11.csproj b/Platforms/Kni.Platform.WinForms.DX11.csproj
@@ -186,7 +186,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net40' ">
     <Compile Include="Devices\.WindowsDX\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.WindowsDX\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.WindowsDX\ConcreteHaptics.cs" />
     <Compile Include="Devices\.WindowsDX\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.WindowsDX\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.WindowsDX\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/Kni.Platform.iOS.GL.csproj b/Platforms/Kni.Platform.iOS.GL.csproj
@@ -106,7 +106,7 @@
 
   <ItemGroup>
     <Compile Include="Devices\.iOS\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.iOS\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.iOS\ConcreteHaptics.cs" />
     <Compile Include="Devices\.iOS\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.iOS\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.iOS\Sensors\ConcreteSensorService.cs" />

diff --git a/Platforms/MonoGame.Framework.DesktopGL.csproj b/Platforms/MonoGame.Framework.DesktopGL.csproj
@@ -117,7 +117,7 @@
     <Compile Include="Content\.SDL2\ConcreteTitleContainerFactory.cs" />
 
     <Compile Include="Devices\.SDL2\ConcreteDevicesFactory.cs" />
-    <Compile Include="Devices\.SDL2\ConcreteVibrator.cs" />
+    <Compile Include="Devices\.SDL2\ConcreteHaptics.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteAccelerometer.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteCompass.cs" />
     <Compile Include="Devices\.SDL2\Sensors\ConcreteSensorService.cs" />

diff --git a/src/Xna.Framework.Devices/Devices/DevicesFactory.cs b/src/Xna.Framework.Devices/Devices/DevicesFactory.cs
@@ -60,7 +60,7 @@ public static void RegisterDevicesFactory(DevicesFactory devicesFactory)
             }
         }
 
-        public abstract VibratorStrategy CreateVibratorStrategy();
+        public abstract HapticsStrategy CreateConcreteHapticsStrategy();
 
         public abstract SensorServiceStrategy CreateSensorServiceStrategy();
         public abstract AccelerometerStrategy CreateAccelerometerStrategy();

diff --git a/...Xna.Framework.Devices/Devices/Vibrator.cs → src/Xna.Framework.Devices/Devices/Haptics.cs b/...Xna.Framework.Devices/Devices/Vibrator.cs → src/Xna.Framework.Devices/Devices/Haptics.cs
@@ -6,53 +6,53 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public interface IPlatformVibrator
+    public interface IPlatformHaptics
     {
-        T GetStrategy<T>() where T : VibratorStrategy;
+        T GetStrategy<T>() where T : HapticsStrategy;
     }
 }
 
 namespace Microsoft.Xna.Framework.Devices
 {
-    public sealed class Vibrator : IPlatformVibrator
+    public sealed class Haptics : IPlatformHaptics
     {
-        private static Vibrator _current;
+        private static Haptics _current;
 
         /// <summary>
         /// Returns the current Vibrator instance.
         /// </summary> 
-        public static Vibrator Current
+        public static Haptics Current
         {
             get
             {
                 if (_current != null)
                     return _current;
 
-                lock (typeof(Vibrator))
+                lock (typeof(Haptics))
                 {
                     if (_current == null)
-                        _current = new Vibrator();
+                        _current = new Haptics();
 
                     return _current;
                 }
             }
         }
 
-        private VibratorStrategy _strategy;
+        private HapticsStrategy _strategy;
 
-        T IPlatformVibrator.GetStrategy<T>()
+        T IPlatformHaptics.GetStrategy<T>()
         {
             return (T)_strategy;
         }
 
-        private Vibrator()
+        private Haptics()
         {
-            _strategy = DevicesFactory.Current.CreateVibratorStrategy();
+            _strategy = DevicesFactory.Current.CreateConcreteHapticsStrategy();
         }
 
         public void Vibrate(TimeSpan duration)
         {
-            lock (typeof(Vibrator))
+            lock (typeof(Haptics))
             {
                 _strategy.Vibrate(duration);
             }

diff --git a/...ework.Devices/Devices/VibratorStrategy.cs → ...mework.Devices/Devices/HapticsStrategy.cs b/...ework.Devices/Devices/VibratorStrategy.cs → ...mework.Devices/Devices/HapticsStrategy.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Xna.Platform.Devices
 {
-    public abstract class VibratorStrategy
+    public abstract class HapticsStrategy
     {
         public abstract void Vibrate(TimeSpan duration);
     }

diff --git a/src/Xna.Framework.Devices/Xna.Framework.Devices.csproj b/src/Xna.Framework.Devices/Xna.Framework.Devices.csproj
@@ -39,8 +39,8 @@
 
   <ItemGroup>
     <Compile Include="Devices\DevicesFactory.cs" />
-    <Compile Include="Devices\Vibrator.cs" />
-    <Compile Include="Devices\VibratorStrategy.cs" />
+    <Compile Include="Devices\Haptics.cs" />
+    <Compile Include="Devices\HapticsStrategy.cs" />
   </ItemGroup>
 
   <ItemGroup>