LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-31 11:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ModelContainer API inside OMI-Lib

Browse Source
This commit is contained in:
miku-666
2024-07-30 22:42:48 +02:00
parent 5ddfdb5797
commit 6c16a45d5d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PCK-Studio/Internal/ModelImporter.cs
View File

@@ -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)

8
PCK-Studio/MainForm.cs
View File

@@ -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 + "; ");

2
Vendor/OMI-Lib vendored

Submodule Vendor/OMI-Lib updated: 55b084f40e...02d37596d0