Browse Source

Remove obsolete serialization code

Nick Steyer 1 year ago
parent
commit
2bf63edb3e

+ 3 - 8
Assembly-CSharp.csproj

@@ -8,7 +8,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20506</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <ProjectGuid>{4322513C-6AC2-9058-38C0-BCFE306751F6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -56,7 +57,6 @@
     <Analyzer Include="C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Microsoft\Visual Studio Tools for Unity\Analyzers\Microsoft.Unity.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Assets\StreetLight\Serialization\Matrix4x4Converter.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\ChooseTrackedObjectMenu.cs" />
     <Compile Include="Assets\StreetLight\Scripts\PositionCalculator.cs" />
     <Compile Include="Assets\Pong\Ball.cs" />
@@ -86,7 +86,6 @@
     <Compile Include="Assets\ZED\Examples\OpenCV ArUco Detection\Scripts\Core\ZEDToOpenCVRetriever.cs" />
     <Compile Include="Assets\Pong\Bumper.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\Utilities\GUIMessage.cs" />
-    <Compile Include="Assets\StreetLight\Serialization\Vector2Converter.cs" />
     <Compile Include="Assets\ZED\Examples\SpatialMapping\Scripts\NavMeshSurface.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\Interactions\ZEDControllerTracker_DemoInputs.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\ZEDXRGrabber.cs" />
@@ -96,7 +95,6 @@
     <Compile Include="Assets\ZED\Examples\Drone Shooter\Scripts\Utilities\ILaserable.cs" />
     <Compile Include="Assets\ZED\Examples\Dark Room\Scripts\DisableUntilZEDReady.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\TranslateArrow.cs" />
-    <Compile Include="Assets\StreetLight\Serialization\QuaternionConverter.cs" />
     <Compile Include="Assets\ZED\Examples\OpenCV ArUco Detection\Scripts\Drone Wars\AssertObjectExistenceOnEnable.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\DrawOutputToPlane.cs" />
     <Compile Include="Assets\ZED\Examples\Object Detection\Scripts\ZED3DObjectVisualizer.cs" />
@@ -119,7 +117,6 @@
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\Utilities\ZEDSVOManager.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\ToggleGroup3D.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\SkeletonTracking\RigBone.cs" />
-    <Compile Include="Assets\StreetLight\Serialization\Vector3Converter.cs" />
     <Compile Include="Assets\ZED\Examples\Dark Room\Scripts\RandomDirLightManager.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\CreateZEDModel.cs" />
     <Compile Include="Assets\ZED\Examples\SpatialMapping\Scripts\RandomWalk.cs" />
@@ -142,7 +139,6 @@
     <Compile Include="Assets\ZED\Examples\Drone Shooter\Scripts\Utilities\ZEDProjectile.cs" />
     <Compile Include="Assets\ZED\Examples\Drone Shooter\Scripts\Simple\DroneSpawner.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\TransformControl.cs" />
-    <Compile Include="Assets\StreetLight\Serialization\GameObjectConverter.cs" />
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\ToggleButton.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\Utilities\ExportNavMesh.cs" />
     <Compile Include="Assets\Calibration\CalibrationRecorderBehavior.cs" />
@@ -155,7 +151,6 @@
     <Compile Include="Assets\ZED\Tools\Mixed Reality Calibration\Scripts\SetControllerSkin.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\SkeletonTracking\SkeletonHandler.cs" />
     <Compile Include="Assets\ZED\SDK\Helpers\Scripts\IZEDManager.cs" />
-    <Compile Include="Assets\StreetLight\Serialization\ColorConverter.cs" />
     <Compile Include="Assets\ZED\SDK\NativeInterface\ZEDMat.cs" />
     <Compile Include="Assets\ZED\Examples\SpatialMapping\Scripts\NavMeshAgentController.cs" />
     <Compile Include="Assets\ZED\Examples\Dark Room\Scripts\StrobeLight.cs" />
@@ -989,4 +984,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

+ 0 - 43
Assets/StreetLight/Adapters/ZedPersonDetector.cs

@@ -1,10 +1,7 @@
 using Assets.StreetLight.Interfaces;
 using Assets.StreetLight.Poco;
-using Assets.StreetLight.Serialization;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using UnityEngine;
 
@@ -43,45 +40,5 @@ namespace Assets.StreetLight.Adapters
 
             PersonsDetected?.Invoke(this, detectedPersons.ToList());
         }
-
-        private void WriteDetectionFrameToJson(DetectionFrame objFrame)
-        {
-            var errors = new List<string>();
-
-            JsonSerializerSettings settings = new()
-            {
-                Converters = new List<JsonConverter>() {
-                    new Vector2Converter(),
-                    new Vector3Converter(),
-                    new QuaternionConverter(),
-                    new ColorConverter(),
-                    new Matrix4x4Converter()
-                },
-                Error = (s, a) =>
-                {
-                    if (a.CurrentObject != null)
-                    {
-                        errors.Add(a.ErrorContext.Error.Message);
-                    }
-                    a.ErrorContext.Handled = true;
-                },
-                //TraceWriter = new TraceWriter()
-            };
-
-            var serializer = JsonSerializer.Create(settings);
-
-            using (var file = File.CreateText(@$"C:\Users\nick.steyer\SmartStreetLight\{DateTime.Now:HH-mm-ss-fff}.json"))
-            {
-                try
-                {
-                    serializer.Serialize(file, objFrame);
-                }
-                catch (Exception ex)
-                {
-                    Debug.Log(ex.Message);
-                    Debug.Log(ex.StackTrace);
-                }
-            }
-        }
     }
 }

+ 0 - 8
Assets/StreetLight/Serialization.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7682ae16720c56b4b88a608288699f4c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 25
Assets/StreetLight/Serialization/ColorConverter.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class ColorConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Color);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new Color();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var color = (Color)value;
-            writer.WriteValue($"({color.a}|{color.r}|{color.g}|{color.b})");
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/ColorConverter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 379108c4fe7e9f142a1a95e496ffcaa6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 33
Assets/StreetLight/Serialization/GameObjectConverter.cs

@@ -1,33 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class GameObjectConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(GameObject);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new GameObject();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var gameObject = (GameObject)value;
-
-            if (gameObject == null)
-            {
-                writer.WriteValue("null");
-            }
-            else
-            {
-                writer.WriteValue(gameObject);
-            }
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/GameObjectConverter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d63d25d545478c24dabc1d33a4f9fa0a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 25
Assets/StreetLight/Serialization/Matrix4x4Converter.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class Matrix4x4Converter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Matrix4x4);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new Matrix4x4();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var matrix = (Matrix4x4)value;
-            writer.WriteValue(matrix.ToString());
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/Matrix4x4Converter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1dd62806fa9510f43a973e764bf5978b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 26
Assets/StreetLight/Serialization/QuaternionConverter.cs

@@ -1,26 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class QuaternionConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Quaternion);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new Quaternion();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var vector = (Quaternion)value;
-            var text = $"({vector.x}|{vector.y}|{vector.z}|{vector.w})";
-            writer.WriteValue(text);
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/QuaternionConverter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 53336bb50d2125d4f8bad2d8ace18efb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 25
Assets/StreetLight/Serialization/Vector2Converter.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class Vector2Converter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Vector2);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new Vector2();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var vector = (Vector2)value;
-            writer.WriteValue($"({vector.x}|{vector.y})");
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/Vector2Converter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8860e15b629f9a44a82837fd8574c2df
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 25
Assets/StreetLight/Serialization/Vector3Converter.cs

@@ -1,25 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using UnityEngine;
-
-namespace Assets.StreetLight.Serialization
-{
-    public class Vector3Converter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Vector3);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return new Vector3();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var vector = (Vector3)value;
-            writer.WriteValue($"({vector.x}|{vector.y}|{vector.z})");
-        }
-    }
-}

+ 0 - 11
Assets/StreetLight/Serialization/Vector3Converter.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e41625be946800347a550e0b18923c84
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: