projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Improve AltosState save/restore debugging
[fw/altos]
/
altoslib
/
AltosQuaternion.java
diff --git
a/altoslib/AltosQuaternion.java
b/altoslib/AltosQuaternion.java
index 6a09bb8e490d4ef3b36e9b4f9508c7465f1e1bda..98c2fe51322851e5b7fb1e5b95723fc173f4655e 100644
(file)
--- a/
altoslib/AltosQuaternion.java
+++ b/
altoslib/AltosQuaternion.java
@@
-17,7
+17,7
@@
package org.altusmetrum.altoslib_11;
package org.altusmetrum.altoslib_11;
-public class AltosQuaternion implements Altos
Hashable, Altos
Jsonable {
+public class AltosQuaternion implements AltosJsonable {
double r; /* real bit */
double x, y, z; /* imaginary bits */
double r; /* real bit */
double x, y, z; /* imaginary bits */
@@
-115,10
+115,17
@@
public class AltosQuaternion implements AltosHashable, AltosJsonable {
}
public AltosQuaternion(AltosQuaternion q) {
}
public AltosQuaternion(AltosQuaternion q) {
- this.r = q.r;
- this.x = q.x;
- this.y = q.y;
- this.z = q.z;
+ r = q.r;
+ x = q.x;
+ y = q.y;
+ z = q.z;
+ }
+
+ public AltosQuaternion() {
+ r = 1;
+ x = 0;
+ y = 0;
+ z = 0;
}
static public AltosQuaternion vector(double x, double y, double z) {
}
static public AltosQuaternion vector(double x, double y, double z) {
@@
-148,16
+155,6
@@
public class AltosQuaternion implements AltosHashable, AltosJsonable {
c_x * c_y * s_z - s_x * s_y * c_z);
}
c_x * c_y * s_z - s_x * s_y * c_z);
}
- public AltosHashSet hashSet() {
- AltosHashSet h = new AltosHashSet();
-
- h.putDouble("r", r);
- h.putDouble("x", x);
- h.putDouble("y", y);
- h.putDouble("z", z);
- return h;
- }
-
public AltosJson json() {
AltosJson j = new AltosJson();
public AltosJson json() {
AltosJson j = new AltosJson();
@@
-168,16
+165,6
@@
public class AltosQuaternion implements AltosHashable, AltosJsonable {
return j;
}
return j;
}
- public AltosQuaternion(AltosHashSet h) {
- if (h == null)
- return;
-
- r = h.getDouble("r", 1);
- x = h.getDouble("x", 0);
- y = h.getDouble("y", 0);
- z = h.getDouble("z", 0);
- }
-
public AltosQuaternion(AltosJson j) {
if (j == null)
return;
public AltosQuaternion(AltosJson j) {
if (j == null)
return;