asset details (WIP)
This commit is contained in:
@@ -203,7 +203,7 @@ public abstract class StudioDualListView<T> extends HBox {
|
||||
return;
|
||||
}
|
||||
final String text = indexed
|
||||
? (getIndex() + 1) + ". " + itemText(item)
|
||||
? getIndex() + ". " + itemText(item)
|
||||
: itemText(item);
|
||||
setText(text);
|
||||
setGraphic(null);
|
||||
@@ -259,7 +259,7 @@ public abstract class StudioDualListView<T> extends HBox {
|
||||
}
|
||||
|
||||
private Node createIndexedGraphic(Node graphic, int index) {
|
||||
final Label chip = new Label((index + 1) + ".");
|
||||
final Label chip = new Label(index + ".");
|
||||
chip.getStyleClass().add("studio-dual-list-index-chip");
|
||||
final HBox wrapper = new HBox(8, chip, graphic);
|
||||
wrapper.getStyleClass().add("studio-dual-list-indexed-cell");
|
||||
|
||||
+2
-1
@@ -73,7 +73,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
|
||||
this.summaryControl = new AssetDetailsSummaryControl(projectReference, workspaceBus);
|
||||
this.contractControl = new AssetDetailsContractControl(projectReference, workspaceBus);
|
||||
this.bankCompositionControl = new AssetDetailsBankCompositionControl(projectReference, workspaceBus);
|
||||
this.paletteOverhaulingControl = new AssetDetailsPaletteOverhaulingControl(workspaceBus);
|
||||
this.paletteOverhaulingControl = new AssetDetailsPaletteOverhaulingControl(projectReference, workspaceBus);
|
||||
this.actionsSection = createActionsSection();
|
||||
|
||||
getStyleClass().add("assets-workspace-pane");
|
||||
@@ -556,6 +556,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
|
||||
details.codecConfigurationFieldsByCodec(),
|
||||
details.metadataFields(),
|
||||
mapBankComposition(details.bankComposition()),
|
||||
details.pipelinePalettes(),
|
||||
mergedDiagnostics);
|
||||
}
|
||||
|
||||
|
||||
+61
-4
@@ -1,23 +1,33 @@
|
||||
package p.studio.workspaces.assets.details.palette;
|
||||
|
||||
import javafx.application.Platform;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.events.PackerEventKind;
|
||||
import p.packer.messages.ApplyPaletteOverhaulingRequest;
|
||||
import p.studio.Container;
|
||||
import p.studio.controls.forms.StudioFormEditScopeChangedEvent;
|
||||
import p.studio.controls.forms.StudioFormMode;
|
||||
import p.studio.controls.forms.StudioFormSection;
|
||||
import p.studio.events.StudioPackerOperationEvent;
|
||||
import p.studio.events.StudioWorkspaceEventBus;
|
||||
import p.studio.projects.ProjectReference;
|
||||
import p.studio.utilities.i18n.I18n;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
|
||||
import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent;
|
||||
import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent;
|
||||
import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent;
|
||||
import p.studio.workspaces.framework.StudioSubscriptionBag;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
|
||||
public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSection {
|
||||
private static final String SECTION_ID = "asset-details.palette-overhauling";
|
||||
|
||||
private final ProjectReference projectReference;
|
||||
private final StudioWorkspaceEventBus workspaceBus;
|
||||
private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag();
|
||||
private final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator();
|
||||
@@ -28,7 +38,8 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti
|
||||
|
||||
private AssetWorkspaceDetailsViewState viewState;
|
||||
|
||||
public AssetDetailsPaletteOverhaulingControl(StudioWorkspaceEventBus workspaceBus) {
|
||||
public AssetDetailsPaletteOverhaulingControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) {
|
||||
this.projectReference = Objects.requireNonNull(projectReference, "projectReference");
|
||||
this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus");
|
||||
body.getStyleClass().add("assets-details-palette-overhauling-body");
|
||||
content.setFillWidth(true);
|
||||
@@ -149,9 +160,49 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti
|
||||
|
||||
@Override
|
||||
protected void apply() {
|
||||
coordinator.apply();
|
||||
publishEditScope(workspaceBus, currentScopeKey(), null);
|
||||
renderSection();
|
||||
if (viewState == null || viewState.selectedAssetReference() == null || !coordinator.ready()) {
|
||||
return;
|
||||
}
|
||||
final var selectedPalettes = coordinator.viewModel().selectedFiles().stream()
|
||||
.map(file -> palettePayload(file.metadata()))
|
||||
.filter(Objects::nonNull)
|
||||
.toList();
|
||||
if (selectedPalettes.isEmpty()) {
|
||||
workspaceBus.publish(new StudioAssetLogEvent("palette-overhauling", "Apply failed: no palette was selected."));
|
||||
Container.eventBus().publish(new StudioPackerOperationEvent(
|
||||
UUID.randomUUID().toString(),
|
||||
PackerEventKind.ACTION_FAILED,
|
||||
"Palette overhauling apply failed: no palette was selected.",
|
||||
null,
|
||||
true));
|
||||
return;
|
||||
}
|
||||
|
||||
final var assetReference = viewState.selectedAssetReference();
|
||||
Container.backgroundTasks().submit(() -> {
|
||||
final var request = new ApplyPaletteOverhaulingRequest(
|
||||
projectReference.toPackerProjectContext(),
|
||||
assetReference,
|
||||
selectedPalettes);
|
||||
try {
|
||||
final var response = Container.packer().workspaceService().applyPaletteOverhauling(request);
|
||||
Platform.runLater(() -> {
|
||||
if (response.success()) {
|
||||
coordinator.apply();
|
||||
publishEditScope(workspaceBus, currentScopeKey(), null);
|
||||
renderSection();
|
||||
workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(assetReference));
|
||||
} else {
|
||||
workspaceBus.publish(new StudioAssetLogEvent("palette-overhauling",
|
||||
"Apply failed: " + Objects.requireNonNullElse(response.errorMessage(), "unknown error")));
|
||||
}
|
||||
});
|
||||
} catch (Exception exception) {
|
||||
Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent(
|
||||
"palette-overhauling",
|
||||
"Apply failed: " + Objects.requireNonNullElse(exception.getMessage(), "unknown error"))));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -180,4 +231,10 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti
|
||||
? null
|
||||
: "asset-details:" + viewState.selectedAssetReference();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> palettePayload(Map<String, Object> metadata) {
|
||||
final Object palette = metadata.get("palette");
|
||||
return palette instanceof Map<?, ?> paletteMap ? (Map<String, Object>) paletteMap : null;
|
||||
}
|
||||
}
|
||||
|
||||
+24
-7
@@ -27,13 +27,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator {
|
||||
final List<AssetWorkspaceBankCompositionFile> previewTileFiles = details.bankComposition().selectedFiles().stream()
|
||||
.filter(AssetDetailsPaletteOverhaulingCoordinator::supportsPalettePreview)
|
||||
.toList();
|
||||
final Map<String, AssetWorkspaceBankCompositionFile> filesByPath = allFiles.stream()
|
||||
.collect(java.util.stream.Collectors.toMap(
|
||||
AssetWorkspaceBankCompositionFile::path,
|
||||
file -> file,
|
||||
(left, right) -> left,
|
||||
LinkedHashMap::new));
|
||||
final List<AssetWorkspaceBankCompositionFile> initialSelected = new ArrayList<>();
|
||||
final List<AssetWorkspaceBankCompositionFile> initialSelected = initialSelectedPaletteFiles(details, allFiles);
|
||||
|
||||
final List<AssetWorkspaceBankCompositionFile> available = new ArrayList<>(allFiles);
|
||||
available.removeAll(initialSelected);
|
||||
@@ -169,6 +163,29 @@ public final class AssetDetailsPaletteOverhaulingCoordinator {
|
||||
metadata);
|
||||
}
|
||||
|
||||
private static List<AssetWorkspaceBankCompositionFile> initialSelectedPaletteFiles(
|
||||
AssetWorkspaceAssetDetails details,
|
||||
List<AssetWorkspaceBankCompositionFile> allFiles) {
|
||||
final List<AssetWorkspaceBankCompositionFile> selected = new ArrayList<>();
|
||||
for (Map<String, Object> palette : details.pipelinePalettes()) {
|
||||
for (AssetWorkspaceBankCompositionFile file : allFiles) {
|
||||
if (!selected.contains(file) && paletteEquals(palette, nestedMap(file.metadata(), "palette"))) {
|
||||
selected.add(file);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return List.copyOf(selected);
|
||||
}
|
||||
|
||||
private static boolean paletteEquals(Map<String, Object> left, Map<String, Object> right) {
|
||||
if (left == null || right == null) {
|
||||
return false;
|
||||
}
|
||||
return Objects.equals(left.get("originalArgb8888"), right.get("originalArgb8888"))
|
||||
&& Objects.equals(left.get("convertedRgb565"), right.get("convertedRgb565"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static String paletteHash(AssetWorkspaceBankCompositionFile file) {
|
||||
final Map<String, Object> palette = nestedMap(file.metadata(), "palette");
|
||||
|
||||
+2
@@ -18,6 +18,7 @@ public record AssetWorkspaceAssetDetails(
|
||||
Map<OutputCodecCatalog, List<PackerCodecConfigurationFieldDTO>> codecConfigurationFieldsByCodec,
|
||||
List<PackerCodecConfigurationFieldDTO> metadataFields,
|
||||
AssetWorkspaceBankCompositionDetails bankComposition,
|
||||
List<Map<String, Object>> pipelinePalettes,
|
||||
List<PackerDiagnosticDTO> diagnostics) {
|
||||
|
||||
public AssetWorkspaceAssetDetails {
|
||||
@@ -29,6 +30,7 @@ public record AssetWorkspaceAssetDetails(
|
||||
codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec"));
|
||||
metadataFields = List.copyOf(Objects.requireNonNull(metadataFields, "metadataFields"));
|
||||
bankComposition = Objects.requireNonNull(bankComposition, "bankComposition");
|
||||
pipelinePalettes = List.copyOf(Objects.requireNonNull(pipelinePalettes, "pipelinePalettes"));
|
||||
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -112,6 +112,7 @@ final class AssetDetailsBankCompositionCoordinatorTest {
|
||||
files("tile", fileCount, 1024L),
|
||||
List.of(),
|
||||
0L),
|
||||
List.of(),
|
||||
List.of());
|
||||
}
|
||||
|
||||
@@ -130,6 +131,7 @@ final class AssetDetailsBankCompositionCoordinatorTest {
|
||||
new AssetWorkspaceBankCompositionFile("b.wav", "b.wav", secondSize, 1L, null, Map.of())),
|
||||
List.of(),
|
||||
0L),
|
||||
List.of(),
|
||||
List.of());
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -91,6 +91,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest {
|
||||
Map.of(OutputCodecCatalog.NONE, List.of()),
|
||||
List.of(),
|
||||
new AssetWorkspaceBankCompositionDetails(availableFiles, selectedFiles, 0L),
|
||||
selectedFiles.stream().map(file -> (Map<String, Object>) file.metadata().get("palette")).toList(),
|
||||
List.of());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user