Working on Json serialization.

Author: Jared Bienz

SpatialAlignment-Unity/Assembly-CSharp.Player.csproj

@@ -521,7 +521,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: acbe461e1fd0d1541aae9edae3fddc44, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mode: 0
   parentOptions:
   - frame: {fileID: 1478666017}
     minimumAccuracy: {x: 0, y: 0, z: 0}
@@ -634,6 +633,53 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 992500263}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1034952781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1034952783}
+  - component: {fileID: 1034952782}
+  m_Layer: 0
+  m_Name: PersistenceExample
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1034952782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034952781}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13265d8d7bf8cc04fa7aa108cf67a889, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Frames:
+  - {fileID: 1478666017}
+  - {fileID: 1891623029}
+  - {fileID: 332004590}
+--- !u!4 &1034952783
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034952781}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1231208087
 GameObject:
   m_ObjectHideFlags: 0

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/MultiParent/Scenes/SA-MultiParent.unity

@@ -50,6 +50,7 @@ private async Task LoadAsync()
 
         private async Task SaveAsync()
         {
+            string result = null;
             foreach (var frame in Frames)
             {
                 await store.SaveFrameAsync(frame);
@@ -60,17 +61,20 @@ private async Task SaveAsync()
                 using (JsonTextWriter jw = new JsonTextWriter(sw))
                 {
                     await store.SaveDocumentAsync(jw);
+                    result = sw.ToString();
                 }
-
             }
 
+            Debug.Log(result);
+
         }
 
         // Start is called before the first frame update
         void Start()
         {
             store = new JsonStore();
-            var t = LoadAsync();
+            var t = SaveAsync();
+            t.Wait();
         }
     }
 }

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Persistence/Scripts/PersistenceExampleManager.cs

@@ -54,6 +54,11 @@ private JsonSerializer CreateSerializer()
             // Add converter
             settings.Converters.Add(new SpatialFrameConverter());
 
+            // Enable automatic type name handling to allow extensions for alignment strategies
+            // WARNING: Must implement ISerializationBinder to safely handle instantiation
+            // See https://stackoverflow.com/questions/39565954/typenamehandling-caution-in-newtonsoft-json
+            settings.TypeNameHandling = TypeNameHandling.Auto;
+
             // Create the serializer
             return JsonSerializer.Create(settings);
         }

SpatialAlignment-Unity/Assets/SpatialAlignment/Persistence/Json/JsonStore.cs

@@ -23,9 +23,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
@@ -42,16 +44,19 @@ namespace Microsoft.SpatialAlignment
     /// more than one frame of reference. The <see cref="ISpatialFrame"/> interface is used
     /// to represent one of potentially many frames of reference.
     /// </remarks>
+    [DataContract]
     public class SpatialFrame : MonoBehaviour
     {
         #region Unity Inspector Variables
+        [DataMember]
         [SerializeField]
         [Tooltip("A unique ID for the spatial frame.")]
         private string id;
         #endregion // Unity Inspector Variables
 
         #region Public Properties
         /// <inheritdoc />
+        [DataMember]
         public virtual IAlignmentStrategy AlignmentStrategy { get => GetComponent<IAlignmentStrategy>(); }
 
         /// <inheritdoc />

SpatialAlignment-Unity/Assets/SpatialAlignment/SpatialFrame.cs

@@ -27,6 +27,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using UnityEngine;
 
 namespace Microsoft.SpatialAlignment
@@ -38,13 +39,16 @@ namespace Microsoft.SpatialAlignment
     /// This strategy doesn't modify the transform of the object it's applied to, it simply
     /// simulates the various states of the <see cref="IAlignmentStrategy"/> interface.
     /// </remarks>
+    [DataContract]
     public class SimulatedAlignment : AlignmentStrategy
     {
         #region Unity Inspector Variables
+        [DataMember]
         [SerializeField]
         [Tooltip("The current simulated accuracy.")]
         private Vector3 currentAccuracy;
 
+        [DataMember]
         [SerializeField]
         [Tooltip("The current simulated state.")]
         private AlignmentState currentState = AlignmentState.Resolved;

SpatialAlignment-Unity/Assets/SpatialAlignment/Strategies/SimulatedAlignment.cs

@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/SpatialAlignment-Examples/MultiParent/SA-MultiParent.unity
+    path: Assets/SpatialAlignment-Examples/MultiParent/Scenes/SA-MultiParent.unity
     guid: 99c9720ab356a0642a771bea13969a05
   m_configObjects: {}

SpatialAlignment-Unity/ProjectSettings/EditorBuildSettings.asset

@@ -527,7 +527,7 @@ PlayerSettings:
   scriptingDefineSymbols: {}
   platformArchitecture: {}
   scriptingBackend:
-    Metro: 2
+    Metro: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}