Added /editdrain, added BlockPoint that compares using ints.

This commit is contained in:
sk89q
2010-10-11 11:17:32 -07:00
parent 7823aa2a6c
commit f64cc76906
4 changed files with 183 additions and 2 deletions

View File

@ -0,0 +1,65 @@
// $Id$
/*
* WorldEdit
* Copyright (C) 2010 sk89q <http://www.sk89q.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit;
/**
* Extension of Point that supports being compared as ints (for accuracy).
*
* @author sk89q
*/
public class BlockPoint extends Point {
/**
* Construct the Point object.
*
* @param pt
*/
public BlockPoint(Point pt) {
super(pt);
}
/**
* Checks if another object is equivalent.
*
* @param obj
* @return whether the other object is equivalent
*/
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Point)) {
return false;
}
Point other = (Point)obj;
return (int)other.x == (int)this.x && (int)other.y == (int)this.y
&& (int)other.z == (int)this.z;
}
/**
* Gets the hash code.
*
* @return hash code
*/
@Override
public int hashCode() {
return (Integer.valueOf((int)x).hashCode() >> 13) ^
(Integer.valueOf((int)y).hashCode() >> 7) ^
Integer.valueOf((int)z).hashCode();
}
}

View File

@ -23,8 +23,8 @@ package com.sk89q.worldedit;
*
* @author Albert
*/
public final class Point {
private final double x, y, z;
public class Point {
protected final double x, y, z;
/**
* Construct the Point object.
@ -65,6 +65,17 @@ public final class Point {
this.z = (double)z;
}
/**
* Construct the Point object.
*
* @param pt
*/
public Point(Point pt) {
this.x = pt.x;
this.y = pt.y;
this.z = pt.z;
}
/**
* Construct the Point object.
*/
@ -303,6 +314,18 @@ public final class Point {
return new Point(this.x / x, this.y / y, this.z / z);
}
/**
* Get the distance away from a point.
*
* @param pt
* @return distance
*/
public double distance(Point pt) {
return Math.sqrt(Math.pow(pt.x - x, 2) +
Math.pow(pt.y - y, 2) +
Math.pow(pt.z - z, 2));
}
/**
* Get a block point from a point.
*
@ -344,4 +367,14 @@ public final class Point {
((new Double(y)).hashCode() >> 7) ^
(new Double(z)).hashCode();
}
/**
* Returns string representation "(x, y, z)".
*
* @return string
*/
@Override
public String toString() {
return "(" + x + ", " + y + ", " + z + ")";
}
}