optimisation?

jamesbt365 · Aug 26, 2023 · 2d51339 · 2d51339
1 parent de95d52
commit 2d51339
Showing 1 changed file with 17 additions and 36 deletions.
diff --git a/PSSA/PSSA.cs b/PSSA/PSSA.cs
@@ -64,20 +64,10 @@ public void Consume(IDeviceReport value)
                 if (lastReport != null)
                 {
                     if (ReverseSmoothing) {
-                    float emaWeightX = CalculateEMAWeightReversed(report.Pressure);
-                    float emaWeightY = CalculateEMAWeightReversed(report.Pressure);
-
-                    float smoothedX = SmoothCursor(emaWeightX, report.Position.X, lastReport.Position.X);
-                    float smoothedY = SmoothCursor(emaWeightY, report.Position.Y, lastReport.Position.Y);
-                    report.Position = new Vector2(smoothedX, smoothedY);
+                        report.Position = SmoothCursor(CalculateEMAWeightReversed(report.Pressure), report.Position, lastReport.Position);
                     }
                     else {
-                    float emaWeightX = CalculateEMAWeight(report.Pressure);
-                    float emaWeightY = CalculateEMAWeight(report.Pressure);
-
-                    float smoothedX = SmoothCursor(emaWeightX, report.Position.X, lastReport.Position.X);
-                    float smoothedY = SmoothCursor(emaWeightY, report.Position.Y, lastReport.Position.Y);
-                    report.Position = new Vector2(smoothedX, smoothedY);
+                        report.Position = SmoothCursor(CalculateEMAWeight(report.Pressure), report.Position, lastReport.Position);
                     }
 
                 }
@@ -90,54 +80,45 @@ public void Consume(IDeviceReport value)
 
         public PipelinePosition Position => PipelinePosition.PostTransform;
 
-
-
         private float CalculateEMAWeight(float pressure)
         {
             float normalizedPressure = pressure / MaxPressure;
 
             float startIncreasePressure = MinPressure / MaxPressure;
-            float clampedNormalizedPressure = Math.Max(Math.Min((normalizedPressure - startIncreasePressure) / (1.0f - startIncreasePressure), 1.0f), 0.0f);
-            float emaWeight;
+            float clampedNormalizedPressure = Math.Clamp((normalizedPressure - startIncreasePressure) / (1.0f - startIncreasePressure), 0.0f, 1.0f);
+
 
             if (!BaseSmoothing && normalizedPressure < startIncreasePressure)
             {
-                emaWeight = 1.0f;
-            }
-            else
-            {
-                emaWeight = (1 - clampedNormalizedPressure) * MinWeight + (MaxWeight * clampedNormalizedPressure);
+                return 1.0f;
             }
-
-            return emaWeight;
+            return (1 - clampedNormalizedPressure) * MinWeight + (MaxWeight * clampedNormalizedPressure);
         }
 
         private float CalculateEMAWeightReversed(float pressure)
         {
             float normalizedPressure = (pressure - MinPressure) / (MaxPressure - MinPressure);
+            // No idea if this is right....
 
-            float clampedNormalizedPressure = Math.Max(Math.Min(normalizedPressure, 1.0f), 0.0f);
-            float emaWeight;
+            float clampedNormalizedPressure = Math.Clamp(normalizedPressure, 0.0f, 1.0f);
+
 
+            // Base smoothing kinda has to be enabled to be "used correctly"
+            // The way ema works makes reversal awkward anyway, I don't know how "useful" this is.
             if (!BaseSmoothing && normalizedPressure < 0)
             {
-                emaWeight = MaxWeight;
-            }
-            else
-            {
-                emaWeight = (1 - clampedNormalizedPressure) * MaxWeight + (MinWeight * clampedNormalizedPressure);
+                return 1.0f;
             }
-
-            return emaWeight;
+            return (1 - clampedNormalizedPressure) * MaxWeight + (MinWeight * clampedNormalizedPressure);
         }
 
-
-        private float SmoothCursor(float weight, float currentPosition, float lastPosition)
+        private Vector2 SmoothCursor(float weight, Vector2 currentPosition, Vector2 lastPosition)
         {
-            float smoothedValue = weight * currentPosition + (1 - weight) * lastPosition;
-            return smoothedValue;
+            Vector2 smoothedPosition = weight * currentPosition + (1 - weight) * lastPosition;
+            return smoothedPosition;
         }
 
 
+
     }
 }