implements PLN-0084
This commit is contained in:
+5
-8
@@ -1775,18 +1775,15 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
final ArrayNode palettesNode = pipelineNode.putArray("palettes");
|
||||
for (int paletteOrder = 0; paletteOrder < request.selectedPalettes().size(); paletteOrder += 1) {
|
||||
final Map<String, Object> palette = request.selectedPalettes().get(paletteOrder);
|
||||
final List<Integer> originalArgb8888 = integerList(palette.get("originalArgb8888"));
|
||||
final List<Integer> convertedRgb565 = integerList(palette.get("convertedRgb565"));
|
||||
if (originalArgb8888.isEmpty() || convertedRgb565.isEmpty()) {
|
||||
throw new IllegalArgumentException("Each selected palette must contain originalArgb8888 and convertedRgb565 entries.");
|
||||
final List<Integer> rgba8888 = integerList(palette.get("rgba8888"));
|
||||
if (rgba8888.isEmpty()) {
|
||||
throw new IllegalArgumentException("Each selected palette must contain rgba8888 entries.");
|
||||
}
|
||||
final ObjectNode paletteNode = palettesNode.addObject();
|
||||
paletteNode.put("index", paletteIndex(palette, paletteOrder));
|
||||
final ObjectNode payloadNode = paletteNode.putObject("palette");
|
||||
final ArrayNode originalNode = payloadNode.putArray("originalArgb8888");
|
||||
originalArgb8888.forEach(originalNode::add);
|
||||
final ArrayNode convertedNode = payloadNode.putArray("convertedRgb565");
|
||||
convertedRgb565.forEach(convertedNode::add);
|
||||
final ArrayNode rgbaNode = payloadNode.putArray("rgba8888");
|
||||
rgba8888.forEach(rgbaNode::add);
|
||||
}
|
||||
if (palettesNode.isEmpty()) {
|
||||
throw new IllegalArgumentException("At least one palette must be selected.");
|
||||
|
||||
+14
-4
@@ -336,17 +336,27 @@ public final class PackerAssetDeclarationParser {
|
||||
continue;
|
||||
}
|
||||
|
||||
final JsonNode originalNode = paletteNode.path("originalArgb8888");
|
||||
final JsonNode convertedNode = paletteNode.path("convertedRgb565");
|
||||
if (!originalNode.isArray() || !convertedNode.isArray()) {
|
||||
final JsonNode rgbaNode = paletteNode.path("rgba8888");
|
||||
if (!rgbaNode.isArray()) {
|
||||
diagnostics.add(new PackerDiagnostic(
|
||||
PackerDiagnosticSeverity.ERROR,
|
||||
PackerDiagnosticCategory.STRUCTURAL,
|
||||
"Each palette payload must contain array fields 'originalArgb8888' and 'convertedRgb565'.",
|
||||
"Each palette payload must contain array field 'rgba8888'.",
|
||||
manifestPath,
|
||||
true));
|
||||
continue;
|
||||
}
|
||||
for (JsonNode colorNode : rgbaNode) {
|
||||
if (!colorNode.canConvertToInt()) {
|
||||
diagnostics.add(new PackerDiagnostic(
|
||||
PackerDiagnosticSeverity.ERROR,
|
||||
PackerDiagnosticCategory.STRUCTURAL,
|
||||
"Palette field 'rgba8888' must contain integer color values.",
|
||||
manifestPath,
|
||||
true));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (paletteCount > MAX_PIPELINE_PALETTES) {
|
||||
|
||||
+6
-15
@@ -190,29 +190,20 @@ public final class PackerAssetDetailsService {
|
||||
if (!indexNode.isInt() || indexNode.intValue() < 0 || !(payloadNode instanceof ObjectNode payloadObject)) {
|
||||
return Map.of();
|
||||
}
|
||||
final JsonNode originalNode = payloadObject.path("originalArgb8888");
|
||||
final JsonNode convertedNode = payloadObject.path("convertedRgb565");
|
||||
if (!originalNode.isArray() || !convertedNode.isArray()) {
|
||||
final JsonNode rgbaNode = payloadObject.path("rgba8888");
|
||||
if (!rgbaNode.isArray()) {
|
||||
return Map.of();
|
||||
}
|
||||
final List<Integer> originalArgb8888 = new ArrayList<>();
|
||||
for (JsonNode colorNode : originalNode) {
|
||||
final List<Integer> rgba8888 = new ArrayList<>();
|
||||
for (JsonNode colorNode : rgbaNode) {
|
||||
if (!colorNode.canConvertToInt()) {
|
||||
return Map.of();
|
||||
}
|
||||
originalArgb8888.add(colorNode.intValue());
|
||||
}
|
||||
final List<Integer> convertedRgb565 = new ArrayList<>();
|
||||
for (JsonNode colorNode : convertedNode) {
|
||||
if (!colorNode.canConvertToInt()) {
|
||||
return Map.of();
|
||||
}
|
||||
convertedRgb565.add(colorNode.intValue());
|
||||
rgba8888.add(colorNode.intValue());
|
||||
}
|
||||
return Map.of(
|
||||
"index", indexNode.intValue(),
|
||||
"originalArgb8888", List.copyOf(originalArgb8888),
|
||||
"convertedRgb565", List.copyOf(convertedRgb565));
|
||||
"rgba8888", List.copyOf(rgba8888));
|
||||
}
|
||||
|
||||
private Optional<PackerBankCompositionFile> resolveSelectedBankFile(
|
||||
|
||||
Reference in New Issue
Block a user