diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 14:59:48 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 15:01:44 +0100 |
| commit | aced0bef691dbc41bdd39b6e62662d2436877a4b (patch) | |
| tree | e90f9fd8e4c4c3471c2fb246bb1372974294b469 /tools/src/asset_processor/main.cpp | |
| parent | c3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff) | |
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'tools/src/asset_processor/main.cpp')
| -rw-r--r-- | tools/src/asset_processor/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index eddce2b0..4460f6fc 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -8,7 +8,7 @@ #include "assets/midi.h" #include "assets/palette.h" #include "assets/spriteframe.h" -#include "assets/tileset.h" +#include "assets/subtileset.h" #include "offsets.h" #include <filesystem> #include <fstream> @@ -264,8 +264,8 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa } std::unique_ptr<BaseAsset> assetHandler; - if (type == "tileset") { - assetHandler = std::make_unique<TilesetAsset>(path, start, size, asset); + if (type == "subtileset") { + assetHandler = std::make_unique<SubTileSetAsset>(path, start, size, asset); } else if (type == "animation") { assetHandler = std::make_unique<AnimationAsset>(path, start, size, asset); } else if (type == "sprite_frame") { @@ -280,8 +280,8 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa assetHandler = std::make_unique<GfxAsset>(path, start, size, asset); } else if (type == "palette") { assetHandler = std::make_unique<PaletteAsset>(path, start, size, asset); - } else if (type == "metatilemap" || - type == "metatileset_types" || type == "metatileset" || + } else if (type == "tilemap" || + type == "tileset_types" || type == "tileset" || type == "map_mapping1" || type == "map_mapping2" || type == "map_collision") { assetHandler = std::make_unique<MapAsset>(path, start, size, asset); |
