remove multipliers from deviationprovider parameters

Author: JoonasVali

LICENSE.txt

@@ -22,5 +22,5 @@ SOFTWARE.
 
 This project uses the following frameworks which are subject to their respective licensing terms.
 
-* SLF4J API
+* SLF4J API (Also MIT License - see above)
 

README.MD

@@ -1,4 +1,4 @@
-## Natural Mouse Motion by Joonas Vali (2018) ##
+## Natural Mouse Motion ##
 
 This library provides a way to move cursor to specified coordinates on screen reliably,
 while being randomly arced to look like real hand moved it there by using a mouse.

src/main/java/com/github/joonasvali/naturalmouse/api/MouseMotion.java

@@ -121,11 +121,11 @@ public void move(MouseMotionObserver observer) throws InterruptedException {
         simulatedMouseY += yStepSize;
 
         DoublePoint noise = noiseProvider.getNoise(random, distance);
-        DoublePoint deviation = deviationProvider.getDeviation(distance, completion, deviationMultiplierX, deviationMultiplierY);
+        DoublePoint deviation = deviationProvider.getDeviation(distance, completion);
 
         long endTime = startTime + stepTime * (i + 1);
-        int mousePosX = (int) Math.round(simulatedMouseX + deviation.getX() + noise.getX());
-        int mousePosY = (int) Math.round(simulatedMouseY + deviation.getY() + noise.getY());
+        int mousePosX = (int) Math.round(simulatedMouseX + deviation.getX() * deviationMultiplierX + noise.getX());
+        int mousePosY = (int) Math.round(simulatedMouseY + deviation.getY() * deviationMultiplierY + noise.getY());
 
         robot.mouseMove(
             Math.max(1, Math.min(screenSize.width - 1, mousePosX)),

src/main/java/com/github/joonasvali/naturalmouse/support/DeviationProvider.java

@@ -2,5 +2,5 @@
 
 public interface DeviationProvider {
 
-  DoublePoint getDeviation(double totalDistanceInPixels, double completionFraction, double multiplierX, double multiplierY);
+  DoublePoint getDeviation(double totalDistanceInPixels, double completionFraction);
 }

src/main/java/com/github/joonasvali/naturalmouse/support/SinusoidalDeviationProvider.java

@@ -8,11 +8,11 @@ public SinusoidalDeviationProvider(double slopeDivider) {
   }
 
   @Override
-  public DoublePoint getDeviation(double totalDistanceInPixels, double completionFraction, double multiplierX, double multiplierY) {
+  public DoublePoint getDeviation(double totalDistanceInPixels, double completionFraction) {
     double deviationFunctionResult = (1 - Math.cos(completionFraction * Math.PI * 2)) / 2;
 
-    double deviationX = multiplierX * (totalDistanceInPixels / slopeDivider);
-    double deviationY = multiplierY * (totalDistanceInPixels / slopeDivider);
+    double deviationX = totalDistanceInPixels / slopeDivider;
+    double deviationY = totalDistanceInPixels / slopeDivider;
 
     return new DoublePoint(deviationFunctionResult * deviationX, deviationFunctionResult * deviationY);
   }