X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRotation.java;h=321a0f304d53d11d49950f2b82db3d277007ad24;hb=f7e2f7f430e612c682bf55478860054ce94b995f;hp=e9c447ad1e4d69e355a96b25ab630809878a6fdf;hpb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe;p=fw%2Faltos diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java index e9c447ad..321a0f30 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 AltosJsonable { private AltosQuaternion rotation; public double tilt() { @@ -48,21 +48,18 @@ public class AltosRotation implements AltosHashable { 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 AltosRotation(AltosJson j) { + rotation = new AltosQuaternion(j); } - public static AltosRotation fromHashSet(AltosHashSet h, AltosRotation def) { - if (h == null) + public static AltosRotation fromJson(AltosJson j, AltosRotation def) { + if (j == null) return def; - return new AltosRotation(h); + return new AltosRotation(j); } }