summaryrefslogtreecommitdiff
path: root/altoslib/AltosQuaternion.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-06-17 00:52:38 -0700
committerKeith Packard <keithp@keithp.com>2016-06-17 01:03:40 -0700
commit1dce20f7eee56166ac61798ca26eeb323dc8f012 (patch)
treee7f64afa79991e10d0b7aa680e98af3ce96a62bb /altoslib/AltosQuaternion.java
parent7175774c4f60ed3efd54417f2035b50ea0108c7b (diff)
altoslib: Get rid of manual JSON encoding stuff
Now that the reflective JSON stuff is working, we can delete all of the manual code. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosQuaternion.java')
-rw-r--r--altoslib/AltosQuaternion.java22
1 files changed, 1 insertions, 21 deletions
diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java
index 98c2fe51..79559429 100644
--- a/altoslib/AltosQuaternion.java
+++ b/altoslib/AltosQuaternion.java
@@ -17,7 +17,7 @@
package org.altusmetrum.altoslib_11;
-public class AltosQuaternion implements AltosJsonable {
+public class AltosQuaternion {
double r; /* real bit */
double x, y, z; /* imaginary bits */
@@ -154,24 +154,4 @@ public class AltosQuaternion implements AltosJsonable {
c_x * s_y * c_z + s_x * c_y * s_z,
c_x * c_y * s_z - s_x * s_y * c_z);
}
-
- public AltosJson json() {
- AltosJson j = new AltosJson();
-
- j.put("r", r);
- j.put("x", x);
- j.put("y", y);
- j.put("z", z);
- return j;
- }
-
- public AltosQuaternion(AltosJson j) {
- if (j == null)
- return;
-
- r = j.get_double("r", 1);
- x = j.get_double("x", 0);
- y = j.get_double("y", 0);
- z = j.get_double("z", 0);
- }
}