X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosQuaternion.java;h=98c2fe51322851e5b7fb1e5b95723fc173f4655e;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=6a09bb8e490d4ef3b36e9b4f9508c7465f1e1bda;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;p=fw%2Faltos diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java index 6a09bb8e..98c2fe51 100644 --- a/altoslib/AltosQuaternion.java +++ b/altoslib/AltosQuaternion.java @@ -17,7 +17,7 @@ package org.altusmetrum.altoslib_11; -public class AltosQuaternion implements AltosHashable, AltosJsonable { +public class AltosQuaternion implements AltosJsonable { double r; /* real bit */ double x, y, z; /* imaginary bits */ @@ -115,10 +115,17 @@ public class AltosQuaternion implements AltosHashable, AltosJsonable { } 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) { @@ -148,16 +155,6 @@ public class AltosQuaternion implements AltosHashable, AltosJsonable { 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(); @@ -168,16 +165,6 @@ public class AltosQuaternion implements AltosHashable, AltosJsonable { 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;