LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-29 10:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ModelImporter - Only show bedrock model select dialog when more than 1 model is in the file

Browse Source
This commit is contained in:
miku-666
2024-05-19 14:01:42 +02:00
parent cd13a302e3
commit 8aae095cbc
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,24 +255,40 @@ namespace PckStudio.Internal
if (fileName.EndsWith(".geo.json"))
{
BedrockModel bedrockModel = JsonConvert.DeserializeObject<BedrockModel>(File.ReadAllText(fileName));
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(bedrockModel.Models.Select(m => m.Description.Identifier).ToArray());
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && bedrockModel.Models.IndexInRange(itemSelectionPopUp.SelectedIndex))
var availableModels = bedrockModel.Models.Select(m => m.Description.Identifier).ToArray();
if (availableModels.Length > 1)
{
selectedGeometry = bedrockModel.Models[itemSelectionPopUp.SelectedIndex];
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && bedrockModel.Models.IndexInRange(itemSelectionPopUp.SelectedIndex))
{
selectedGeometry = bedrockModel.Models[itemSelectionPopUp.SelectedIndex];
}
itemSelectionPopUp.Dispose();
}
else
{
selectedGeometry = bedrockModel.Models[0];
}
itemSelectionPopUp.Dispose();
}
// Bedrock Legacy Model
else if (fileName.EndsWith(".json"))
{
BedrockLegacyModel bedrockModel = JsonConvert.DeserializeObject<BedrockLegacyModel>(File.ReadAllText(fileName));
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(bedrockModel.Select(m => m.Key).ToArray());
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && itemSelectionPopUp.SelectedItem is not null)
var availableModels = bedrockModel.Select(m => m.Key).ToArray();
if (availableModels.Length > 1)
{
selectedGeometry = bedrockModel[itemSelectionPopUp.SelectedItem];
ItemSelectionPopUp itemSelectionPopUp = new ItemSelectionPopUp(availableModels);
if (itemSelectionPopUp.ShowDialog() == DialogResult.OK && itemSelectionPopUp.SelectedItem is not null)
{
selectedGeometry = bedrockModel[itemSelectionPopUp.SelectedItem];
}
itemSelectionPopUp.Dispose();
}
else
{
selectedGeometry = bedrockModel[availableModels[0]];
}
itemSelectionPopUp.Dispose();
}
SkinModelInfo modelInfo = null;
@@ -356,7 +372,7 @@ namespace PckStudio.Internal
foreach (External.Format.Cube cube in bone.Cubes)
{
Vector3 pos = TranslateToInternalPosition(boxType, cube.Origin, cube.Size, Vector3.UnitY);
var skinBox = new SkinBOX(boxType, pos, cube.Size, cube.Uv);
var skinBox = new SkinBOX(boxType, pos, cube.Size, cube.Uv, mirror: cube.Mirror);
if (bone.Name == "helmet")
{
skinBox.HideWithArmor = true;