X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRotation.java;h=6db0b541595ce37f51acd0f78c413abd07b72c38;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=411ecbdfae7edd530fc4fd7e1c684499f053b65f;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01;p=fw%2Faltos

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 411ecbdf..6db0b541 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosRotation {
+public class AltosRotation implements AltosJsonable {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -47,4 +47,23 @@ public class AltosRotation {
 		AltosQuaternion	up = new AltosQuaternion(0, 0, 0, sky);
 		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);
+	}
 }