From 6c16a45d5d4ef4430a7bd5d6eaa0a246f7d71306 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Tue, 30 Jul 2024 22:42:48 +0200
Subject: [PATCH] Update ModelContainer API inside OMI-Lib

---
 PCK-Studio/Internal/ModelImporter.cs | 10 +++++-----
 PCK-Studio/MainForm.cs               |  8 ++++----
 Vendor/OMI-Lib                       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/PCK-Studio/Internal/ModelImporter.cs b/PCK-Studio/Internal/ModelImporter.cs
index da5abc2d..b98bfb73 100644
--- a/PCK-Studio/Internal/ModelImporter.cs
+++ b/PCK-Studio/Internal/ModelImporter.cs
@@ -265,10 +265,10 @@ namespace PckStudio.Internal
             {
                 var outline = new Outline(part.Name);
 
-                Vector3 partTranslation = new Vector3(part.TranslationX, part.TranslationY, part.TranslationZ);
+                Vector3 partTranslation = part.Translation;
                 outline.Origin = TranslateToInternalPosition("", partTranslation, Vector3.Zero, transformAxis);
 
-                Vector3 rotation = new Vector3(part.UnknownFloat, part.TextureOffsetX, part.TextureOffsetY) + new Vector3(part.RotationX, part.RotationY, part.RotationZ);
+                Vector3 rotation = part.Rotation + part.AdditionalRotation;
                 outline.Rotation = rotation * TransformSpace(Vector3.One, Vector3.Zero, transformAxis);
 
                 foreach (ModelBox box in part.Boxes)
@@ -316,10 +316,10 @@ namespace PckStudio.Internal
 
         private static Element CreateElement(ModelBox box, Vector3 origin, string name)
         {
-            Vector3 pos = new Vector3(box.PositionX, box.PositionY, box.PositionZ);
-            Vector3 size = new Vector3(box.Length, box.Height, box.Width);
+            Vector3 pos = box.Position;
+            Vector3 size = box.Size;
             Vector3 transformPos = TranslateToInternalPosition("", pos + origin, size, new Vector3(1, 1, 0));
-            return CreateElement(name, new Vector2(box.UvX, box.UvY), transformPos, size, box.Scale, box.Mirror);
+            return CreateElement(name, box.Uv, transformPos, size, box.Scale, box.Mirror);
         }
 
         private static Element CreateElement(Vector2 uvOffset, Vector3 pos, Vector3 size, float inflate, bool mirror)
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 0ab4b908..a3975652 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -599,7 +599,7 @@ namespace PckStudio
 		public void HandleModelsFile(PckAsset file)
 		{
 			ModelContainer modelContainer = file.GetData(new ModelFileReader());
-			if (modelContainer.Models.Count == 0)
+			if (modelContainer.ModelCount == 0)
 			{
 				MessageBox.Show("No models found.", "Empty Model file", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				return;
@@ -619,10 +619,10 @@ namespace PckStudio
 			Debug.WriteLineIf(modelMetaData.Count > 0, JsonConvert.SerializeObject(modelMetaData, Formatting.Indented));
 #endif
 
-			using ItemSelectionPopUp itemSelection = new ItemSelectionPopUp(modelContainer.Models.Keys.ToArray());
-			if (itemSelection.ShowDialog() == DialogResult.OK && modelContainer.Models.ContainsKey(itemSelection.SelectedItem))
+			using ItemSelectionPopUp itemSelection = new ItemSelectionPopUp(modelContainer.GetModelNames().ToArray());
+			if (itemSelection.ShowDialog() == DialogResult.OK && modelContainer.ContainsModel(itemSelection.SelectedItem))
 			{
-				Model model = modelContainer.Models[itemSelection.SelectedItem];
+				Model model = modelContainer.GetModelByName(itemSelection.SelectedItem);
 				Debug.WriteLine(model.Name + "; ");
 				Debug.WriteLine(model.TextureSize + "; ");
 			
diff --git a/Vendor/OMI-Lib b/Vendor/OMI-Lib
index 55b084f4..02d37596 160000
--- a/Vendor/OMI-Lib
+++ b/Vendor/OMI-Lib
@@ -1 +1 @@
-Subproject commit 55b084f40e32e1427c12146fa35fa0525273a696
+Subproject commit 02d37596d071f8fa7b0fb98f6d7c989c7a98e774