update dumps + fix trigger bug some more
This commit is contained in:
@@ -40,7 +40,7 @@ namespace anm2ed::anm2
|
|||||||
auto& animation = *animations.items.insert(animations.items.begin() + start + count, Animation(element));
|
auto& animation = *animations.items.insert(animations.items.begin() + start + count, Animation(element));
|
||||||
|
|
||||||
for (auto& trigger : animation.triggers.frames)
|
for (auto& trigger : animation.triggers.frames)
|
||||||
if (!content.events.contains(trigger.eventID)) content.events[trigger.eventID].name = localize.get(L);
|
if (!content.events.contains(trigger.eventID)) trigger.eventID = -1;
|
||||||
|
|
||||||
indices.insert(index);
|
indices.insert(index);
|
||||||
count++;
|
count++;
|
||||||
|
|||||||
@@ -693,8 +693,9 @@ namespace anm2ed::imgui
|
|||||||
drawList->PushClipRect(clipMin, clipMax);
|
drawList->PushClipRect(clipMin, clipMax);
|
||||||
ImGui::PushFont(resources.fonts[font::BOLD].get(), font::SIZE_LARGE);
|
ImGui::PushFont(resources.fonts[font::BOLD].get(), font::SIZE_LARGE);
|
||||||
auto triggerTextColor = isLightTheme ? TRIGGER_TEXT_COLOR_LIGHT : TRIGGER_TEXT_COLOR_DARK;
|
auto triggerTextColor = isLightTheme ? TRIGGER_TEXT_COLOR_LIGHT : TRIGGER_TEXT_COLOR_DARK;
|
||||||
drawList->AddText(textPos, ImGui::GetColorU32(triggerTextColor),
|
if (anm2.content.events.contains(trigger.eventID))
|
||||||
anm2.content.events.at(trigger.eventID).name.c_str());
|
drawList->AddText(textPos, ImGui::GetColorU32(triggerTextColor),
|
||||||
|
anm2.content.events.at(trigger.eventID).name.c_str());
|
||||||
ImGui::PopFont();
|
ImGui::PopFont();
|
||||||
drawList->PopClipRect();
|
drawList->PopClipRect();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,9 +76,27 @@ namespace anm2ed
|
|||||||
mei.ExceptionPointers = exceptionPointers;
|
mei.ExceptionPointers = exceptionPointers;
|
||||||
mei.ClientPointers = FALSE;
|
mei.ClientPointers = FALSE;
|
||||||
|
|
||||||
const MINIDUMP_TYPE dumpType = static_cast<MINIDUMP_TYPE>(MiniDumpNormal | MiniDumpWithIndirectlyReferencedMemory |
|
DWORD dumpType = MiniDumpWithFullMemory | MiniDumpWithFullMemoryInfo | MiniDumpWithHandleData |
|
||||||
MiniDumpWithThreadInfo | MiniDumpWithUnloadedModules);
|
MiniDumpWithThreadInfo | MiniDumpWithUnloadedModules | MiniDumpWithProcessThreadData |
|
||||||
MiniDumpWriteDump(GetCurrentProcess(), pid, file, dumpType, exceptionPointers ? &mei : nullptr, nullptr, nullptr);
|
MiniDumpWithPrivateReadWriteMemory | MiniDumpWithDataSegs | MiniDumpWithCodeSegs |
|
||||||
|
MiniDumpWithIndirectlyReferencedMemory;
|
||||||
|
#ifdef MiniDumpWithModuleHeaders
|
||||||
|
dumpType |= MiniDumpWithModuleHeaders;
|
||||||
|
#endif
|
||||||
|
#ifdef MiniDumpWithTokenInformation
|
||||||
|
dumpType |= MiniDumpWithTokenInformation;
|
||||||
|
#endif
|
||||||
|
#ifdef MiniDumpWithFullAuxiliaryState
|
||||||
|
dumpType |= MiniDumpWithFullAuxiliaryState;
|
||||||
|
#endif
|
||||||
|
#ifdef MiniDumpWithAvxXStateContext
|
||||||
|
dumpType |= MiniDumpWithAvxXStateContext;
|
||||||
|
#endif
|
||||||
|
#ifdef MiniDumpWithIptTrace
|
||||||
|
dumpType |= MiniDumpWithIptTrace;
|
||||||
|
#endif
|
||||||
|
MiniDumpWriteDump(GetCurrentProcess(), pid, file, static_cast<MINIDUMP_TYPE>(dumpType),
|
||||||
|
exceptionPointers ? &mei : nullptr, nullptr, nullptr);
|
||||||
|
|
||||||
FlushFileBuffers(file);
|
FlushFileBuffers(file);
|
||||||
CloseHandle(file);
|
CloseHandle(file);
|
||||||
|
|||||||
Reference in New Issue
Block a user