Merge pull request #178 from jCodingStuff/Julian

Julian

Author: jCodingStuff

core/src/com/group/golf/Ball.java

@@ -73,6 +73,20 @@ public void reset() {
         this.velocityY = 0;
     }
 
+    /**
+     * Reset the velocityX of the ball to 0
+     */
+    public void resetX() {
+        this.velocityX = 0;
+    }
+
+    /**
+     * Reset the velocityY of the ball to 0
+     */
+    public void resetY() {
+        this.velocityY = 0;
+    }
+
     /**
      * Limit the velocity to a maximum
      * @param max the limit

core/src/com/group/golf/Physics/Physics.java

@@ -117,12 +117,20 @@ public boolean checkCollision(boolean simulation) {
      * @return true if the ball was forced to stop, false otherwise
      */
     protected boolean checkLowVelocity() {
-//        System.out.println("ErrorBound: " + errorBound);
-        if (Math.abs(movingBall.calcVelocity()) < errorBound) {
-            movingBall.reset();
-            return true;
+        float[] slope = this.calculateSlope(new float[]{this.movingBall.getX(), this.movingBall.getY()});
+        float vx = this.movingBall.getVelocityX();
+        float vy = this.movingBall.getVelocityY();
+        if (vx != 0 && ((vx < 0 && slope[0] >= 0 && vx >= -errorBound) ||
+                (vx > 0 && slope[0] <= 0 && vx <= errorBound))) {
+//            System.out.println("VelocityX reset!");
+            this.movingBall.resetX();
         }
-        return false;
+        if (vy != 0 && ((vy < 0 && slope[1] >= 0 && vy >= -errorBound) ||
+                (vy > 0 && slope[1] <= 0 && vy <= errorBound))) {
+//            System.out.println("VelocityY reset!");
+            this.movingBall.resetY();
+        }
+        return !this.movingBall.isMoving();
     }
 
     /**

core/src/com/group/golf/Physics/RK4.java

@@ -18,7 +18,7 @@ public class RK4 extends Physics {
      */
     public RK4(Course course) {
         super(course);
-        errorBound = 0.15f;
+        errorBound = 0.2f;
     }
 
     //method to be overwritten by each subclass

core/src/com/group/golf/math/BicubicInterpolator.java

@@ -57,6 +57,11 @@ private void printInfo(float[][] dx, float[][] dy, float[][] dxy) {
 		this.printHelp("Dxy", dxy);
 	}
 
+	/**
+	 * Print a matrix
+	 * @param text the title of the matrix
+	 * @param matrix the matrix
+	 */
 	private void printHelp(String text, float[][] matrix) {
 		System.out.println("\t" + text + ":");
 		for (int i = 0; i < matrix.length; i++) {