Merge pull request #7 from Mrcubix/0.6.x-TouchSensitivity-fix

[0.6.x] Add option to match pen speed in Relative Mode

Author: Mrcubix

OTD.EnhancedOutputMode.Lib/Tools/TouchSettings.cs

@@ -61,6 +61,12 @@ public int PenResetTime
 
         public TimeSpan PenResetTimeSpan => penResetTime;
 
+        [BooleanProperty("Match Pen Sensibility in Relative Mode", ""),
+         DefaultPropertyValue(false),
+         ToolTip("OTD.EnhancedOutputMode:\n\n" +
+                 "When Enabled, the touch sensitivity will match to the sensitivity of the pen in Relative output mode.")]
+        public bool MatchPenSensibilityInRelativeMode { get; set; }
+
         [Property("Max X"),
          DefaultPropertyValue(4095),
          ToolTip("OTD.EnhancedOutputMode:\n\n" +

OTD.EnhancedOutputMode/Output/EnhancedRelativeOutputMode.cs

@@ -19,11 +19,13 @@ namespace OTD.EnhancedOutputMode.Output
     public class EnhancedRelativeOutputMode : RelativeOutputMode, IPointerProvider<IRelativePointer>
     {
         private readonly ITabletReport _convertedReport = new TouchConvertedReport();
+        private readonly HPETDeltaStopwatch _touchStopwatch = new(true);
         private readonly HPETDeltaStopwatch _penStopwatch = new(true);
         private TouchSettings _touchSettings = TouchSettings.Default;
         private bool _initialized = false;
         private bool skipReport = false;
         private int _lastTouchID = -1;
+        private Vector2? _lastTransformedTouchPos;
         private Vector2 _lastPos;
 
         public Matrix3x2 TouchTransformationMatrix { get; protected set; }
@@ -37,7 +39,11 @@ public class EnhancedRelativeOutputMode : RelativeOutputMode, IPointerProvider<I
 
         public IList<IAuxFilter> AuxFilters { get; set; } = Array.Empty<IAuxFilter>();
 
-        public TouchSettings TouchSettings { get; private set; } = TouchSettings.Default;
+        public TouchSettings TouchSettings
+        {
+            get => _touchSettings;
+            set => _touchSettings = value ?? TouchSettings.Default;
+        }
 
         #region Initialization
 
@@ -46,7 +52,7 @@ public void Initialize()
             if (Elements == null)
                 return;
 
-            _touchSettings = Elements.OfType<TouchSettings>().FirstOrDefault() ?? TouchSettings.Default;
+            TouchSettings = Elements.OfType<TouchSettings>().FirstOrDefault() ?? TouchSettings.Default;
 
             // Gather custom filters
             // TODO: someone replace this system with the IPositionedPipelineElement bullshit somehow
@@ -58,9 +64,23 @@ public void Initialize()
 
             TouchTransformationMatrix = TransformationMatrix;
 
+            if (_touchSettings.MatchPenSensibilityInRelativeMode)
+                UpdateTouchTransformMatrix();
+
             _initialized = true;
         }
 
+        private void UpdateTouchTransformMatrix()
+        {
+            // Pen & Touch digitizer suffer from a difference in resolution, 
+            // resulting in different speeds for the same sensitivity.
+            var XMultiplier = Tablet.Properties.Specifications.Digitizer.MaxX / _touchSettings.MaxX;
+            var YMultiplier = Tablet.Properties.Specifications.Digitizer.MaxY / _touchSettings.MaxY;
+
+            // This should achieve about the same speed as the pen
+            TouchTransformationMatrix = TransformationMatrix * Matrix3x2.CreateScale(XMultiplier, YMultiplier);
+        }
+
         #endregion
 
         #region Report Handling
@@ -89,6 +109,7 @@ public override void Read(IDeviceReport deviceReport)
                 if (_lastTouchID != TouchConvertedReport.CurrentFirstTouchID && TouchConvertedReport.CurrentFirstTouchID != -1)
                 {
                     _lastPos = _convertedReport.Position;
+                    _lastTransformedTouchPos = null;
                     skipReport = true;
                 }
 
@@ -99,8 +120,6 @@ public override void Read(IDeviceReport deviceReport)
                     base.Read(_convertedReport); // We send another report instead of overwriting the touch report since plugins might rely on it
                 else
                     skipReport = false;
-
-                _lastPos = _convertedReport.Position;
             }
             else if (deviceReport is IAbsolutePositionReport) // Restart the pen stopwatch when a pen report is received
                 if (_touchSettings.DisableWhenPenInRange)
@@ -109,6 +128,20 @@ public override void Read(IDeviceReport deviceReport)
             base.Read(deviceReport);
         }
 
+        protected override IAbsolutePositionReport Transform(IAbsolutePositionReport report)
+        {
+            if (report is not TouchConvertedReport)
+                return base.Transform(report);
+
+            var pos = Vector2.Transform(report.Position, TouchTransformationMatrix);
+            var delta = pos - _lastTransformedTouchPos;
+            _lastTransformedTouchPos = pos;
+
+            report.Position = delta.GetValueOrDefault();
+
+            return report;
+        }
+
         protected override void OnOutput(IDeviceReport report)
         {
             if (report is IAuxReport auxReport)