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

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index e9c447ad..4b7ab407 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.altoslib_11;
 
-public class AltosRotation implements AltosHashable {
+public class AltosRotation implements AltosHashable, AltosJsonable {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -55,6 +55,10 @@ public class AltosRotation implements AltosHashable {
 		return h;
 	}
 
+	public AltosJson json() {
+		return rotation.json();
+	}
+
 	public AltosRotation(AltosHashSet h) {
 		rotation = new AltosQuaternion(h.getHash("rotation"));
 	}
@@ -65,4 +69,15 @@ public class AltosRotation implements AltosHashable {
 
 		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);
+	}
 }