Full MVVM refactor

TT Lab.sln

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TT Lab", "TT Lab\TT Lab.csp
 		{14348117-4503-49CD-94F9-1852069543E3} = {14348117-4503-49CD-94F9-1852069543E3}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLWpfControl", "GLWpfControl\src\GLWpfControl\GLWpfControl.csproj", "{FA7C1291-E0F8-4C2F-8964-DE992B00E568}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,14 +43,6 @@ Global
 		{640EEAEC-CB84-4499-B5A9-E084CAB68D91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{640EEAEC-CB84-4499-B5A9-E084CAB68D91}.Release|x64.ActiveCfg = Release|x64
 		{640EEAEC-CB84-4499-B5A9-E084CAB68D91}.Release|x64.Build.0 = Release|x64
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Debug|x64.Build.0 = Debug|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Release|x64.ActiveCfg = Release|Any CPU
-		{FA7C1291-E0F8-4C2F-8964-DE992B00E568}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TT Lab/App.xaml

@@ -3,14 +3,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:TT_Lab"
              xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"
-             xmlns:adonisControls="clr-namespace:AdonisUI.Controls;assembly=AdonisUI"
-             StartupUri="MainWindow.xaml">
+             xmlns:adonisControls="clr-namespace:AdonisUI.Controls;assembly=AdonisUI">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/AdonisUI;component/ColorSchemes/Dark.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/AdonisUI.ClassicTheme;component/Resources.xaml"/>
                 <ResourceDictionary Source="LabStyles.xaml"/>
+                <ResourceDictionary>
+                    <local:Bootstrapper x:Key="Bootstrapper"/>
+                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

TT Lab/AssetData/AbstractAssetData.cs

@@ -1,8 +1,10 @@
-using Newtonsoft.Json;
+using Caliburn.Micro;
+using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
 using TT_Lab.Assets;
 using TT_Lab.Assets.Factory;
+using TT_Lab.Project;
 using Twinsanity.TwinsanityInterchange.Interfaces;
 
 namespace TT_Lab.AssetData
@@ -19,7 +21,7 @@ public abstract class AbstractAssetData : IDisposable
         public void Load(String dataPath, JsonSerializerSettings? settings = null)
         {
             var workingDirectory = System.IO.Directory.GetCurrentDirectory();
-            System.IO.Directory.SetCurrentDirectory(Project.ProjectManagerSingleton.PM.OpenedProject!.ProjectPath);
+            System.IO.Directory.SetCurrentDirectory(IoC.Get<ProjectManager>().OpenedProject!.ProjectPath);
             LoadInternal(dataPath, settings);
             System.IO.Directory.SetCurrentDirectory(workingDirectory);
         }
@@ -32,7 +34,20 @@ protected virtual void LoadInternal(String dataPath, JsonSerializerSettings? set
             disposedValue = false;
         }
 
-        public virtual void Save(String dataPath, JsonSerializerSettings? settings = null)
+        public void Save(String dataPath, JsonSerializerSettings? settings = null)
+        {
+            var workingDirectory = System.IO.Directory.GetCurrentDirectory();
+            System.IO.Directory.SetCurrentDirectory($"{IoC.Get<ProjectManager>().OpenedProject!.ProjectPath}\\assets");
+            SaveInternal(dataPath, settings);
+            System.IO.Directory.SetCurrentDirectory(workingDirectory);
+        }
+
+        public void SaveInCurrentDirectory(String dataPath, JsonSerializerSettings? settings = null)
+        {
+            SaveInternal(dataPath, settings);
+        }
+
+        protected virtual void SaveInternal(String dataPath, JsonSerializerSettings? settings = null)
         {
             using System.IO.FileStream fs = new(dataPath, System.IO.FileMode.Create, System.IO.FileAccess.Write);
             using System.IO.BinaryWriter writer = new(fs);

TT Lab/AssetData/Code/Behaviour/BehaviourCommandsSequenceData.cs

@@ -25,7 +25,7 @@ public BehaviourCommandsSequenceData(ITwinBehaviourCommandsSequence codeModel) :
         public String Code { get; set; }
         public List<UInt32> BehaviourGraphIds { get; set; }
 
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             using FileStream fs = new(dataPath, FileMode.Create, FileAccess.Write);
             using BinaryWriter writer = new(fs);

TT Lab/AssetData/Code/Behaviour/BehaviourGraphData.cs

@@ -26,7 +26,7 @@ protected override void Dispose(Boolean disposing)
             Graph = "";
         }
 
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             using var fs = new FileStream(dataPath, FileMode.Create, FileAccess.Write);
             using var writer = new BinaryWriter(fs);

TT Lab/AssetData/Code/SoundEffectData.cs

@@ -29,7 +29,7 @@ protected override void Dispose(Boolean disposing)
             return;
         }
 
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             using FileStream fs = new(dataPath, FileMode.Create, FileAccess.Write);
             using BinaryWriter writer = new(fs);

TT Lab/AssetData/Global/PTCData.cs

@@ -41,9 +41,9 @@ public override void Import(LabURI package, String? variant, Int32? layoutId)
         {
             var assetManager = AssetManager.Get();
             var ptc = GetTwinItem<ITwinPTC>();
-            var texture = new Texture(package, true, $"{ptc.GetName()}_Texture_{variant}", ptc.TexID, $"{ptc.GetName()}_Texture", ptc.Texture);
+            var texture = new Texture(package, true, $"{ptc.GetName()}_{variant}", ptc.TexID, $"{ptc.GetName()}_Texture", ptc.Texture);
             assetManager.AddAssetToImport(texture);
-            var material = new Material(package, true, $"{ptc.GetName()}_Material_{variant}", ptc.MatID, $"{ptc.GetName()}_Material", ptc.Material);
+            var material = new Material(package, true, $"{ptc.GetName()}_{variant}", ptc.MatID, $"{ptc.GetName()}_Material", ptc.Material);
             assetManager.AddAssetToImport(material);
 
             TextureID = texture.URI;

TT Lab/AssetData/Global/SaveIconData.cs

@@ -32,7 +32,7 @@ public override void Import(LabURI package, String? variant, Int32? layoutId)
             return;
         }
 
-        public override void Save(String dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(String dataPath, JsonSerializerSettings? settings = null)
         {
             using var fs = new FileStream(dataPath, FileMode.Create, FileAccess.Write);
             using var writer = new BinaryWriter(fs);

TT Lab/AssetData/Global/TextFileData.cs

@@ -31,7 +31,7 @@ public override void Import(LabURI package, String? variant, Int32? layoutId)
             return;
         }
 
-        public override void Save(String dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(String dataPath, JsonSerializerSettings? settings = null)
         {
             using var fs = new FileStream(dataPath, FileMode.Create, FileAccess.Write);
             using var writer = new BinaryWriter(fs);

TT Lab/AssetData/Graphics/BlendSkinData.cs

@@ -43,7 +43,7 @@ protected override void Dispose(Boolean disposing)
             Blends.Clear();
         }
 
-        public override void Save(String dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(String dataPath, JsonSerializerSettings? settings = null)
         {
             var scene = new SharpGLTF.Scenes.SceneBuilder("TwinsanityBlendSkin");
             var root = new SharpGLTF.Scenes.NodeBuilder("blend_skin_root");
@@ -122,7 +122,7 @@ static VERTEX_BUILDER generateVertexFromTwinVertex(Vertex vertex)
                 {
                     var mesh = new MeshBuilder<VERTEX, COLOR_UV, JOINT_WEIGHT>($"blend_subskin_{index++}");
                     var blendShapeInfo = System.Text.Json.JsonSerializer.Serialize(blendModel.BlendShape);
-                    mesh.Extras = SharpGLTF.IO.JsonContent.Serialize(blendModel.BlendShape);
+                    mesh.Extras = System.Text.Json.Nodes.JsonNode.Parse(System.Text.Json.JsonSerializer.Serialize(blendModel.BlendShape));
 
                     foreach (var face in blendModel.Faces)
                     {

TT Lab/AssetData/Graphics/ModelData.cs

@@ -50,7 +50,7 @@ protected override void Dispose(Boolean disposing)
             Meshes.Clear();
         }
 
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             var material = new SharpGLTF.Materials.MaterialBuilder()
                 .WithDoubleSide(true)
@@ -246,7 +246,6 @@ protected override void LoadInternal(String dataPath, JsonSerializerSettings? se
                         if (vertexes.Colors1 != null)
                         {
                             ver.EmitColor = vertexes.Colors1[i].ToTwin();
-                            ver.EmitColor = new Vector4(ver.EmitColor.X * 255, ver.EmitColor.Y * 255, ver.EmitColor.Z * 255, ver.EmitColor.W * 255);
                         }
                         submodel.Add(ver);
                     }

TT Lab/AssetData/Graphics/Shaders/LabShader.cs

@@ -3,7 +3,7 @@
 using TT_Lab.Assets;
 using TT_Lab.Assets.Graphics;
 using TT_Lab.Util;
-using TT_Lab.ViewModels.Graphics;
+using TT_Lab.ViewModels.Editors.Graphics;
 using Twinsanity.TwinsanityInterchange.Common;
 using Twinsanity.TwinsanityInterchange.Common.ShaderAnimation;
 using static Twinsanity.TwinsanityInterchange.Common.TwinShader;
@@ -54,7 +54,7 @@ public class LabShader
 
         public LabShader() { }
 
-        public LabShader(LabShaderViewModel vm)
+        public LabShader(ShaderViewModel vm)
         {
             ShaderType = vm.Type;
             IntParam = vm.IntParam;

TT Lab/AssetData/Graphics/SkinData.cs

@@ -37,7 +37,7 @@ protected override void Dispose(Boolean disposing)
             SubSkins.Clear();
         }
 
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             var scene = new SharpGLTF.Scenes.SceneBuilder("TwinsanitySkin");
             var root = new SharpGLTF.Scenes.NodeBuilder("skin_root");
@@ -151,7 +151,7 @@ protected override void LoadInternal(String dataPath, JsonSerializerSettings? se
                                 vertexes.Positions[i].ToTwin(),
                                 vertexes.Colors0[i].ToTwin(),
                                 vertexes.TexCoords0[i].ToTwin());
-                        ver.Color = new Twinsanity.TwinsanityInterchange.Common.Vector4(ver.Color.X * 255, ver.Color.Y * 255, ver.Color.Z * 255, ver.Color.W * 255);
+                        ver.Color = new Twinsanity.TwinsanityInterchange.Common.Vector4(ver.Color.X, ver.Color.Y, ver.Color.Z, ver.Color.W);
                         ver.JointInfo.JointIndex1 = (Int32)vertexes.Joints0[i].X;
                         ver.JointInfo.JointIndex2 = (Int32)vertexes.Joints0[i].Y;
                         ver.JointInfo.JointIndex3 = (Int32)vertexes.Joints0[i].Z;

TT Lab/AssetData/Graphics/SubModels/SubBlendData.cs

@@ -40,7 +40,7 @@ public SubBlendData(LabURI material, IEnumerable<SharpGLTF.Schema2.Mesh> meshes,
                 var allVertexes = new List<Vertex>();
                 var allIndices = new List<IndexedFace>();
                 var indiceAccessor = 0;
-                var blendShape = (Vector3)mesh.Extras.Deserialize(typeof(Vector3));
+                var blendShape = mesh.Extras.AsValue().GetValue<Vector3>();
                 var primitive = mesh.Primitives[0];
                 var vertexes = primitive.GetVertexColumns();
                 var indices = primitive.GetTriangleIndices();
@@ -57,7 +57,7 @@ public SubBlendData(LabURI material, IEnumerable<SharpGLTF.Schema2.Mesh> meshes,
                             vertexes.Positions[i].ToTwin(),
                             vertexes.Colors0[i].ToTwin(),
                             vertexes.TexCoords0[i].ToTwin());
-                    ver.Color = new Vector4(ver.Color.X * 255, ver.Color.Y * 255, ver.Color.Z * 255, ver.Color.W * 255);
+                    ver.Color = new Vector4(ver.Color.X, ver.Color.Y, ver.Color.Z, ver.Color.W);
                     ver.JointInfo.JointIndex1 = (Int32)vertexes.Joints0[i].X;
                     ver.JointInfo.JointIndex2 = (Int32)vertexes.Joints0[i].Y;
                     ver.JointInfo.JointIndex3 = (Int32)vertexes.Joints0[i].Z;

TT Lab/AssetData/Graphics/TextureData.cs

@@ -35,7 +35,7 @@ protected override void Dispose(Boolean disposing)
                 Bitmap.Dispose();
             }
         }
-        public override void Save(string dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(string dataPath, JsonSerializerSettings? settings = null)
         {
             if (Bitmap != null && !Disposed)
             {

TT Lab/AssetData/Instance/Scenery/SceneryBaseData.cs

@@ -7,7 +7,7 @@
 using TT_Lab.Assets.Factory;
 using TT_Lab.Assets.Graphics;
 using TT_Lab.Util;
-using TT_Lab.ViewModels.Instance.Scenery;
+using TT_Lab.ViewModels.Editors.Instance.Scenery;
 using Twinsanity.TwinsanityInterchange.Common;
 using Twinsanity.TwinsanityInterchange.Common.ScenerySubtypes;
 using Twinsanity.TwinsanityInterchange.Enumerations;

TT Lab/AssetData/Instance/Scenery/SceneryLeafData.cs

@@ -1,6 +1,6 @@
 using System;
 using TT_Lab.Assets;
-using TT_Lab.ViewModels.Instance.Scenery;
+using TT_Lab.ViewModels.Editors.Instance.Scenery;
 using Twinsanity.TwinsanityInterchange.Common.ScenerySubtypes;
 
 namespace TT_Lab.AssetData.Instance.Scenery

TT Lab/AssetData/Instance/Scenery/SceneryNodeData.cs

@@ -3,7 +3,7 @@
 using System.IO;
 using TT_Lab.Assets;
 using TT_Lab.Util;
-using TT_Lab.ViewModels.Instance.Scenery;
+using TT_Lab.ViewModels.Editors.Instance.Scenery;
 using Twinsanity.TwinsanityInterchange.Common.ScenerySubtypes;
 using Twinsanity.TwinsanityInterchange.Interfaces.Items.SM;
 

TT Lab/AssetData/Instance/Scenery/SceneryRootData.cs

@@ -2,7 +2,7 @@
 using System;
 using System.IO;
 using TT_Lab.Assets;
-using TT_Lab.ViewModels.Instance.Scenery;
+using TT_Lab.ViewModels.Editors.Instance.Scenery;
 using Twinsanity.TwinsanityInterchange.Common.ScenerySubtypes;
 using Twinsanity.TwinsanityInterchange.Interfaces.Items.SM;
 

TT Lab/AssetData/Instance/SceneryData.cs

@@ -72,13 +72,13 @@ protected override void Dispose(Boolean disposing)
             Sceneries.Clear();
         }
 
-        public override void Save(String dataPath, JsonSerializerSettings? settings = null)
+        protected override void SaveInternal(String dataPath, JsonSerializerSettings? settings = null)
         {
             settings = new JsonSerializerSettings
             {
                 TypeNameHandling = TypeNameHandling.All
             };
-            base.Save(dataPath, settings);
+            base.SaveInternal(dataPath, settings);
         }
 
         protected override void LoadInternal(String dataPath, JsonSerializerSettings? settings = null)

TT Lab/Assets/AssetManager.cs

@@ -1,4 +1,5 @@
-using System;
+using Caliburn.Micro;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -15,6 +16,9 @@ public class AssetManager
         private AssetStorage _assets = new();
         private AssetStorage _importAssets = new();
 
+        // TODO: Check if locks are required to access assets for thread-safety
+        //private object assetAccessLock = new object();
+
         public AssetManager() { }
 
         public AssetManager(Dictionary<LabURI, IAsset> assets)
@@ -105,7 +109,7 @@ public void RemoveAsset(LabURI uri)
         /// <returns>AssetManager for the currently opened project</returns>
         public static AssetManager Get()
         {
-            return ProjectManagerSingleton.PM.OpenedProject!.AssetManager;
+            return IoC.Get<ProjectManager>().OpenedProject!.AssetManager;
         }
 
         /// <summary>

TT Lab/Assets/ChunkFolder.cs

@@ -1,6 +1,6 @@
 using System;
 using TT_Lab.AssetData;
-using TT_Lab.Editors;
+using TT_Lab.ViewModels.Editors;
 
 namespace TT_Lab.Assets
 {
@@ -34,7 +34,7 @@ public override AbstractAssetData GetData()
 
         public override Type GetEditorType()
         {
-            return typeof(ChunkEditor);
+            return typeof(ChunkEditorViewModel);
         }
     }
 }