Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 23:07:40 +01:00
Code Issues Projects Releases Wiki Activity

Use simple multiplication for squaring. Fixes BUKKIT-4836

Browse Source 
This change adds a method to NumberConversions for squaring and
replaces uses of Math.pow(..., 2) with the new method for efficiency
reasons.

By: Wesley Wolfe <weswolf@aol.com>
This commit is contained in:
Bukkit/Spigot 2013-10-09 01:56:35 -05:00
parent 5b7e75839f
commit db05700052
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
paper-api/src/main/java/org/bukkit/Location.java
View File

@ -334,7 +334,7 @@ public class Location implements Cloneable {
* @return the magnitude
*/
public double length() {
return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
return Math.sqrt(NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z));
}
/**
@ -345,7 +345,7 @@ public class Location implements Cloneable {
* @return the magnitude
*/
public double lengthSquared() {
return Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2);
return NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z);
}
/**
@ -381,7 +381,7 @@ public class Location implements Cloneable {
throw new IllegalArgumentException("Cannot measure distance between " + getWorld().getName() + " and " + o.getWorld().getName());
}
return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);
return NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z);
}
/**

4
paper-api/src/main/java/org/bukkit/util/NumberConversions.java
View File

@ -20,6 +20,10 @@ public final class NumberConversions {
return floor(num + 0.5d);
}
public static double square(double num) {
return num * num;
}
public static int toInt(Object object) {
if (object instanceof Number) {
return ((Number) object).intValue();

10
paper-api/src/main/java/org/bukkit/util/Vector.java
View File

@ -152,7 +152,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
* @return the magnitude
*/
public double length() {
return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
return Math.sqrt(NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z));
}
/**
@ -161,7 +161,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
* @return the magnitude
*/
public double lengthSquared() {
return Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2);
return NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z);
}
/**
@ -175,7 +175,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
* @return the distance
*/
public double distance(Vector o) {
return Math.sqrt(Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2));
return Math.sqrt(NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z));
}
/**
@ -185,7 +185,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
* @return the distance
*/
public double distanceSquared(Vector o) {
return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);
return NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z);
}
/**
@ -346,7 +346,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
* @return whether this vector is in the sphere
*/
public boolean isInSphere(Vector origin, double radius) {
return (Math.pow(origin.x - x, 2) + Math.pow(origin.y - y, 2) + Math.pow(origin.z - z, 2)) <= Math.pow(radius, 2);
return (NumberConversions.square(origin.x - x) + NumberConversions.square(origin.y - y) + NumberConversions.square(origin.z - z)) <= NumberConversions.square(radius);
}
/**