dev/glyph-bank-alignment (#3)
JaCoCo Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 60.67% (15274/25176) * Branch Coverage: 53.64% (5782/10779) * Lines of Code: 25176 * Cyclomatic Complexity: 9960 #### Quality Gates Summary Output truncated.
Test / Build skipped: 11, passed: 545
Intrepid/Prometeu/Studio/pipeline/head This commit looks good

Reviewed-on: #3
Co-authored-by: bQUARKz <bquarkz@gmail.com>
Co-committed-by: bQUARKz <bquarkz@gmail.com>
This commit was merged in pull request #3.
This commit is contained in:
2026-04-10 06:14:07 +00:00
committed by bquarkz
parent 11b24b0707
commit dd6c9dd718
45 changed files with 332 additions and 211 deletions
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.io.TempDir;
import p.packer.models.PackerAssetCacheEntry;
import p.packer.models.PackerFileCacheEntry;
import p.packer.models.PackerTileIndexedV1;
import p.packer.models.PackerTileBankRequirements;
import p.packer.models.PackerGlyphBankRequirements;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@@ -18,7 +18,7 @@ import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
final class PackerTileBankWalkerTest {
final class PackerGlyphBankWalkerTest {
private static final ObjectMapper MAPPER = new ObjectMapper();
@TempDir
@@ -30,7 +30,7 @@ final class PackerTileBankWalkerTest {
final Path filePath = assetRoot.resolve("tile.png");
writeTile(filePath);
final PackerTileBankWalker walker = new PackerTileBankWalker(MAPPER);
final PackerGlyphBankWalker walker = new PackerGlyphBankWalker(MAPPER);
final PackerAssetCacheEntry priorCache = new PackerAssetCacheEntry(
1,
"contract",
@@ -45,7 +45,7 @@ final class PackerTileBankWalkerTest {
"palette", Map.of("originalArgb8888", List.of(0xFFFFFFFF))),
List.of())));
final var result = walker.walk(assetRoot, new PackerTileBankRequirements(16), Optional.of(priorCache));
final var result = walker.walk(assetRoot, new PackerGlyphBankRequirements(16), Optional.of(priorCache));
final PackerTileIndexedV1 tile = (PackerTileIndexedV1) result.probeResults().getFirst().metadata().get("tile");
assertNotNull(tile);
@@ -135,9 +135,9 @@ final class PackerRuntimeAssetMaterializerTest {
1,
"uuid",
"asset",
AssetFamilyCatalog.TILE_BANK,
AssetFamilyCatalog.GLYPH_BANK,
artifacts,
OutputFormatCatalog.TILES_INDEXED_V1,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
metadata,
pipelineMetadata,
@@ -141,7 +141,7 @@ final class FileSystemPackerWorkspaceServiceTest {
assertEquals(PackerOperationStatus.SUCCESS, result.status());
assertEquals(1, result.packSummary().assets().size());
assertEquals(1, result.packSummary().assets().getFirst().artifactCount());
assertEquals(OutputFormatCatalog.TILES_INDEXED_V1, result.packSummary().assets().getFirst().outputFormat());
assertEquals(OutputFormatCatalog.GLYPH_INDEXED_V1, result.packSummary().assets().getFirst().outputFormat());
assertEquals("16x16", result.packSummary().assets().getFirst().outputMetadata().get("tile_size"));
assertEquals(64L, ((Map<?, ?>) ((Map<?, ?>) result.packSummary().assets().getFirst().outputPipeline().get("samples")).get("1")).get("length"));
assertEquals(0L, result.packSummary().assets().getFirst().lastModified());
@@ -232,14 +232,14 @@ final class FileSystemPackerWorkspaceServiceTest {
}
@Test
void packValidationBlocksTileBanksWithoutDeclaredPalettes() throws Exception {
void packValidationBlocksGlyphBanksWithoutDeclaredPalettes() throws Exception {
final Path projectRoot = copyFixture("workspaces/managed-basic", tempDir.resolve("pack-validation-no-palettes"));
final Path assetRoot = projectRoot.resolve("assets/ui/atlas");
final Path manifestPath = assetRoot.resolve("asset.json");
writeTilePng(assetRoot.resolve("confirm.png"), 16);
final ObjectNode manifest = (ObjectNode) MAPPER.readTree(manifestPath.toFile());
manifest.putObject("output").put("format", "TILES/indexed_v1").put("codec", "NONE");
manifest.putObject("output").put("format", "GLYPH/indexed_v1").put("codec", "NONE");
final var artifacts = manifest.putArray("artifacts");
artifacts.addObject().put("file", "confirm.png").put("index", 0);
MAPPER.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest);
@@ -278,7 +278,7 @@ final class FileSystemPackerWorkspaceServiceTest {
}
@Test
void packWorkspaceEmitsTileBankArtifactsFromFrozenSnapshot() throws Exception {
void packWorkspaceEmitsGlyphBankArtifactsFromFrozenSnapshot() throws Exception {
final Path projectRoot = copyFixture("workspaces/managed-basic", tempDir.resolve("pack-workspace-success"));
final Path assetRoot = projectRoot.resolve("assets/ui/atlas");
final Path manifestPath = assetRoot.resolve("asset.json");
@@ -330,15 +330,14 @@ final class FileSystemPackerWorkspaceServiceTest {
assertEquals(0xF81F, readLeUnsignedShort(assetsPa, paletteStart));
assertEquals(0xF800, readLeUnsignedShort(assetsPa, paletteStart + 2));
assertEquals(1, assetTable.get(0).path("asset_id").asInt());
assertEquals("TILES", assetTable.get(0).path("bank_type").asText());
assertEquals("GLYPH", assetTable.get(0).path("bank_type").asText());
assertEquals("NONE", assetTable.get(0).path("codec").asText());
assertEquals(16, assetTable.get(0).path("metadata").path("tile_size").asInt());
assertEquals(256, assetTable.get(0).path("metadata").path("width").asInt());
assertEquals(256, assetTable.get(0).path("metadata").path("height").asInt());
assertEquals(64, assetTable.get(0).path("metadata").path("palette_count").asInt());
assertEquals(1, assetTable.get(0).path("metadata").path("palette_authored").asInt());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").isObject());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").path("palettes").isMissingNode());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").isMissingNode());
final var preload = MAPPER.readTree(projectRoot.resolve("build/preload.json").toFile());
assertEquals(1, preload.size());
@@ -348,7 +347,8 @@ final class FileSystemPackerWorkspaceServiceTest {
final var assetTableMetadata = MAPPER.readTree(projectRoot.resolve("build/asset_table_metadata.json").toFile());
assertEquals(1, assetTableMetadata.size());
assertEquals(1, assetTableMetadata.get(0).path("metadata").path("palette_authored").asInt());
assertTrue(assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").isMissingNode());
assertEquals(1, assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").size());
assertEquals(0, assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").get(0).path("index").asInt());
}
@Test
@@ -446,7 +446,7 @@ final class FileSystemPackerWorkspaceServiceTest {
assertEquals(PackerOperationStatus.PARTIAL, result.status());
assertFalse(result.canPack());
assertTrue(result.assets().getFirst().diagnostics().stream()
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid tile dimensions for oversized.png")));
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid glyph dimensions for oversized.png")));
}
@Test
@@ -491,8 +491,8 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/new-atlas",
"new_atlas",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
true));
@@ -521,8 +521,8 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/new-atlas",
"new_atlas",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
true));
@@ -539,7 +539,7 @@ final class FileSystemPackerWorkspaceServiceTest {
assertEquals("new_atlas", detailsResult.details().summary().identity().assetName());
assertNotNull(detailsResult.details().summary().identity().assetUuid());
assertTrue(detailsResult.diagnostics().stream().noneMatch(diagnostic -> diagnostic.blocking()));
assertTrue(detailsResult.diagnostics().stream().anyMatch(diagnostic -> diagnostic.message().contains("Output metadata for tile bank cannot be empty")));
assertTrue(detailsResult.diagnostics().stream().anyMatch(diagnostic -> diagnostic.message().contains("Output metadata for glyph bank cannot be empty")));
}
@Test
@@ -555,8 +555,8 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/new-atlas",
"new_atlas",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
true));
@@ -987,7 +987,7 @@ final class FileSystemPackerWorkspaceServiceTest {
"name": "ui_atlas",
"type": "IMAGE/bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "none"
},
"preload": {
@@ -1002,7 +1002,7 @@ final class FileSystemPackerWorkspaceServiceTest {
"name": "ui_clone",
"type": "IMAGE/bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "none"
},
"preload": {
@@ -1053,8 +1053,8 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/delete-me",
"delete_me",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
final Path assetRoot = projectRoot.resolve("assets/ui/delete-me");
@@ -1081,8 +1081,8 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/source-atlas",
"source_atlas",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
true));
Files.writeString(projectRoot.resolve("assets/ui/source-atlas/atlas.png"), "fixture");
@@ -1148,16 +1148,16 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/source",
"source",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
final CreateAssetResult target = service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/target",
"target",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
@@ -1223,7 +1223,7 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"audio/bad",
"bad_asset",
AssetFamilyCatalog.TILE_BANK,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.SOUND_V1,
OutputCodecCatalog.NONE,
false));
@@ -1243,16 +1243,16 @@ final class FileSystemPackerWorkspaceServiceTest {
project(projectRoot),
"ui/atlas-a",
"atlas_a",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
true)));
final Future<CreateAssetResult> second = executor.submit(() -> service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/atlas-b",
"atlas_b",
AssetFamilyCatalog.TILE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
AssetFamilyCatalog.GLYPH_BANK,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
false)));
@@ -29,8 +29,8 @@ final class PackerAssetDeclarationParserTest {
assertEquals(1, result.declaration().schemaVersion());
assertEquals("fixture-uuid-1", result.declaration().assetUuid());
assertEquals("ui_atlas", result.declaration().name());
assertEquals(AssetFamilyCatalog.TILE_BANK, result.declaration().assetFamily());
assertEquals("TILES/indexed_v1", result.declaration().outputFormat().displayName());
assertEquals(AssetFamilyCatalog.GLYPH_BANK, result.declaration().assetFamily());
assertEquals("GLYPH/indexed_v1", result.declaration().outputFormat().displayName());
assertEquals(OutputCodecCatalog.NONE, result.declaration().outputCodec());
assertEquals(Map.of(), result.declaration().outputPipelineMetadata());
assertTrue(result.declaration().preloadEnabled());
@@ -75,9 +75,9 @@ final class PackerAssetDeclarationParserTest {
"schema_version": 1,
"asset_uuid": "uuid-pipeline",
"name": "pipeline_asset",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE",
"pipeline": []
},
@@ -99,9 +99,9 @@ final class PackerAssetDeclarationParserTest {
"schema_version": 1,
"asset_uuid": "uuid-palette-contract",
"name": "palette_asset",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE",
"pipeline": {
"palettes": [
@@ -135,9 +135,9 @@ final class PackerAssetDeclarationParserTest {
"schema_version": 1,
"asset_uuid": "uuid-palette-duplicate",
"name": "palette_asset",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE",
"pipeline": {
"palettes": [
@@ -203,9 +203,9 @@ final class PackerAssetDeclarationParserTest {
"schema_version": 1,
"asset_uuid": "uuid-outside",
"name": "bad_asset",
"type": "tile_bank",
"type": "glyph_bank",
"inputs": { "sprites": ["../outside.png"] },
"output": { "format": "TILES/indexed_v1", "codec": "NONE" },
"output": { "format": "GLYPH/indexed_v1", "codec": "NONE" },
"preload": { "enabled": true }
}
""");
@@ -225,7 +225,7 @@ final class PackerAssetDeclarationParserTest {
"asset_uuid": "uuid-video",
"name": "bad_asset",
"type": "video_bank",
"output": { "format": "TILES/indexed_v1", "codec": "NONE" },
"output": { "format": "GLYPH/indexed_v1", "codec": "NONE" },
"preload": { "enabled": true }
}
""");
@@ -44,14 +44,14 @@ final class PackerAssetDetailsServiceTest {
assertEquals(PackerBuildParticipation.INCLUDED, result.details().summary().buildParticipation());
assertEquals("fixture-uuid-1", result.details().summary().identity().assetUuid());
assertEquals("ui_atlas", result.details().summary().identity().assetName());
assertEquals("TILES/indexed_v1", result.details().outputFormat().displayName());
assertEquals("GLYPH/indexed_v1", result.details().outputFormat().displayName());
assertEquals(List.of(OutputCodecCatalog.NONE), result.details().availableOutputCodecs());
assertEquals(List.of(), result.details().codecConfigurationFieldsByCodec().get(OutputCodecCatalog.NONE));
assertNotNull(result.details().bankComposition());
assertTrue(result.details().bankComposition().selectedFiles().isEmpty());
assertTrue(result.details().pipelinePalettes().isEmpty());
assertTrue(result.diagnostics().stream().noneMatch(diagnostic -> diagnostic.blocking()));
assertTrue(result.diagnostics().stream().anyMatch(diagnostic -> diagnostic.message().contains("Output metadata for tile bank cannot be empty")));
assertTrue(result.diagnostics().stream().anyMatch(diagnostic -> diagnostic.message().contains("Output metadata for glyph bank cannot be empty")));
}
@Test
@@ -152,9 +152,9 @@ final class PackerAssetDetailsServiceTest {
assertEquals(PackerOperationStatus.PARTIAL, result.status());
assertTrue(result.diagnostics().stream()
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid tile dimensions for wrong-palette.png")));
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid glyph dimensions for wrong-palette.png")));
assertTrue(result.details().diagnostics().stream()
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid tile dimensions for wrong-palette.png")));
.anyMatch(diagnostic -> diagnostic.message().contains("Invalid glyph dimensions for wrong-palette.png")));
}
@Test
@@ -1,6 +1,6 @@
{
"schema_version": 1,
"type": "tile_bank",
"type": "glyph_bank",
"inputs": "wrong",
"output": {
"codec": ""
@@ -2,9 +2,9 @@
"schema_version": 9,
"asset_uuid": "future-uuid-1",
"name": "future_asset",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE"
},
"preload": {
@@ -2,9 +2,9 @@
"schema_version": 1,
"asset_uuid": "fixture-uuid-1",
"name": "ui_atlas",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE"
},
"preload": {
@@ -1,6 +1,6 @@
{
"schema_version": 1,
"type": "tile_bank",
"type": "glyph_bank",
"inputs": "wrong",
"output": {
"codec": ""
@@ -2,9 +2,9 @@
"schema_version": 1,
"asset_uuid": "uuid-1",
"name": "ui_atlas",
"type": "tile_bank",
"type": "glyph_bank",
"output": {
"format": "TILES/indexed_v1",
"format": "GLYPH/indexed_v1",
"codec": "NONE"
},
"preload": {