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

baked frames are selected

Browse Source
This commit is contained in:
shweet
2026-04-14 17:15:06 -04:00
parent c59ef05902
commit 98d1bf1981
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/imgui/window/timeline.cpp
View File

@@ -255,10 +255,34 @@ namespace anm2ed::imgui
auto behavior = [&]() auto behavior = [&]()
{ {
if (auto item = document.item_get()) if (auto item = document.item_get())
{
std::set<int> bakedSelection{};
for (auto i : frames.selection | std::views::reverse) for (auto i : frames.selection | std::views::reverse)
{
if (!vector::in_bounds(item->frames, i)) continue;
auto originalDuration = item->frames[i].duration;
item->frames_bake(i, settings.bakeInterval, settings.bakeIsRoundScale, settings.bakeIsRoundRotation); item->frames_bake(i, settings.bakeInterval, settings.bakeIsRoundScale, settings.bakeIsRoundRotation);
frames.clear(); auto bakedCount = originalDuration <= anm2::FRAME_DURATION_MIN
? 1
: (int)std::ceil((float)originalDuration / settings.bakeInterval);
for (int offset = 0; offset < bakedCount; ++offset)
bakedSelection.insert(i + offset);
}
frames.selection = std::move(bakedSelection);
if (!frames.selection.empty())
{
reference.frameIndex = *frames.selection.begin();
frameSelectionSnapshot.assign(frames.selection.begin(), frames.selection.end());
frameSelectionSnapshotReference = reference;
frameSelectionLocked.clear();
isFrameSelectionLocked = false;
frameFocusIndex = reference.frameIndex;
frameFocusRequested = true;
}
}
}; };
DOCUMENT_EDIT(document, localize.get(EDIT_BAKE_FRAMES), Document::FRAMES, behavior()); DOCUMENT_EDIT(document, localize.get(EDIT_BAKE_FRAMES), Document::FRAMES, behavior());
@@ -495,9 +519,8 @@ namespace anm2ed::imgui
{ {
auto item = animation ? animation->item_get(reference.itemType, reference.itemID) : nullptr; auto item = animation ? animation->item_get(reference.itemType, reference.itemID) : nullptr;
auto frame = document.frame_get(); auto frame = document.frame_get();
bool isMakeRegion = bool isMakeRegion = frame && reference.itemType == anm2::LAYER && reference.itemID != -1 &&
frame && reference.itemType == anm2::LAYER && reference.itemID != -1 && frame->regionID == -1 && frame->regionID == -1 && anm2.content.layers.contains(reference.itemID) &&
anm2.content.layers.contains(reference.itemID) &&
anm2.content.spritesheets.contains(anm2.content.layers.at(reference.itemID).spritesheetID); anm2.content.spritesheets.contains(anm2.content.layers.at(reference.itemID).spritesheetID);
if (ImGui::MenuItem(localize.get(SHORTCUT_STRING_UNDO), settings.shortcutUndo.c_str(), false, if (ImGui::MenuItem(localize.get(SHORTCUT_STRING_UNDO), settings.shortcutUndo.c_str(), false,