Merge branch 'development'

Author: michaelsakharov

Prowl.Editor/Assets/AssetDatabase.Core.cs

@@ -5,6 +5,7 @@
 
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
+using Prowl.Echo;
 
 using Debug = Prowl.Runtime.Debug;
 
@@ -576,7 +577,7 @@ public static void SaveAsset(EngineObject assetInstance, bool pingAsset = true)
         {
             try
             {
-                SerializedProperty serialized = Serializer.Serialize(assetInstance);
+                EchoObject serialized = Serializer.Serialize(assetInstance);
                 StringTagConverter.WriteToFile(serialized, fileInfo);
 
                 if(pingAsset)

Prowl.Editor/Assets/AssetDatabase.Packages.cs

@@ -2,17 +2,12 @@
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
 using System.IO.Compression;
-using System.Net.Http.Json;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-
-using BepuPhysics.CollisionDetection;
 
+using Prowl.Editor.Utilities.SemVersion;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 
-using Prowl.Editor.Utilities.SemVersion;
-
 namespace Prowl.Editor.Assets;
 
 #warning TODO: Support other sources then just Github, should support any git source, Also would be nice to look into NuGet support

Prowl.Editor/Assets/Importers/MaterialImporter.cs

@@ -1,7 +1,7 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
-using Prowl.Editor.Preferences;
+using Prowl.Echo;
 using Prowl.Editor.ScriptedEditors;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
@@ -41,7 +41,7 @@ public class MaterialImporterEditor : ScriptedEditor
 
     public override void OnEnable()
     {
-        SerializedProperty tag = StringTagConverter.ReadFromFile((target as MetaFile).AssetPath);
+        EchoObject tag = StringTagConverter.ReadFromFile((target as MetaFile).AssetPath);
         _editingMaterial = Serializer.Deserialize<Material>(tag);
 
         _editor = CreateEditor(_editingMaterial);

Prowl.Editor/Assets/Importers/MeshImporter.cs

@@ -1,6 +1,7 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
+using Prowl.Echo;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 

Prowl.Editor/Assets/Importers/PrefabImporter.cs

@@ -1,6 +1,7 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
+using Prowl.Echo;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 

Prowl.Editor/Assets/Importers/SceneImporter.cs

@@ -1,6 +1,7 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
+using Prowl.Echo;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 

Prowl.Editor/Assets/Importers/ScriptableObjectImporter.cs

@@ -1,8 +1,8 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
+using Prowl.Echo;
 using Prowl.Editor.Preferences;
-using Prowl.Editor.ScriptedEditors;
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 
@@ -28,7 +28,7 @@ public class ScriptableObjectImporterEditor : ScriptedEditor
 
     public override void OnEnable()
     {
-        SerializedProperty tag = StringTagConverter.ReadFromFile((target as MetaFile).AssetPath);
+        EchoObject tag = StringTagConverter.ReadFromFile((target as MetaFile).AssetPath);
         _editingObject = Serializer.Deserialize<ScriptableObject>(tag);
         _objectEditor = null; // Replace this to load a Scripta
     }

Prowl.Editor/Assets/MetaFile.cs

@@ -1,7 +1,7 @@
 // This file is part of the Prowl Game Engine
 // Licensed under the MIT License. See the LICENSE file in the project root for details.
 
-using Prowl.Runtime;
+using Prowl.Echo;
 
 namespace Prowl.Editor.Assets;
 
@@ -43,7 +43,7 @@ public void Save()
     {
         FileInfo file = new(AssetPath.FullName + ".meta");
         version = MetaVersion;
-        SerializedProperty tag = Serializer.Serialize(this);
+        EchoObject tag = Serializer.Serialize(this);
         StringTagConverter.WriteToFile(tag, file);
     }
 
@@ -54,7 +54,7 @@ public void Save()
     {
         FileInfo file = new(assetFile + ".meta");
         if (!File.Exists(file.FullName)) return null; // Doesnt Exist
-        SerializedProperty tag = StringTagConverter.ReadFromFile(file);
+        EchoObject tag = StringTagConverter.ReadFromFile(file);
         MetaFile? meta = Serializer.Deserialize<MetaFile>(tag);
         meta!.AssetPath = assetFile;
         meta.lastModified = DateTime.UtcNow;

Prowl.Editor/Build/DesktopPlayerBuilder.cs

@@ -10,6 +10,7 @@
 using Prowl.Runtime;
 using Prowl.Runtime.Utils;
 using Prowl.Runtime.Rendering;
+using Prowl.Echo;
 
 namespace Prowl.Editor.Build;
 
@@ -260,7 +261,7 @@ private static void PackScenes(AssetRef<Scene>[] scenes, string dataPath)
         {
             // Debug.Log($"Packing scene_{i}.prowl.");
             AssetRef<Scene> scene = scenes[i];
-            SerializedProperty tag = Serializer.Serialize(scene.Res!);
+            EchoObject tag = Serializer.Serialize(scene.Res!);
             BinaryTagConverter.WriteToFile(tag, new FileInfo(Path.Combine(dataPath, $"scene_{i}.prowl")));
         }
     }

Prowl.Editor/Editor/AssetsBrowserWindow.cs

@@ -3,9 +3,9 @@
 
 using System.Reflection;
 
+using Prowl.Echo;
 using Prowl.Editor.Assets;
 using Prowl.Editor.Preferences;
-using Prowl.Editor.Utilities;
 using Prowl.Icons;
 using Prowl.Runtime;
 using Prowl.Runtime.GUI;