Merge branch 'smoothingfilter' into noisereductionfilter

Author: X9VoiD

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".modules/OpenTabletDriver"]
+	path = .modules/OpenTabletDriver
+	url = https://github.com/InfinityGhost/OpenTabletDriver

.modules/OpenTabletDriver

@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TabletDriverPlugin" Version="0.3.0" />
+  <ItemGroup>
+    <ProjectReference Include="../.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
   </ItemGroup>
 
 </Project>

…DriverFilters/TabletDriverFilters.csproj HawkuFilters/HawkuFilters.csprojTabletDriverFilters/TabletDriverFilters.csproj renamed to HawkuFilters/HawkuFilters.csproj TabletDriverFilters/TabletDriverFilters.csproj renamed to HawkuFilters/HawkuFilters.csproj

@@ -1,20 +1,21 @@
 using System;
 using System.Collections.Generic;
-using TabletDriverPlugin.Attributes;
-using TabletDriverPlugin.Tablet;
+using System.Numerics;
+using OpenTabletDriver.Plugin.Attributes;
+using OpenTabletDriver.Plugin.Tablet;
 
-namespace TabletDriverPlugin
+namespace OpenTabletDriver.Plugin
 {
     [PluginName("TabletDriver Noise Reduction")]
     public class TabletDriverNoiseReduction : IFilter
     {
-        private LinkedList<Point> _buffer = new LinkedList<Point>();
+        private LinkedList<Vector2> _buffer = new LinkedList<Vector2>();
         private float _distThreshold, _distMax;
         private const int _iterations = 10;
         private int _samples = 10;
-        private Point _lastPoint;
+        private Vector2 _lastPoint;
 
-        public Point Filter(Point point)
+        public Vector2 Filter(Vector2 point)
         {
             SetTarget(point);
 
@@ -27,7 +28,7 @@ public Point Filter(Point point)
             GetGeometricMedianVector(ref _lastPoint);
 
             // Distance between latest position and ring buffer
-            var distance = point.DistanceFrom(_lastPoint);
+            var distance = Vector2.Distance(point, _lastPoint);
 
             // Distance larger than threshold -> modify the ring buffer
             if (distance > DistThreshold)
@@ -53,13 +54,24 @@ public Point Filter(Point point)
                 {
                     // Move buffer positions and current position towards the latest target using linear interpolation
                     // Amount of movement is the distance ratio between threshold and maximum
-                    var bufEnum = _buffer.GetEnumerator();
+                    // var bufEnum = _buffer.GetEnumerator();
 
                     // buffer.LerpAdd()
-                    while (bufEnum.MoveNext())
+                    // while (bufEnum.MoveNext())
+                    // {
+                    //     bufEnum.Current.X += (float)((point.X - bufEnum.Current.X) * distanceRatio);
+                    //     bufEnum.Current.Y += (float)((point.Y - bufEnum.Current.Y) * distanceRatio);
+                    // }
+
+                    var bufNode = _buffer.First;
+
+                    while (bufNode != null)
                     {
-                        bufEnum.Current.X += (float)((point.X - bufEnum.Current.X) * distanceRatio);
-                        bufEnum.Current.Y += (float)((point.Y - bufEnum.Current.Y) * distanceRatio);
+                        var bufPoint = bufNode.Value;
+                        bufPoint.X = (float)((point.X - bufPoint.X) * distanceRatio);
+                        bufPoint.Y = (float)((point.Y - bufPoint.Y) * distanceRatio);
+                        bufNode.Value = bufPoint;
+                        bufNode = bufNode.Next;
                     }
 
                     // outputPosition.LerpAdd()
@@ -74,23 +86,23 @@ public Point Filter(Point point)
             return SetOutput(point);
         }
 
-        private void SetTarget(Point point)
+        private void SetTarget(Vector2 point)
         {
             _buffer.AddLast(point);
             while (_buffer.Count > Samples)
                 _buffer.RemoveFirst();
         }
 
-        private Point SetOutput(Point point)
+        private Vector2 SetOutput(Vector2 point)
         {
             _lastPoint = point;
             return point;
         }
 
-        private Point GetGeometricMedianVector(ref Point point)
+        private Vector2 GetGeometricMedianVector(ref Vector2 point)
         {
-            var candidate = new Point();
-            var next = new Point();
+            var candidate = new Vector2();
+            var next = new Vector2();
             var minimumDistance = 0.001;
 
             double denominator, weight, distance;
@@ -107,7 +119,7 @@ private Point GetGeometricMedianVector(ref Point point)
                 // Loop through the buffer and calculate a denominator.
                 foreach (var bufferPoint in _buffer)
                 {
-                    distance = candidate.DistanceFrom(bufferPoint);
+                    distance = Vector2.Distance(candidate, bufferPoint);
 
                     if (distance > minimumDistance)
                         denominator += 1.0 / distance;
@@ -122,7 +134,7 @@ private Point GetGeometricMedianVector(ref Point point)
                 // Loop through the buffer and calculate a weighted average
                 foreach (var bufferPoint in _buffer)
                 {
-                    distance = candidate.DistanceFrom(bufferPoint);
+                    distance = Vector2.Distance(candidate, bufferPoint);
 
                     if (distance > minimumDistance)
                         weight = 1.0 / distance;
@@ -144,7 +156,7 @@ private Point GetGeometricMedianVector(ref Point point)
             return point;
         }
 
-        private bool GetAverageVector(ref Point point)
+        private bool GetAverageVector(ref Vector2 point)
         {
             if (_buffer.Count == 0)
                 return false;

…verFilters/TabletDriverNoiseReduction.cs HawkuFilters/NoiseReduction.csTabletDriverFilters/TabletDriverNoiseReduction.cs renamed to HawkuFilters/NoiseReduction.cs TabletDriverFilters/TabletDriverNoiseReduction.cs renamed to HawkuFilters/NoiseReduction.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Numerics;
+using OpenTabletDriver.Plugin.Attributes;
+using OpenTabletDriver.Plugin.Tablet;
+
+namespace TabletDriverFilters.Hawku
+{
+    using static Math;
+
+    [PluginName("TabletDriver Smoothing Filter")]
+    public class Smoothing : IFilter
+    {
+        private DateTime? _lastFilterTime;
+        private Vector2 _lastPos;
+        private float _timerInterval;
+        private const float _threshold = 0.63f;
+
+        public Vector2 Filter(Vector2 point)
+        {
+            var timeDelta = DateTime.Now - _lastFilterTime;
+            // If a time difference hasn't been established or it has been 100 milliseconds since the last filter
+            if (timeDelta == null || timeDelta.Value.TotalMilliseconds > 100 || _lastPos == null)
+            {
+                SetPreviousState(point);
+                return point;
+            }
+            else
+            {
+                Vector2 pos = new Vector2(_lastPos.X, _lastPos.Y);
+                float deltaX = point.X - _lastPos.X;
+                float deltaY = point.Y - _lastPos.Y;
+
+                double stepCount = Latency / TimerInterval;
+                double target = 1 - _threshold;
+                double weight = 1.0 - (1.0 / Pow(1.0 / target, 1.0 / stepCount));
+
+                pos.X += (float)(deltaX * weight);
+                pos.Y += (float)(deltaY * weight);
+                SetPreviousState(pos);
+                return pos;
+            }
+        }
+
+        private void SetPreviousState(Vector2 lastPosition)
+        {
+            _lastPos = lastPosition;
+            _lastFilterTime = DateTime.Now;
+        }
+
+        public FilterStage FilterStage => FilterStage.PostTranspose;
+
+        [SliderProperty("Latency", 0f, 5f, 2f)]
+        public float Latency { set; get; }
+
+        [UnitProperty("Timer Interval", "hz")]
+        public float TimerInterval
+        {
+            set => _timerInterval = 1000f / value;
+            get => _timerInterval;
+        }
+    }
+}

HawkuFilters/Smoothing.cs

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TabletDriverFilters", "TabletDriverFilters\TabletDriverFilters.csproj", "{EBD5C9CA-5B65-40B9-8923-696819BEF243}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HawkuFilters", "HawkuFilters\HawkuFilters.csproj", "{EBD5C9CA-5B65-40B9-8923-696819BEF243}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution