Leahnaya/HexManiacAdvance
1
0
Fork 0
mirror of https://github.com/haven1433/HexManiacAdvance.git synced 2026-10-01 20:56:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix castform multisprite import logic

Browse Source
This commit is contained in:
haven1433
2022-11-28 19:09:39 -06:00
parent c94f4d8f2b
commit 21ea2a6612
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/HexManiac.Core/ViewModels/Tools/SpriteTool.cs
View File

@@ -1011,7 +1011,6 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
var tiles = images.Select(image => Tilize(image, PixelWidth)).ToArray();
var allTiles = tiles.SelectMany(tilesForImage => tilesForImage).ToArray();
var expectedPalettePages = usablePalPages?.Count ?? 1;
if (spriteRun.Pages == expectedPalettePages) expectedPalettePages = 1; // handle the Castform case
if (expectedPalettePages == 0 && paletteRun != null) {
viewPort.RaiseError("You must select at least one palette.");
return;
@@ -1025,10 +1024,15 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
for (int i = 0; i < usablePalPages.Count; i++) palettes[usablePalPages[i]] = newPalettes[usablePalPages[i]];
}
bool palettePerSprite = false;
if (spriteRun.Pages == expectedPalettePages) { // handle the Castform case
palettePerSprite = true;
}
var newSprite = spriteRun;
for (int page = 0; page < images.Length; page++) {
var indexedTiles = new int[tiles[page].Length][,];
for (int i = 0; i < indexedTiles.Length; i++) indexedTiles[i] = Index(tiles[page][i], palettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, paletteRun?.PaletteFormat.InitialBlankPages ?? 0);
for (int i = 0; i < indexedTiles.Length; i++) indexedTiles[i] = Index(tiles[page][i], palettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, paletteRun?.PaletteFormat.InitialBlankPages ?? 0, palettePerSprite);
var sprite = Detilize(indexedTiles, spriteRun.SpriteFormat.TileWidth);
newSprite = newSprite.SetPixels(model, viewPort.CurrentChange, page, sprite);
if (newSprite is ITilemapRun tilemap && model.GetNextRun(tilemap.FindMatchingTileset(model)) is ITilesetRun tileset && model.ReadMultiByteValue(tileset.Start + 1, 3) / (tileset.SpriteFormat.BitsPerPixel * 8) == 1024) {
@@ -1059,7 +1063,6 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
// figure out the new palettes, using only the usable palettes. Leave the other palettes alone.
var palettes = paletteRun.Pages.Range().Select(i => paletteRun.GetPalette(model, i)).ToArray();
if (spriteRun.Pages == paletteRun.Pages) palettes = new[] { palettes[palPage] };
var initialBlankPages = paletteRun.PaletteFormat.InitialBlankPages;
var bits = paletteRun.PaletteFormat.Bits;
@@ -1093,7 +1096,11 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
// part 2: build palettes for the new tiles
var expectedPalettePages = paletteRun.Pages;
if (spriteRun.Pages == paletteRun.Pages) expectedPalettePages = 1; // handle the Castfrom case
bool palettePerSprite = false;
if (spriteRun.Pages == paletteRun.Pages) {
expectedPalettePages = 1; // handle the Castfrom case
palettePerSprite = true;
}
var newPalettes = new IReadOnlyList<short>[palettes.Length];
var tempPalettes = usablePalPages.Select(i => palettes[i]).ToArray();
@@ -1103,7 +1110,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
else newPalettes[i] = palettes[i];
}
var allIndexedTiles = new int[allTiles.Length][,];
for (int i = 0; i < allIndexedTiles.Length; i++) allIndexedTiles[i] = Index(allTiles[i], newPalettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, initialBlankPages);
for (int i = 0; i < allIndexedTiles.Length; i++) allIndexedTiles[i] = Index(allTiles[i], newPalettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, initialBlankPages, palettePerSprite);
var spriteData = Detilize(allIndexedTiles, spriteRun.SpriteFormat.TileWidth);
var newWeightedPalettes = WeightedPalette.Weigh(spriteData, newPalettes, bits, initialBlankPages);
@@ -1133,7 +1140,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
// part 5: update the current sprite to use the new palette
for (int page = 0; page < images.Length; page++) {
var indexedTiles = new int[tiles[page].Length][,];
for (int i = 0; i < indexedTiles.Length; i++) indexedTiles[i] = Index(tiles[page][i], newPalettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, initialBlankPages);
for (int i = 0; i < indexedTiles.Length; i++) indexedTiles[i] = Index(tiles[page][i], newPalettes, usablePalPages, spriteRun.SpriteFormat.BitsPerPixel, initialBlankPages, palettePerSprite);
spriteData = Detilize(indexedTiles, spriteRun.SpriteFormat.TileWidth);
currentSpriteRun = currentSpriteRun.SetPixels(model, viewPort.CurrentChange, page, spriteData);
}