X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosQuaternion.java;h=40786e3293d586838af319d8849ac265df1e65cf;hp=6a09bb8e490d4ef3b36e9b4f9508c7465f1e1bda;hb=51bdee662fdfad1937c576daadd2e5eacac17905;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b

diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java
index 6a09bb8e..40786e32 100644
--- 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, AltosJsonable {
+public class AltosQuaternion {
 	double	r;		/* real bit */
 	double	x, y, z;	/* imaginary bits */
 
@@ -115,10 +116,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) {
@@ -147,44 +155,4 @@ public class AltosQuaternion implements AltosHashable, 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 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();
-
-		j.put("r", r);
-		j.put("x", x);
-		j.put("y", y);
-		j.put("z", z);
-		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;
-
-		r = j.get_double("r", 1);
-		x = j.get_double("x", 0);
-	        y = j.get_double("y", 0);
-		z = j.get_double("z", 0);
-	}
 }