Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Vector[2D].transform2D not using the aboutX/Z arguments properly.

Browse Source
This commit is contained in:
TomyLobo 2012-01-05 15:57:54 +01:00
parent a7530b7f89
commit 8c68cdf4a8
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/sk89q/worldedit/Vector.java
View File

@ -577,22 +577,25 @@ public class Vector {
* 2D transformation. * 2D transformation.
* *
* @param angle in degrees * @param angle in degrees
* @param aboutX * @param aboutX about which x coordinate to rotate
* @param aboutZ * @param aboutZ about which z coordinate to rotate
* @param translateX * @param translateX what to add after rotation
* @param translateZ * @param translateZ what to add after rotation
* @return * @return
*/ */
public Vector transform2D(double angle, public Vector transform2D(double angle,
double aboutX, double aboutZ, double translateX, double translateZ) { double aboutX, double aboutZ, double translateX, double translateZ) {
angle = Math.toRadians(angle); angle = Math.toRadians(angle);
double x = this.x; double x = this.x - aboutX;
double z = this.z; double z = this.z - aboutZ;
double x2 = x * Math.cos(angle) - z * Math.sin(angle); double x2 = x * Math.cos(angle) - z * Math.sin(angle);
double z2 = x * Math.sin(angle) + z * Math.cos(angle); double z2 = x * Math.sin(angle) + z * Math.cos(angle);
return new Vector(x2 + aboutX + translateX,
y, return new Vector(
z2 + aboutZ + translateZ); x2 + aboutX + translateX,
y,
z2 + aboutZ + translateZ
);
} }
/** /**

18
src/main/java/com/sk89q/worldedit/Vector2D.java
View File

@ -503,21 +503,23 @@ public class Vector2D {
* 2D transformation. * 2D transformation.
* *
* @param angle in degrees * @param angle in degrees
* @param aboutX * @param aboutX about which x coordinate to rotate
* @param aboutZ * @param aboutZ about which z coordinate to rotate
* @param translateX * @param translateX what to add after rotation
* @param translateZ * @param translateZ what to add after rotation
* @return * @return
*/ */
public Vector2D transform2D(double angle, public Vector2D transform2D(double angle,
double aboutX, double aboutZ, double translateX, double translateZ) { double aboutX, double aboutZ, double translateX, double translateZ) {
angle = Math.toRadians(angle); angle = Math.toRadians(angle);
double x = this.x; double x = this.x - aboutX;
double z = this.z; double z = this.z - aboutZ;
double x2 = x * Math.cos(angle) - z * Math.sin(angle); double x2 = x * Math.cos(angle) - z * Math.sin(angle);
double z2 = x * Math.sin(angle) + z * Math.cos(angle); double z2 = x * Math.sin(angle) + z * Math.cos(angle);
return new Vector2D(x2 + aboutX + translateX, return new Vector2D(
z2 + aboutZ + translateZ); x2 + aboutX + translateX,
z2 + aboutZ + translateZ
);
} }
/** /**