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

Render animation fixes, vs code tasks

Browse Source
This commit is contained in:
shweet
2026-03-15 13:22:53 -04:00
parent bbfafd7331
commit a83dbd5b6c
6 changed files with 100 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imgui/window/animation_preview.cpp
+7 -2
View File
@@ -105,6 +105,7 @@ namespace anm2ed::imgui
pixels[index + 2] = (uint8_t)glm::clamp((float)std::round((float)pixels[index + 2] / alphaUnit), 0.0f, 255.0f);
}
}
<<<<<<< HEAD
bool render_audio_stream_generate(AudioStream& audioStream, std::map<int, anm2::Sound>& sounds,
const std::vector<int>& frameSoundIDs, int fps)
@@ -150,6 +151,8 @@ namespace anm2ed::imgui
MIX_DestroyMixer(mixer);
return true;
}
=======
>>>>>>> f58d894 (Render animation fixes, vs code tasks)
}
AnimationPreview::AnimationPreview() : Canvas(vec2()) {}
@@ -368,7 +371,8 @@ namespace anm2ed::imgui
}
else
{
toasts.push(std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED), std::make_format_args(pathString)));
toasts.push(
std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED), std::make_format_args(pathString)));
logger.error(std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED, anm2ed::ENGLISH),
std::make_format_args(pathString)));
if (type != render::PNGS) render_temp_cleanup(renderTempDirectory, renderTempFrames);
@@ -649,7 +653,8 @@ namespace anm2ed::imgui
if (renderTempDirectory.empty())
{
auto pathString = path::to_utf8(settings.renderPath);
toasts.push(std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED), std::make_format_args(pathString)));
toasts.push(
std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED), std::make_format_args(pathString)));
logger.error(std::vformat(localize.get(TOAST_EXPORT_RENDERED_ANIMATION_FAILED, anm2ed::ENGLISH),
std::make_format_args(pathString)));
manager.isRecording = false;
src/imgui/window/regions.cpp
+10
View File
@@ -5,6 +5,7 @@
#include <format>
<<<<<<< HEAD
#include "document.hpp"
#include "log.hpp"
#include "map_.hpp"
@@ -12,6 +13,15 @@
#include "strings.hpp"
#include "toast.hpp"
#include "vector_.hpp"
=======
#include "document.h"
#include "log.h"
#include "map_.h"
#include "math_.h"
#include "strings.h"
#include "toast.h"
#include "vector_.h"
>>>>>>> f58d894 (Render animation fixes, vs code tasks)
#include "../../util/map_.hpp"