projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fake thrust data as accel for now
[fw/altos]
/
altoslib
/
AltosPointInt.java
diff --git
a/altoslib/AltosPointInt.java
b/altoslib/AltosPointInt.java
index 6ee077ab36b82bb6a26b6ae4dcd4cadbaa16cb05..233a8d316489740dcc99b50113c937de62e44c3b 100644
(file)
--- a/
altoslib/AltosPointInt.java
+++ b/
altoslib/AltosPointInt.java
@@
-3,7
+3,8
@@
*
* 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
*
* 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; version 2 of the License.
+ * the Free Software Foundation; either version 2 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,12
+16,24
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
6
;
+package org.altusmetrum.altoslib_
11
;
public class AltosPointInt {
public int x, y;
public class AltosPointInt {
public int x, y;
- public boolean equals(AltosPointInt n) {
+ public int hashCode() {
+ return x ^ y;
+ }
+
+ public boolean equals(Object o) {
+ if (o == null)
+ return false;
+
+ if (!(o instanceof AltosPointInt))
+ return false;
+
+ AltosPointInt n = (AltosPointInt) o;
+
return n.x == x && n.y == y;
}
return n.x == x && n.y == y;
}
@@
-28,4
+41,14
@@
public class AltosPointInt {
this.x = x;
this.y = y;
}
this.x = x;
this.y = y;
}
+
+ public AltosPointInt(double x, double y) {
+ this.x = (int) (x + 0.5);
+ this.y = (int) (y + 0.5);
+ }
+
+ public AltosPointInt(AltosPointDouble pt_d) {
+ this.x = (int) (pt_d.x + 0.5);
+ this.y = (int) (pt_d.y + 0.5);
+ }
}
}