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
@@ -190,7 +190,7 @@ public enum I18n {
ASSETS_LABEL_BUILD_PARTICIPATION("assets.label.buildParticipation"),
ASSETS_LABEL_ASSET_ID("assets.label.assetId"),
ASSETS_LABEL_TYPE("assets.label.type"),
ASSETS_TYPE_TILE_BANK("assets.type.tileBank"),
ASSETS_TYPE_GLYPH_BANK("assets.type.glyphBank"),
ASSETS_TYPE_PALETTE_BANK("assets.type.paletteBank"),
ASSETS_TYPE_SOUND_BANK("assets.type.soundBank"),
ASSETS_TYPE_UNKNOWN("assets.type.unknown"),
@@ -113,7 +113,7 @@ public final class AssetDetailsUiSupport {
public static String typeLabel(AssetFamilyCatalog assetFamily) {
return switch (assetFamily) {
case TILE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_TILE_BANK);
case GLYPH_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_GLYPH_BANK);
case SOUND_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_SOUND_BANK);
case UNKNOWN -> Container.i18n().text(I18n.ASSETS_TYPE_UNKNOWN);
};
@@ -121,7 +121,7 @@ public final class AssetDetailsUiSupport {
public static String typeChipTone(AssetFamilyCatalog assetFamily) {
return switch (assetFamily) {
case TILE_BANK -> "assets-details-chip-image";
case GLYPH_BANK -> "assets-details-chip-image";
case SOUND_BANK -> "assets-details-chip-audio";
case UNKNOWN -> "assets-details-chip-generic";
};
@@ -20,7 +20,7 @@ public final class AssetBankCapacityService {
final Map<String, String> safeMetadata = Map.copyOf(Objects.requireNonNull(outputMetadata, "outputMetadata"));
final Map<String, Object> safePipeline = Map.copyOf(Objects.requireNonNull(outputPipeline, "outputPipeline"));
return switch (safeFamily) {
case TILE_BANK -> evaluateTileBank(artifactCount, safeMetadata);
case GLYPH_BANK -> evaluateGlyphBank(artifactCount, safeMetadata);
case SOUND_BANK -> evaluateSoundBank(resolveSoundBankUsedBytes(safePipeline, usedBytes));
case UNKNOWN -> new AssetDetailsBankCompositionCapacityState(
0.0d,
@@ -31,7 +31,7 @@ public final class AssetBankCapacityService {
};
}
public int maxArtifactsForTileBank(Map<String, String> outputMetadata) {
public int maxArtifactsForGlyphBank(Map<String, String> outputMetadata) {
final String tileSizeValue = Objects.requireNonNull(outputMetadata, "outputMetadata")
.getOrDefault("tile_size", "16x16");
return switch (tileSizeValue) {
@@ -41,10 +41,10 @@ public final class AssetBankCapacityService {
};
}
private AssetDetailsBankCompositionCapacityState evaluateTileBank(
private AssetDetailsBankCompositionCapacityState evaluateGlyphBank(
int artifactCount,
Map<String, String> outputMetadata) {
final int maxSlots = maxArtifactsForTileBank(outputMetadata);
final int maxSlots = maxArtifactsForGlyphBank(outputMetadata);
final int safeArtifactCount = Math.max(0, artifactCount);
final double progress = maxSlots <= 0 ? 0.0d : (double) safeArtifactCount / (double) maxSlots;
final boolean blocked = safeArtifactCount >= maxSlots;
@@ -53,7 +53,7 @@ public final class AssetBankCapacityService {
severityFor(progress),
blocked,
safeArtifactCount + " / " + maxSlots,
blocked ? "Tile bank slot capacity reached." : "");
blocked ? "Glyph bank slot capacity reached." : "");
}
private AssetDetailsBankCompositionCapacityState evaluateSoundBank(long usedBytes) {
@@ -10,7 +10,7 @@ import java.util.Objects;
public final class AssetDetailsBankCompositionCoordinator {
private final List<AssetDetailsBankCompositionFamilySupport> familySupports = List.of(
new AssetDetailsTileBankCompositionFamilySupport(),
new AssetDetailsGlyphBankCompositionFamilySupport(),
new AssetDetailsSoundBankCompositionFamilySupport(),
new AssetDetailsFallbackBankCompositionFamilySupport());
@@ -7,21 +7,21 @@ import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile;
import java.util.List;
import java.util.Map;
final class AssetDetailsTileBankCompositionFamilySupport extends AssetDetailsAbstractBankCompositionFamilySupport {
final class AssetDetailsGlyphBankCompositionFamilySupport extends AssetDetailsAbstractBankCompositionFamilySupport {
private final AssetBankCapacityService capacityService = new AssetBankCapacityService();
private int maxSlots = capacityService.maxArtifactsForTileBank(Map.of());
private int maxSlots = capacityService.maxArtifactsForGlyphBank(Map.of());
private Map<String, String> outputMetadata = Map.of();
@Override
public boolean supports(AssetFamilyCatalog assetFamily) {
return assetFamily == AssetFamilyCatalog.TILE_BANK;
return assetFamily == AssetFamilyCatalog.GLYPH_BANK;
}
@Override
public AssetDetailsBankCompositionDraft createDraft(AssetWorkspaceAssetDetails details) {
outputMetadata = metadataMap(details);
maxSlots = capacityService.maxArtifactsForTileBank(outputMetadata);
maxSlots = capacityService.maxArtifactsForGlyphBank(outputMetadata);
return super.createDraft(details);
}
@@ -36,7 +36,7 @@ final class AssetDetailsTileBankCompositionFamilySupport extends AssetDetailsAbs
@Override
public AssetDetailsBankCompositionCapacityState evaluate(AssetDetailsBankCompositionDraft draft) {
return capacityService.evaluate(
AssetFamilyCatalog.TILE_BANK,
AssetFamilyCatalog.GLYPH_BANK,
draft.selectedFiles().size(),
outputMetadata,
Map.of(),
@@ -18,7 +18,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator {
private StudioFormSession<AssetDetailsPaletteOverhaulingDraft> formSession;
public void replaceDetails(AssetWorkspaceAssetDetails details) {
if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.TILE_BANK) {
if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.GLYPH_BANK) {
formSession = null;
return;
}
@@ -112,7 +112,7 @@ public final class AssetListItemControl extends VBox {
private String assetRowToneClass(AssetFamilyCatalog assetFamily) {
return switch (assetFamily) {
case TILE_BANK -> "assets-workspace-asset-row-tone-image";
case GLYPH_BANK -> "assets-workspace-asset-row-tone-image";
case SOUND_BANK -> "assets-workspace-asset-row-tone-audio";
default -> "assets-workspace-asset-row-tone-generic";
};
@@ -120,7 +120,7 @@ public final class AssetListItemControl extends VBox {
private String assetNameToneClass(AssetFamilyCatalog assetFamily) {
return switch (assetFamily) {
case TILE_BANK -> "assets-workspace-asset-name-tone-image";
case GLYPH_BANK -> "assets-workspace-asset-name-tone-image";
case SOUND_BANK -> "assets-workspace-asset-name-tone-audio";
default -> "assets-workspace-asset-name-tone-generic";
};
@@ -181,7 +181,7 @@ assets.label.registration=Registration
assets.label.buildParticipation=Build Participation
assets.label.assetId=Asset ID
assets.label.type=Type
assets.type.tileBank=Tile Bank
assets.type.glyphBank=Glyph Bank
assets.type.paletteBank=Palette Bank
assets.type.soundBank=Sound Bank
assets.type.unknown=Unknown
@@ -101,9 +101,9 @@ final class AssetDetailsBankCompositionCoordinatorTest {
private AssetWorkspaceAssetDetails tileDetails(String tileSize, int fileCount) {
return new AssetWorkspaceAssetDetails(
summary(AssetFamilyCatalog.TILE_BANK),
summary(AssetFamilyCatalog.GLYPH_BANK),
List.of(),
OutputFormatCatalog.TILES_INDEXED_V1,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
List.of(OutputCodecCatalog.NONE),
Map.of(OutputCodecCatalog.NONE, List.of()),
@@ -80,12 +80,12 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest {
AssetWorkspaceAssetState.REGISTERED,
AssetWorkspaceBuildParticipation.INCLUDED,
1,
AssetFamilyCatalog.TILE_BANK,
AssetFamilyCatalog.GLYPH_BANK,
Path.of("/tmp/bank"),
false,
false),
List.of(),
OutputFormatCatalog.TILES_INDEXED_V1,
OutputFormatCatalog.GLYPH_INDEXED_V1,
OutputCodecCatalog.NONE,
List.of(OutputCodecCatalog.NONE),
Map.of(OutputCodecCatalog.NONE, List.of()),