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 af9eb47558c701ad273753934826a4f6a5638854..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 AltosHashable {
+public class AltosQuaternion {
        double  r;              /* real bit */
        double  x, y, z;        /* imaginary bits */
 
@@ -115,10 +116,17 @@ public class AltosQuaternion implements AltosHashable {
        }
 
        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 +155,4 @@ public class AltosQuaternion implements AltosHashable {
                                           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 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 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);
-       }
 }