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

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 4e4127cf..6db0b541 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.java
@@ -15,9 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
-public class AltosRotation {
+public class AltosRotation implements AltosJsonable {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -28,7 +28,7 @@ public class AltosRotation {
 	}
 
 	public void rotate(double dt, double x, double y, double z) {
-		AltosQuaternion	rot = AltosQuaternion.half_euler(x * dt, y * dt, z * dt);
+		AltosQuaternion	rot = AltosQuaternion.half_euler(x * dt / 2.0, y * dt / 2.0, z * dt / 2.0);
 		rotation = rot.multiply(rotation).normalize();
 	}
 
@@ -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);
+	}
 }