altoslib: Get rid of manual JSON encoding stuff

[fw/altos] / altoslib / AltosQuaternion.java

diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java
index 1b4a9419c875799b3abaaca022e0535e75288c61..795594294e92591a22984383dba050a76b61517f 100644 (file)
--- a/altoslib/AltosQuaternion.java
+++ b/altoslib/AltosQuaternion.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosQuaternion implements AltosJsonable {
+public class AltosQuaternion {
        double  r;              /* real bit */
        double  x, y, z;        /* imaginary bits */
 
@@ -115,10 +115,17 @@ public class AltosQuaternion implements 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) {
@@ -147,24 +154,4 @@ public class AltosQuaternion implements AltosJsonable {
                                           c_x * s_y * c_z + s_x * c_y * s_z,
                                           c_x * c_y * s_z - s_x * s_y * c_z);
        }
-
-       public AltosJson json() {
-               AltosJson j = new AltosJson();
-
-               j.put("r", r);
-               j.put("x", x);
-               j.put("y", y);
-               j.put("z", z);
-               return j;
-       }
-
-       public AltosQuaternion(AltosJson j) {
-               if (j == null)
-                       return;
-
-               r = j.get_double("r", 1);
-               x = j.get_double("x", 0);
-               y = j.get_double("y", 0);
-               z = j.get_double("z", 0);
-       }
 }