shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Locale -> "Destination"; feels like a much better term to use

Browse Source
This commit is contained in:
shweet
2025-12-07 01:57:29 -05:00
parent fef1ff50e3
commit e6a4e5af35
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/anm2/anm2.h
View File

@@ -71,8 +71,8 @@ namespace anm2ed::anm2
Item* item_get(int, Type, int = -1);
Reference layer_animation_add(Reference = {}, std::string = {}, int = 0,
types::locale::Type = types::locale::GLOBAL);
Reference null_animation_add(Reference = {}, std::string = {}, types::locale::Type = types::locale::GLOBAL);
types::destination::Type = types::destination::ALL);
Reference null_animation_add(Reference = {}, std::string = {}, types::destination::Type = types::destination::ALL);
Frame* frame_get(int, Type, int, int = -1);
void merge(const Anm2& source, const std::filesystem::path& destinationDirectory = {},

13
src/anm2/anm2_items.cpp
View File

@@ -30,7 +30,8 @@ namespace anm2ed::anm2
return nullptr;
}
Reference Anm2::layer_animation_add(Reference reference, std::string name, int spritesheetID, locale::Type locale)
Reference Anm2::layer_animation_add(Reference reference, std::string name, int spritesheetID,
destination::Type locale)
{
auto id = reference.itemID == -1 ? map::next_id_get(content.layers) : reference.itemID;
auto& layer = content.layers[id];
@@ -44,12 +45,12 @@ namespace anm2ed::anm2
animation->layerOrder.push_back(id);
};
if (locale == locale::GLOBAL)
if (locale == destination::ALL)
{
for (auto& animation : animations.items)
if (!animation.layerAnimations.contains(id)) add(&animation, id);
}
else if (locale == locale::LOCAL)
else if (locale == destination::THIS)
{
if (auto animation = animation_get(reference.animationIndex))
if (!animation->layerAnimations.contains(id)) add(animation, id);
@@ -58,7 +59,7 @@ namespace anm2ed::anm2
return {reference.animationIndex, LAYER, id};
}
Reference Anm2::null_animation_add(Reference reference, std::string name, locale::Type locale)
Reference Anm2::null_animation_add(Reference reference, std::string name, destination::Type locale)
{
auto id = reference.itemID == -1 ? map::next_id_get(content.nulls) : reference.itemID;
auto& null = content.nulls[id];
@@ -67,12 +68,12 @@ namespace anm2ed::anm2
auto add = [&](Animation* animation, int id) { animation->nullAnimations[id] = Item(); };
if (locale == locale::GLOBAL)
if (locale == destination::ALL)
{
for (auto& animation : animations.items)
if (!animation.nullAnimations.contains(id)) add(&animation, id);
}
else if (locale == locale::LOCAL)
else if (locale == destination::THIS)
{
if (auto animation = animation_get(reference.animationIndex))
if (!animation->nullAnimations.contains(id)) add(animation, id);