LegacyConsole/PCK-Studio
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-24 13:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ModelEditor - Use Editor as base class

Browse Source
This commit is contained in:
miku-666
2025-02-05 19:52:05 +01:00
parent 457fbb1044
commit e2818f8f1c
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PCK-Studio/Forms/Editor/ModelEditor.cs
View File

@@ -19,16 +19,15 @@ using OMI.Formats.Material;
namespace PckStudio.Forms.Editor
{
public partial class ModelEditor : MetroForm
public partial class ModelEditor : Editor<ModelContainer>
{
private readonly ModelContainer _models;
private readonly ITryGetSet<string, Image> _textures;
private readonly ITryGet<string, MaterialContainer.Material> _tryGetEntityMaterial;
public ModelEditor(ModelContainer models, ITryGetSet<string, Image> tryGetSetTextures, ITryGet<string, MaterialContainer.Material> tryGetEntityMaterial)
public ModelEditor(ModelContainer models, ISaveContext<ModelContainer> saveContext, ITryGetSet<string, Image> tryGetSetTextures, ITryGet<string, MaterialContainer.Material> tryGetEntityMaterial)
: base(models, saveContext)
{
InitializeComponent();
_models = models;
_textures = tryGetSetTextures;
_tryGetEntityMaterial = tryGetEntityMaterial;
modelTreeView.ImageList = new ImageList
@@ -39,8 +38,6 @@ namespace PckStudio.Forms.Editor
modelTreeView.ImageList.Images.AddRange(ApplicationScope.EntityImages);
}
internal ModelContainer GetModelContainer() => _models;
private const int InvalidImageIndex = 127;
// TODO: move to json file. -miku
private static Dictionary<string, int> ModelImageIndex = new Dictionary<string, int>()
@@ -194,7 +191,7 @@ namespace PckStudio.Forms.Editor
private void LoadModels()
{
modelTreeView.Nodes.Clear();
modelTreeView.Nodes.AddRange(_models.Select(ModelNode.Create).ToArray());
modelTreeView.Nodes.AddRange(EditorValue.Select(ModelNode.Create).ToArray());
}
protected override void OnLoad(EventArgs e)
@@ -301,7 +298,7 @@ namespace PckStudio.Forms.Editor
// return;
//}
_models.SetModel(modelInfo.Model);
EditorValue.SetModel(modelInfo.Model);
foreach (NamedTexture texture in modelInfo.Textures)
{
@@ -314,6 +311,7 @@ namespace PckStudio.Forms.Editor
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
Save();
DialogResult = DialogResult.OK;
}
@@ -330,7 +328,7 @@ namespace PckStudio.Forms.Editor
private void removeToolStripMenuItem_Click(object sender, EventArgs e)
{
if (modelTreeView?.SelectedNode is ModelNode modelNode && _models.Remove(modelNode.Model))
if (modelTreeView?.SelectedNode is ModelNode modelNode && EditorValue.Remove(modelNode.Model))
{
modelNode.Remove();
}

8
PCK-Studio/MainForm.cs
View File

@@ -782,10 +782,14 @@ namespace PckStudio
? entityMaterialAsset?.GetData(new MaterialFileReader()).ToDictionary(mat => mat.Name)
: new Dictionary<string, MaterialContainer.Material>();
var editor = new ModelEditor(modelContainer, TryGetSet<string, Image>.FromDelegates(tryGetTexture, trySetTexture), TryGet<string, MaterialContainer.Material>.FromDelegate(entityMaterials.TryGetValue));
DelegatedSaveContext<ModelContainer> saveContext = new DelegatedSaveContext<ModelContainer>(Settings.Default.AutoSaveChanges, (modelContainer) =>
{
asset.SetData(new ModelFileWriter(modelContainer, modelContainer.Version));
});
var editor = new ModelEditor(modelContainer, saveContext, TryGetSet<string, Image>.FromDelegates(tryGetTexture, trySetTexture), TryGet<string, MaterialContainer.Material>.FromDelegate(entityMaterials.TryGetValue));
if (editor.ShowDialog() == DialogResult.OK)
{
asset.SetData(new ModelFileWriter(editor.GetModelContainer(), modelContainer.Version));
BuildMainTreeView();
wasModified = true;
return;