X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRotation.java;h=1235d86b90e57a1c0da9d3923b2c16db0cd09d0f;hb=44c0cecabb3a815dbf7f52e6b2dad364cc72b60c;hp=6db0b541595ce37f51acd0f78c413abd07b72c38;hpb=2a1b7c6c509d4d19de21abf02b63aeacba269d13;p=fw%2Faltos

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 6db0b541..1235d86b 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.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 AltosRotation implements AltosJsonable {
+public class AltosRotation extends AltosQuaternion {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -48,22 +49,7 @@ public class AltosRotation implements AltosJsonable {
 		rotation = up.vectors_to_rotation(orient);
 	}
 
-	public AltosRotation(AltosJson j) {
-		rotation = new AltosQuaternion(j);
-	}
-
 	public AltosRotation() {
 		rotation = new AltosQuaternion();
 	}
-
-	public AltosJson json() {
-		return rotation.json();
-	}
-
-	public static AltosRotation fromJson(AltosJson j, AltosRotation def) {
-		if (j == null)
-			return def;
-
-		return new AltosRotation(j);
-	}
 }