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

yeah this is more sensible

Browse Source
This commit is contained in:
shweet
2026-06-07 12:53:08 -04:00
parent e8083d7817
commit 71e799f536
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/anm2/anm2.cpp
+15 -18
View File
@@ -265,19 +265,18 @@ namespace anm2ed
if (out.type == ElementType::REGION && out.origin == Origin::CENTER) out.pivot = glm::ivec2(out.size / 2.0f); if (out.type == ElementType::REGION && out.origin == Origin::CENTER) out.pivot = glm::ivec2(out.size / 2.0f);
} }
bool bake_attributes_read(const XMLElement* element, Interpolation& interpolation, int& originalDelay, int& bakeCount) bool bake_attributes_read(const XMLElement* element, Interpolation& interpolation, int& bakeDelay)
{ {
if (!element || !element->Attribute("BakeInterpolation")) return false; if (!element || !element->Attribute("BakeInterpolation")) return false;
interpolation = interpolation_read(element, "BakeInterpolation"); interpolation = interpolation_read(element, "BakeInterpolation");
element->QueryIntAttribute("OriginalDelay", &originalDelay); element->QueryIntAttribute("BakeDelay", &bakeDelay);
element->QueryIntAttribute("BakeCount", &bakeCount); return bakeDelay >= FRAME_DURATION_MIN;
return bakeCount > 0 && originalDelay >= FRAME_DURATION_MIN;
} }
const XMLElement* bake_frames_skip(const XMLElement* element, int bakeCount) const XMLElement* bake_frames_skip(const XMLElement* element, int bakeDelay)
{ {
for (int i = 0; element && i < bakeCount; ++i) for (int i = 0; element && i < bakeDelay; ++i)
element = element->NextSiblingElement(); element = element->NextSiblingElement();
return element; return element;
} }
@@ -291,15 +290,14 @@ namespace anm2ed
if (childType == ElementType::FRAME && is_track(out)) if (childType == ElementType::FRAME && is_track(out))
{ {
Interpolation bakeInterpolation{}; Interpolation bakeInterpolation{};
int originalDelay{}; int bakeDelay{};
int bakeCount{}; if (bake_attributes_read(child, bakeInterpolation, bakeDelay))
if (bake_attributes_read(child, bakeInterpolation, originalDelay, bakeCount))
{ {
auto restored = element_read(child); auto restored = element_read(child);
restored.interpolation = bakeInterpolation; restored.interpolation = bakeInterpolation;
restored.duration = originalDelay; restored.duration = bakeDelay;
out.children.push_back(std::move(restored)); out.children.push_back(std::move(restored));
child = bake_frames_skip(child, bakeCount); child = bake_frames_skip(child, bakeDelay);
continue; continue;
} }
} }
@@ -471,12 +469,11 @@ namespace anm2ed
} }
} }
void bake_attributes_write(XMLElement* out, Interpolation interpolation, int bakeCount, int originalDelay) void bake_attributes_write(XMLElement* out, Interpolation interpolation, int bakeDelay)
{ {
auto value = INTERPOLATION_VALUES[(std::size_t)interpolation]; auto value = INTERPOLATION_VALUES[(std::size_t)interpolation];
if (!value.empty()) out->SetAttribute("BakeInterpolation", value.data()); if (!value.empty()) out->SetAttribute("BakeInterpolation", value.data());
out->SetAttribute("BakeCount", bakeCount); out->SetAttribute("BakeDelay", bakeDelay);
out->SetAttribute("OriginalDelay", originalDelay);
} }
bool is_frame_bake_serialized(const Element& frame, Flags flags) bool is_frame_bake_serialized(const Element& frame, Flags flags)
@@ -493,12 +490,12 @@ namespace anm2ed
auto nextFrame = index + 1 < (int)track.children.size() && track.children[index + 1].type == ElementType::FRAME auto nextFrame = index + 1 < (int)track.children.size() && track.children[index + 1].type == ElementType::FRAME
? track.children[index + 1] ? track.children[index + 1]
: original; : original;
auto bakeCount = std::max(original.duration, FRAME_DURATION_MIN); auto bakeDelay = std::max(original.duration, FRAME_DURATION_MIN);
for (int bakeIndex = 0; bakeIndex < bakeCount; ++bakeIndex) for (int bakeIndex = 0; bakeIndex < bakeDelay; ++bakeIndex)
{ {
auto baked = original; auto baked = original;
auto amount = interpolation_factor(original.interpolation, (float)bakeIndex / (float)bakeCount); auto amount = interpolation_factor(original.interpolation, (float)bakeIndex / (float)bakeDelay);
baked.duration = FRAME_DURATION_MIN; baked.duration = FRAME_DURATION_MIN;
baked.interpolation = Interpolation::NONE; baked.interpolation = Interpolation::NONE;
baked.rotation = glm::mix(original.rotation, nextFrame.rotation, amount); baked.rotation = glm::mix(original.rotation, nextFrame.rotation, amount);
@@ -507,7 +504,7 @@ namespace anm2ed
baked.colorOffset = glm::mix(original.colorOffset, nextFrame.colorOffset, amount); baked.colorOffset = glm::mix(original.colorOffset, nextFrame.colorOffset, amount);
baked.tint = glm::mix(original.tint, nextFrame.tint, amount); baked.tint = glm::mix(original.tint, nextFrame.tint, amount);
auto frame = element_to_xml(document, baked, track.type, flags); auto frame = element_to_xml(document, baked, track.type, flags);
if (bakeIndex == 0) bake_attributes_write(frame, original.interpolation, bakeCount, original.duration); if (bakeIndex == 0) bake_attributes_write(frame, original.interpolation, bakeDelay);
out->InsertEndChild(frame); out->InsertEndChild(frame);
} }
} }