X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRotation.java;h=97cf78967921f8bb10bc1c0d45bb8c7bc0969345;hb=1dce20f7eee56166ac61798ca26eeb323dc8f012;hp=4b7ab407514331e6b3bb62ee117a0a78f62d62c7;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;p=fw%2Faltos

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 4b7ab407..97cf7896 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosRotation implements AltosHashable, AltosJsonable {
+public class AltosRotation extends AltosQuaternion {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -48,36 +48,7 @@ public class AltosRotation implements AltosHashable, AltosJsonable {
 		rotation = up.vectors_to_rotation(orient);
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet h = new AltosHashSet();
-
-		h.putHashable("rotation", rotation);
-		return h;
-	}
-
-	public AltosJson json() {
-		return rotation.json();
-	}
-
-	public AltosRotation(AltosHashSet h) {
-		rotation = new AltosQuaternion(h.getHash("rotation"));
-	}
-
-	public static AltosRotation fromHashSet(AltosHashSet h, AltosRotation def) {
-		if (h == null)
-			return def;
-
-		return new AltosRotation(h);
-	}
-
-	public AltosRotation(AltosJson j) {
-		rotation = new AltosQuaternion(j);
-	}
-
-	public static AltosRotation fromJson(AltosJson j, AltosRotation def) {
-		if (j == null)
-			return def;
-
-		return new AltosRotation(j);
+	public AltosRotation() {
+		rotation = new AltosQuaternion();
 	}
 }