lvjincheng 3 лет назад
Родитель
Сommit
308f41bdf0

+ 19 - 5
Assets/BowArrow/Scripts/Bluetooth/New/AttitudeJson.cs

@@ -32,11 +32,6 @@ public class AttitudeJson : JCUnityLib.CustomJson
             "Variance",
             "Variance",
             "VectorByBlock"
             "VectorByBlock"
         );
         );
-        InitJsonClass<EllipsoidFitting>(() => new EllipsoidFitting(default, default, default),
-            "Center", 
-            "CorrectMatrixArray", 
-            "Radius"
-        );
         InitJsonClass<ByteToShorts>(() => new ByteToShorts(3),
         InitJsonClass<ByteToShorts>(() => new ByteToShorts(3),
             "ByteToShort"
             "ByteToShort"
         );
         );
@@ -50,6 +45,25 @@ public class AttitudeJson : JCUnityLib.CustomJson
             "Short", 
             "Short", 
             "ThresholdRate"
             "ThresholdRate"
         );
         );
+        InitJsonClass<EllipsoidFitting>(
+            o => {
+                var to = (EllipsoidFitting)o;
+                JToken jt = new JObject();
+                jt["Center"] = ToJTokenByImporter(to.Center);
+                jt["CorrectMatrixArray"] = ToJTokenByImporter(to.CorrectMatrixArray);
+                jt["Raduis"] = ToJTokenByImporter(to.Radius);
+                return jt;
+            },
+            jt => {
+                var o = new EllipsoidFitting(
+                    (Vector<double>)ParseByExporter(jt["Center"], typeof(Vector<double>)), 
+                    null, 
+                    (Vector<double>)ParseByExporter(jt["Radius"], typeof(Vector<double>))
+                );
+                o.CorrectMatrixArray = (double[][])ParseByExporter(jt["CorrectMatrixArray"], typeof(double[][]));
+                return o;
+            }
+        );
         InitJsonClass<Dictionary<Vector<int>, Vector<double>>>(
         InitJsonClass<Dictionary<Vector<int>, Vector<double>>>(
             o => JToken.FromObject(o),
             o => JToken.FromObject(o),
             jt => {
             jt => {

+ 6 - 0
Assets/BowArrow/Scripts/Bluetooth/o0Lib/link.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+  <assembly fullname="o0NetIMU">
+    <namespace fullname="o0.IMU" preserve="all"/>
+  </assembly>
+</linker>

+ 7 - 0
Assets/BowArrow/Scripts/Bluetooth/o0Lib/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e9b18f4c640be0349a61d4740efdb8a7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: