From 5b2e2b023f1ebd72a892a61148be4383d88aeda3 Mon Sep 17 00:00:00 2001 From: bQUARKz Date: Tue, 17 Mar 2026 18:42:25 +0000 Subject: [PATCH] adjusts on asset, only tiles and sounds --- ...nd Virtual Asset Contract Specification.md | 2 +- .../messages/assets/AssetFamilyCatalog.java | 3 +- .../messages/assets/OutputFormatCatalog.java | 6 +- .../PackerAssetDeclarationParser.java | 2 +- .../services/PackerOutputContractCatalog.java | 2 +- .../FileSystemPackerWorkspaceServiceTest.java | 22 +- .../PackerAssetDeclarationParserTest.java | 4 +- .../assets/bad/asset.json | 2 +- .../invalid-version/assets/bad/asset.json | 2 +- .../managed-basic/assets/ui/atlas/asset.json | 2 +- .../read-invalid/assets/bad/asset.json | 2 +- .../read-mixed/assets/ui/atlas/asset.json | 2 +- .../java/p/studio/utilities/i18n/I18n.java | 2 +- .../assets/details/AssetDetailsUiSupport.java | 6 +- .../assets/list/AssetListItemControl.java | 6 +- .../main/resources/i18n/messages.properties | 2 +- .../resources/themes/default-prometeu.css | 19 -- test-projects/main/.studio/activities.json | 190 +++++++++--------- .../main/assets/.prometeu/index.json | 5 - test-projects/main/assets/bigode/asset.json | 2 +- .../main/assets/recovered/atlas2/asset.json | 2 +- .../main/assets/recovered/bbb2/asset.json | 2 +- .../recovered/one-more-atlas/asset.json | 2 +- .../main/assets/ui/atlas2/asset.json | 2 +- .../main/assets/ui/one-more-atlas/asset.json | 2 +- test-projects/main/assets/ui/sound/asset.json | 2 +- test-projects/main/assets/ui/test/asset.json | 14 -- 27 files changed, 132 insertions(+), 177 deletions(-) delete mode 100644 test-projects/main/assets/ui/test/asset.json diff --git a/docs/packer/specs/3. Asset Declaration and Virtual Asset Contract Specification.md b/docs/packer/specs/3. Asset Declaration and Virtual Asset Contract Specification.md index 9a355013..888c469a 100644 --- a/docs/packer/specs/3. Asset Declaration and Virtual Asset Contract Specification.md +++ b/docs/packer/specs/3. Asset Declaration and Virtual Asset Contract Specification.md @@ -58,7 +58,7 @@ Rules: Examples: -- `image_bank` +- `tile_bank` - `sound_bank` ## Inputs diff --git a/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/AssetFamilyCatalog.java b/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/AssetFamilyCatalog.java index c5e9624d..34e77f30 100644 --- a/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/AssetFamilyCatalog.java +++ b/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/AssetFamilyCatalog.java @@ -3,8 +3,7 @@ package p.packer.messages.assets; import java.util.Locale; public enum AssetFamilyCatalog { - IMAGE_BANK("image_bank"), - PALETTE_BANK("palette_bank"), + TILE_BANK("tile_bank"), SOUND_BANK("sound_bank"), UNKNOWN("unknown"); diff --git a/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/OutputFormatCatalog.java b/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/OutputFormatCatalog.java index a8653630..fe041c62 100644 --- a/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/OutputFormatCatalog.java +++ b/prometeu-packer/prometeu-packer-api/src/main/java/p/packer/messages/assets/OutputFormatCatalog.java @@ -4,10 +4,8 @@ import java.util.List; import java.util.Locale; public enum OutputFormatCatalog { - TILES_INDEXED_V1(AssetFamilyCatalog.IMAGE_BANK, "TILES/indexed_v1", "TILES/indexed_v1"), - PALETTE_INDEXED_V1(AssetFamilyCatalog.PALETTE_BANK, "PALETTE/indexed_v1", "PALETTE/indexed_v1"), - SOUND_BANK_V1(AssetFamilyCatalog.SOUND_BANK, "SOUND/bank_v1", "SOUND/bank_v1"), - AUDIO_PCM_V1(AssetFamilyCatalog.SOUND_BANK, "AUDIO/pcm_v1", "AUDIO/pcm_v1"), + TILES_INDEXED_V1(AssetFamilyCatalog.TILE_BANK, "TILES/indexed_v1", "TILES/indexed_v1"), + SOUND_V1(AssetFamilyCatalog.SOUND_BANK, "SOUND/v1", "SOUND/v1"), UNKNOWN(AssetFamilyCatalog.UNKNOWN, "unknown", "Unknown"); private final AssetFamilyCatalog assetFamily; diff --git a/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerAssetDeclarationParser.java b/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerAssetDeclarationParser.java index 697d2f96..8c3c12ed 100644 --- a/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerAssetDeclarationParser.java +++ b/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerAssetDeclarationParser.java @@ -105,7 +105,7 @@ public final class PackerAssetDeclarationParser { diagnostics.add(new PackerDiagnostic( PackerDiagnosticSeverity.ERROR, PackerDiagnosticCategory.STRUCTURAL, - "Field 'type' must be one of: image_bank, palette_bank, sound_bank.", + "Field 'type' must be one of: tile_bank, palette_bank, sound_bank.", manifestPath, true)); return null; diff --git a/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerOutputContractCatalog.java b/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerOutputContractCatalog.java index 758f59b5..a30062f0 100644 --- a/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerOutputContractCatalog.java +++ b/prometeu-packer/prometeu-packer-v1/src/main/java/p/packer/services/PackerOutputContractCatalog.java @@ -61,7 +61,7 @@ final class PackerOutputContractCatalog { "16", true, List.of("8", "16", "32"))); - case SOUND_BANK_V1, AUDIO_PCM_V1 -> List.of( + case SOUND_V1 -> List.of( new PackerCodecConfigurationField( "sample_rate", "Frame Rate", diff --git a/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/FileSystemPackerWorkspaceServiceTest.java b/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/FileSystemPackerWorkspaceServiceTest.java index 3d8f8a37..420c7e5e 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/FileSystemPackerWorkspaceServiceTest.java +++ b/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/FileSystemPackerWorkspaceServiceTest.java @@ -88,7 +88,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/new-atlas", "new_atlas", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, true)); @@ -117,7 +117,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/new-atlas", "new_atlas", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, true)); @@ -150,7 +150,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/new-atlas", "new_atlas", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, true)); @@ -445,7 +445,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/delete-me", "delete_me", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, false)); @@ -473,7 +473,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/source-atlas", "source_atlas", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, true)); @@ -540,7 +540,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/source", "source", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, false)); @@ -548,7 +548,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/target", "target", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, false)); @@ -615,8 +615,8 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "audio/bad", "bad_asset", - AssetFamilyCatalog.IMAGE_BANK, - OutputFormatCatalog.SOUND_BANK_V1, + AssetFamilyCatalog.TILE_BANK, + OutputFormatCatalog.SOUND_V1, OutputCodecCatalog.NONE, false)); @@ -635,7 +635,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/atlas-a", "atlas_a", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, true))); @@ -643,7 +643,7 @@ final class FileSystemPackerWorkspaceServiceTest { project(projectRoot), "ui/atlas-b", "atlas_b", - AssetFamilyCatalog.IMAGE_BANK, + AssetFamilyCatalog.TILE_BANK, OutputFormatCatalog.TILES_INDEXED_V1, OutputCodecCatalog.NONE, false))); diff --git a/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/PackerAssetDeclarationParserTest.java b/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/PackerAssetDeclarationParserTest.java index 93510ad6..22a25ff1 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/PackerAssetDeclarationParserTest.java +++ b/prometeu-packer/prometeu-packer-v1/src/test/java/p/packer/services/PackerAssetDeclarationParserTest.java @@ -28,7 +28,7 @@ final class PackerAssetDeclarationParserTest { assertEquals(1, result.declaration().schemaVersion()); assertEquals("fixture-uuid-1", result.declaration().assetUuid()); assertEquals("ui_atlas", result.declaration().name()); - assertEquals(AssetFamilyCatalog.IMAGE_BANK, result.declaration().assetFamily()); + assertEquals(AssetFamilyCatalog.TILE_BANK, result.declaration().assetFamily()); assertEquals("TILES/indexed_v1", result.declaration().outputFormat().displayName()); assertEquals(OutputCodecCatalog.NONE, result.declaration().outputCodec()); assertTrue(result.declaration().preloadEnabled()); @@ -69,7 +69,7 @@ final class PackerAssetDeclarationParserTest { "schema_version": 1, "asset_uuid": "uuid-outside", "name": "bad_asset", - "type": "image_bank", + "type": "tile_bank", "inputs": { "sprites": ["../outside.png"] }, "output": { "format": "TILES/indexed_v1", "codec": "NONE" }, "preload": { "enabled": true } diff --git a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-missing-fields/assets/bad/asset.json b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-missing-fields/assets/bad/asset.json index fb786941..7d7c7ee0 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-missing-fields/assets/bad/asset.json +++ b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-missing-fields/assets/bad/asset.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "type": "image_bank", + "type": "tile_bank", "inputs": "wrong", "output": { "codec": "" diff --git a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-version/assets/bad/asset.json b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-version/assets/bad/asset.json index 8a41b1f3..20b158be 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-version/assets/bad/asset.json +++ b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/invalid-version/assets/bad/asset.json @@ -2,7 +2,7 @@ "schema_version": 9, "asset_uuid": "future-uuid-1", "name": "future_asset", - "type": "image_bank", + "type": "tile_bank", "inputs": { "sprites": ["future.png"] }, diff --git a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/managed-basic/assets/ui/atlas/asset.json b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/managed-basic/assets/ui/atlas/asset.json index 301b3bee..8bcee8e2 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/managed-basic/assets/ui/atlas/asset.json +++ b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/managed-basic/assets/ui/atlas/asset.json @@ -2,7 +2,7 @@ "schema_version": 1, "asset_uuid": "fixture-uuid-1", "name": "ui_atlas", - "type": "image_bank", + "type": "tile_bank", "inputs": { "sprites": ["sprites/confirm.png"] }, diff --git a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-invalid/assets/bad/asset.json b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-invalid/assets/bad/asset.json index fb786941..7d7c7ee0 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-invalid/assets/bad/asset.json +++ b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-invalid/assets/bad/asset.json @@ -1,6 +1,6 @@ { "schema_version": 1, - "type": "image_bank", + "type": "tile_bank", "inputs": "wrong", "output": { "codec": "" diff --git a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-mixed/assets/ui/atlas/asset.json b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-mixed/assets/ui/atlas/asset.json index 651ed598..d421c8e8 100644 --- a/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-mixed/assets/ui/atlas/asset.json +++ b/prometeu-packer/prometeu-packer-v1/src/test/resources/fixtures/workspaces/read-mixed/assets/ui/atlas/asset.json @@ -2,7 +2,7 @@ "schema_version": 1, "asset_uuid": "uuid-1", "name": "ui_atlas", - "type": "image_bank", + "type": "tile_bank", "inputs": { "sprites": ["sprites/confirm.png"] }, diff --git a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java b/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java index 4f8bdb9e..1cb34462 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java +++ b/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java @@ -139,7 +139,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_IMAGE_BANK("assets.type.imageBank"), + ASSETS_TYPE_TILE_BANK("assets.type.tileBank"), ASSETS_TYPE_PALETTE_BANK("assets.type.paletteBank"), ASSETS_TYPE_SOUND_BANK("assets.type.soundBank"), ASSETS_TYPE_UNKNOWN("assets.type.unknown"), diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java index f40f86b5..5cacc932 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java +++ b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java @@ -97,8 +97,7 @@ public final class AssetDetailsUiSupport { public static String typeLabel(AssetFamilyCatalog assetFamily) { return switch (assetFamily) { - case IMAGE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_IMAGE_BANK); - case PALETTE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_PALETTE_BANK); + case TILE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_TILE_BANK); case SOUND_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_SOUND_BANK); case UNKNOWN -> Container.i18n().text(I18n.ASSETS_TYPE_UNKNOWN); }; @@ -106,8 +105,7 @@ public final class AssetDetailsUiSupport { public static String typeChipTone(AssetFamilyCatalog assetFamily) { return switch (assetFamily) { - case IMAGE_BANK -> "assets-details-chip-image"; - case PALETTE_BANK -> "assets-details-chip-palette"; + case TILE_BANK -> "assets-details-chip-image"; case SOUND_BANK -> "assets-details-chip-audio"; case UNKNOWN -> "assets-details-chip-generic"; }; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java index 3cfeb71a..3a312fd0 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java +++ b/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java @@ -112,8 +112,7 @@ public final class AssetListItemControl extends VBox { private String assetRowToneClass(AssetFamilyCatalog assetFamily) { return switch (assetFamily) { - case IMAGE_BANK -> "assets-workspace-asset-row-tone-image"; - case PALETTE_BANK -> "assets-workspace-asset-row-tone-palette"; + case TILE_BANK -> "assets-workspace-asset-row-tone-image"; case SOUND_BANK -> "assets-workspace-asset-row-tone-audio"; default -> "assets-workspace-asset-row-tone-generic"; }; @@ -121,8 +120,7 @@ public final class AssetListItemControl extends VBox { private String assetNameToneClass(AssetFamilyCatalog assetFamily) { return switch (assetFamily) { - case IMAGE_BANK -> "assets-workspace-asset-name-tone-image"; - case PALETTE_BANK -> "assets-workspace-asset-name-tone-palette"; + case TILE_BANK -> "assets-workspace-asset-name-tone-image"; case SOUND_BANK -> "assets-workspace-asset-name-tone-audio"; default -> "assets-workspace-asset-name-tone-generic"; }; diff --git a/prometeu-studio/src/main/resources/i18n/messages.properties b/prometeu-studio/src/main/resources/i18n/messages.properties index 931ca2c3..4a332468 100644 --- a/prometeu-studio/src/main/resources/i18n/messages.properties +++ b/prometeu-studio/src/main/resources/i18n/messages.properties @@ -130,7 +130,7 @@ assets.label.registration=Registration assets.label.buildParticipation=Build Participation assets.label.assetId=Asset ID assets.label.type=Type -assets.type.imageBank=Image Bank +assets.type.tileBank=Tile Bank assets.type.paletteBank=Palette Bank assets.type.soundBank=Sound Bank assets.type.unknown=Unknown diff --git a/prometeu-studio/src/main/resources/themes/default-prometeu.css b/prometeu-studio/src/main/resources/themes/default-prometeu.css index 23129c9f..adf7d163 100644 --- a/prometeu-studio/src/main/resources/themes/default-prometeu.css +++ b/prometeu-studio/src/main/resources/themes/default-prometeu.css @@ -408,15 +408,6 @@ -fx-background-color: #21192c; } -.assets-workspace-asset-row-tone-palette { - -fx-background-color: #1d1711; - -fx-border-color: #9c6d2b; -} - -.assets-workspace-asset-row-tone-palette:hover { - -fx-background-color: #281f15; -} - .assets-workspace-asset-row-tone-text { -fx-background-color: #122019; -fx-border-color: #3e8763; @@ -449,10 +440,6 @@ -fx-text-fill: #dcbfff; } -.assets-workspace-asset-name-tone-palette { - -fx-text-fill: #ffd69a; -} - .assets-workspace-asset-name-tone-text { -fx-text-fill: #aee8c5; } @@ -659,12 +646,6 @@ -fx-text-fill: #d7f0ff; } -.assets-details-chip-palette { - -fx-background-color: #2f2121; - -fx-border-color: #ff9b7a; - -fx-text-fill: #ffe2d7; -} - .assets-details-chip-audio { -fx-background-color: #1e2741; -fx-border-color: #85a8ff; diff --git a/test-projects/main/.studio/activities.json b/test-projects/main/.studio/activities.json index 8dc6bed0..9b0fcd65 100644 --- a/test-projects/main/.studio/activities.json +++ b/test-projects/main/.studio/activities.json @@ -1,4 +1,99 @@ [ { + "source" : "Assets", + "message" : "7 assets loaded", + "severity" : "SUCCESS", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: bla", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: one-more-atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: ui_atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: one-more-atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: bbb2", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: ui_atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: Bigode", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Asset scan started", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "7 assets loaded", + "severity" : "SUCCESS", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Asset scan diagnostics updated.", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: sound", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: one-more-atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: ui_atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: one-more-atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: bbb2", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: ui_atlas", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Discovered asset: Bigode", + "severity" : "INFO", + "sticky" : false +}, { + "source" : "Assets", + "message" : "Asset scan started", + "severity" : "INFO", + "sticky" : false +}, { "source" : "Assets", "message" : "8 assets loaded", "severity" : "SUCCESS", @@ -2403,99 +2498,4 @@ "message" : "7 assets loaded", "severity" : "SUCCESS", "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: test", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: one-more-atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: ui_atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: bla", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: one-more-atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: ui_atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: Bigode", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Asset scan started", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "7 assets loaded", - "severity" : "SUCCESS", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: test", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: one-more-atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: ui_atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: bla", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: one-more-atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: ui_atlas", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: Bigode", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Asset scan started", - "severity" : "INFO", - "sticky" : false -}, { - "source" : "Assets", - "message" : "7 assets loaded", - "severity" : "SUCCESS", - "sticky" : false -}, { - "source" : "Assets", - "message" : "Discovered asset: test", - "severity" : "INFO", - "sticky" : false } ] \ No newline at end of file diff --git a/test-projects/main/assets/.prometeu/index.json b/test-projects/main/assets/.prometeu/index.json index 983b3302..0b85fbca 100644 --- a/test-projects/main/assets/.prometeu/index.json +++ b/test-projects/main/assets/.prometeu/index.json @@ -16,11 +16,6 @@ "asset_uuid" : "9a7386e7-6f0e-4e4c-9919-0de71e0b7031", "root" : "ui/sound", "included_in_build" : true - }, { - "asset_id" : 9, - "asset_uuid" : "b23fd13b-9a52-4a76-9e8a-9286f59757b2", - "root" : "ui/test", - "included_in_build" : true }, { "asset_id" : 11, "asset_uuid" : "64147d33-e8bf-4272-bb5c-b4c07c0276b3", diff --git a/test-projects/main/assets/bigode/asset.json b/test-projects/main/assets/bigode/asset.json index aa2d7ef7..cefac2dd 100644 --- a/test-projects/main/assets/bigode/asset.json +++ b/test-projects/main/assets/bigode/asset.json @@ -2,7 +2,7 @@ "schema_version" : 1, "asset_uuid" : "64147d33-e8bf-4272-bb5c-b4c07c0276b3", "name" : "Bigode", - "type" : "image_bank", + "type" : "tile_bank", "inputs" : { }, "output" : { "format" : "TILES/indexed_v1", diff --git a/test-projects/main/assets/recovered/atlas2/asset.json b/test-projects/main/assets/recovered/atlas2/asset.json index d0afcdb9..8ad5b0e2 100644 --- a/test-projects/main/assets/recovered/atlas2/asset.json +++ b/test-projects/main/assets/recovered/atlas2/asset.json @@ -2,7 +2,7 @@ "schema_version" : 1, "asset_uuid" : "b15b319f-5cab-4254-93ea-d83f4742d204", "name" : "ui_atlas", - "type" : "image_bank", + "type" : "tile_bank", "inputs" : { "sprites" : [ "sprites/confirm.png" ] }, diff --git a/test-projects/main/assets/recovered/bbb2/asset.json b/test-projects/main/assets/recovered/bbb2/asset.json index 7adf455d..b1e721dd 100644 --- a/test-projects/main/assets/recovered/bbb2/asset.json +++ b/test-projects/main/assets/recovered/bbb2/asset.json @@ -2,7 +2,7 @@ "schema_version" : 1, "asset_uuid" : "f64d3bfe-443d-4703-b62a-face19a32cac", "name" : "bbb2", - "type" : "image_bank", + "type" : "tile_bank", "inputs" : { }, "output" : { "codec" : "NONE", diff --git a/test-projects/main/assets/recovered/one-more-atlas/asset.json b/test-projects/main/assets/recovered/one-more-atlas/asset.json index 421e763b..988ad7e4 100644 --- a/test-projects/main/assets/recovered/one-more-atlas/asset.json +++ b/test-projects/main/assets/recovered/one-more-atlas/asset.json @@ -2,7 +2,7 @@ "schema_version" : 1, "asset_uuid" : "4d9847b0-5a23-421f-8b78-bf3909ca2281", "name" : "one-more-atlas", - "type" : "image_bank", + "type" : "tile_bank", "inputs" : { }, "output" : { "format" : "TILES/indexed_v1", diff --git a/test-projects/main/assets/ui/atlas2/asset.json b/test-projects/main/assets/ui/atlas2/asset.json index c2b7bf1c..e6f0f63b 100644 --- a/test-projects/main/assets/ui/atlas2/asset.json +++ b/test-projects/main/assets/ui/atlas2/asset.json @@ -2,7 +2,7 @@ "schema_version": 1, "asset_uuid": "21953cb8-4101-4790-9e5e-d95f5fbc9b5a", "name": "ui_atlas", - "type": "image_bank", + "type": "tile_bank", "inputs": { "sprites": ["sprites/confirm.png"] }, "output": { "format": "TILES/indexed_v1", "codec": "NONE" }, "preload": { "enabled": true } diff --git a/test-projects/main/assets/ui/one-more-atlas/asset.json b/test-projects/main/assets/ui/one-more-atlas/asset.json index 581a8903..ad2b3afa 100644 --- a/test-projects/main/assets/ui/one-more-atlas/asset.json +++ b/test-projects/main/assets/ui/one-more-atlas/asset.json @@ -2,7 +2,7 @@ "schema_version" : 1, "asset_uuid" : "62a81570-8f47-4612-9288-6060e6c9a2e2", "name" : "one-more-atlas", - "type" : "image_bank", + "type" : "tile_bank", "inputs" : { }, "output" : { "format" : "TILES/indexed_v1", diff --git a/test-projects/main/assets/ui/sound/asset.json b/test-projects/main/assets/ui/sound/asset.json index 816db50b..15903a88 100644 --- a/test-projects/main/assets/ui/sound/asset.json +++ b/test-projects/main/assets/ui/sound/asset.json @@ -5,7 +5,7 @@ "type" : "sound_bank", "inputs" : { }, "output" : { - "format" : "AUDIO/pcm_v1", + "format" : "SOUND/v1", "codec" : "NONE", "codec_configuration" : { } }, diff --git a/test-projects/main/assets/ui/test/asset.json b/test-projects/main/assets/ui/test/asset.json deleted file mode 100644 index 44b1c9f8..00000000 --- a/test-projects/main/assets/ui/test/asset.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "schema_version" : 1, - "asset_uuid" : "b23fd13b-9a52-4a76-9e8a-9286f59757b2", - "name" : "test", - "type" : "palette_bank", - "inputs" : { }, - "output" : { - "format" : "PALETTE/indexed_v1", - "codec" : "NONE" - }, - "preload" : { - "enabled" : false - } -}