projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Improve AltosState save/restore debugging
[fw/altos]
/
altoslib
/
AltosRotation.java
diff --git
a/altoslib/AltosRotation.java
b/altoslib/AltosRotation.java
index e9c447ad1e4d69e355a96b25ab630809878a6fdf..6db0b541595ce37f51acd0f78c413abd07b72c38 100644
(file)
--- a/
altoslib/AltosRotation.java
+++ b/
altoslib/AltosRotation.java
@@
-17,7
+17,7
@@
package org.altusmetrum.altoslib_11;
package org.altusmetrum.altoslib_11;
-public class AltosRotation implements Altos
Hash
able {
+public class AltosRotation implements Altos
Json
able {
private AltosQuaternion rotation;
public double tilt() {
private AltosQuaternion rotation;
public double tilt() {
@@
-48,21
+48,22
@@
public class AltosRotation implements AltosHashable {
rotation = up.vectors_to_rotation(orient);
}
rotation = up.vectors_to_rotation(orient);
}
- public AltosHashSet hashSet() {
- AltosHashSet h = new AltosHashSet();
+ public AltosRotation(AltosJson j) {
+ rotation = new AltosQuaternion(j);
+ }
- h.putHashable("rotation", rotation);
- r
eturn h
;
+ public AltosRotation() {
+ r
otation = new AltosQuaternion()
;
}
}
- public Altos
Rotation(AltosHashSet h
) {
- r
otation = new AltosQuaternion(h.getHash("rotation")
);
+ public Altos
Json json(
) {
+ r
eturn rotation.json(
);
}
}
- public static AltosRotation from
HashSet(AltosHashSet h
, AltosRotation def) {
- if (
h
== null)
+ public static AltosRotation from
Json(AltosJson j
, AltosRotation def) {
+ if (
j
== null)
return def;
return def;
- return new AltosRotation(
h
);
+ return new AltosRotation(
j
);
}
}
}
}