altos/lisp: Fix uninitialized values in ao_lisp_make_const

[fw/altos] / altoslib / AltosQuaternion.java

diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java
index 98c2fe51322851e5b7fb1e5b95723fc173f4655e..40786e3293d586838af319d8849ac265df1e65cf 100644 (file)
--- a/altoslib/AltosQuaternion.java
+++ b/altoslib/AltosQuaternion.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
- * 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
@@ -17,7 +18,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosQuaternion implements AltosJsonable {
+public class AltosQuaternion {
        double  r;              /* real bit */
        double  x, y, z;        /* imaginary bits */
 
@@ -154,24 +155,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);
-       }
 }