diff --git a/main/src/com/polites/android/MathUtils.java b/main/src/com/polites/android/MathUtils.java index a0ad828..2898644 100644 --- a/main/src/com/polites/android/MathUtils.java +++ b/main/src/com/polites/android/MathUtils.java @@ -24,19 +24,19 @@ public class MathUtils { public static float distance(MotionEvent event) { float x = event.getX(0) - event.getX(1); float y = event.getY(0) - event.getY(1); - return FloatMath.sqrt(x * x + y * y); + return (float)Math.sqrt(x * x + y * y); } public static float distance(PointF p1, PointF p2) { float x = p1.x - p2.x; float y = p1.y - p2.y; - return FloatMath.sqrt(x * x + y * y); + return (float)Math.sqrt(x * x + y * y); } public static float distance(float x1, float y1, float x2, float y2) { float x = x1 - x2; float y = y1 - y2; - return FloatMath.sqrt(x * x + y * y); + return (float)Math.sqrt(x * x + y * y); } public static void midpoint(MotionEvent event, PointF point) { @@ -62,8 +62,8 @@ public void rotate(PointF p1, PointF p2, float angle) { float py = p1.y; float ox = p2.x; float oy = p2.y; - p1.x = (FloatMath.cos(angle) * (px-ox) - FloatMath.sin(angle) * (py-oy) + ox); - p1.y = (FloatMath.sin(angle) * (px-ox) + FloatMath.cos(angle) * (py-oy) + oy); + p1.x = ((float)Math.cos(angle) * (px-ox) - (float)Math.sin(angle) * (py-oy) + ox); + p1.y = ((float)Math.sin(angle) * (px-ox) + (float)Math.cos(angle) * (py-oy) + oy); } public static float angle(PointF p1, PointF p2) { diff --git a/main/src/com/polites/android/VectorF.java b/main/src/com/polites/android/VectorF.java index ce23663..8c41ea7 100644 --- a/main/src/com/polites/android/VectorF.java +++ b/main/src/com/polites/android/VectorF.java @@ -28,8 +28,8 @@ public class VectorF { public final PointF end = new PointF(); public void calculateEndPoint() { - end.x = FloatMath.cos(angle) * length + start.x; - end.y = FloatMath.sin(angle) * length + start.y; + end.x = (float)Math.cos(angle) * length + start.x; + end.y = (float)Math.sin(angle) * length + start.y; } public void setStart(PointF p) {