omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Own log worker and trim Apple platform hooks

Browse Source
This commit is contained in:
omigamedev
2026-06-16 07:49:03 +02:00
parent 0c72aa0312
commit 7ef399eb75
10 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/legacy_canvas_draw_merge_services.h
View File

@@ -568,6 +568,28 @@ inline void execute_legacy_canvas_draw_merge_cache_to_screen_composite(
execution.unbind_cache_texture();
}
template <typename PlaneTransform, typename DrawPlane>
[[nodiscard]] inline auto make_legacy_canvas_draw_merge_cache_to_screen_checkerboard_plane(
glm::mat4 proj,
glm::mat4 camera,
float layer_scale,
PlaneTransform plane_transform,
DrawPlane draw_plane)
{
return [proj, camera, layer_scale, plane_transform, draw_plane](
const LegacyCanvasDrawMergeCheckerboardUniforms& uniforms,
int plane_index) {
auto checkerboard_uniforms = uniforms;
checkerboard_uniforms.mvp = proj * camera *
glm::scale(glm::vec3(layer_scale)) *
plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1.f));
setup_legacy_canvas_draw_merge_checkerboard_shader(checkerboard_uniforms);
draw_plane();
};
}
inline void execute_legacy_canvas_draw_merge_display_resolve(
const LegacyCanvasDrawMergeDisplayResolveUniforms& uniforms,
const LegacyCanvasDrawMergeDisplayResolveExecution& execution)

5
src/log.cpp
View File

@@ -12,12 +12,12 @@ void LogRemote::start()
return; // already running
m_running = true;
m_thread = std::thread([&] {
m_thread = std::jthread([this](std::stop_token stop_token) {
BT_SetTerminate();
net_init();
auto session_string = net_request("/start");
m_session = atoi(session_string.c_str());
while (m_running && !m_error)
while (m_running && !m_error && !stop_token.stop_requested())
{
auto m = m_mq.Get();
auto escaped = curl_easy_escape(curl, m.c_str(), (int)m.size());
@@ -35,6 +35,7 @@ void LogRemote::start()
void LogRemote::stop()
{
m_running = false;
m_thread.request_stop();
m_mq.UnlockGetters();
if (m_thread.joinable())
m_thread.join();

2
src/log.h
View File

@@ -18,7 +18,7 @@ public:
static LogRemote I;
bool m_running = false;
bool m_error = false;
std::thread m_thread;
std::jthread m_thread;
std::mutex m_mutex;
BlockingQueue<std::string> m_mq;
// Store messages until the file is open

18
src/node_canvas.cpp
View File

@@ -690,16 +690,14 @@ void NodeCanvas::draw()
.enable_blend = [&] {
apply_node_canvas_capability(pp::renderer::gl::blend_state(), true);
},
.draw_checkerboard_plane = [&](const pp::panopainter::LegacyCanvasDrawMergeCheckerboardUniforms& uniforms, int plane_index) {
auto checkerboard_uniforms = uniforms;
checkerboard_uniforms.mvp = proj * camera *
glm::scale(glm::vec3(m_canvas->m_layers.size() + 500.f)) *
m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1.f));
pp::panopainter::setup_legacy_canvas_draw_merge_checkerboard_shader(checkerboard_uniforms);
m_face_plane.draw_fill();
},
.draw_checkerboard_plane = pp::panopainter::make_legacy_canvas_draw_merge_cache_to_screen_checkerboard_plane(
proj,
camera,
m_canvas->m_layers.size() + 500.f,
m_canvas->m_plane_transform,
[&] {
m_face_plane.draw_fill();
}),
.bind_sampler = [&] {
m_sampler.bind(0);
set_active_texture_unit(0);

18
src/platform_apple/apple_platform_services.cpp
View File

@@ -183,6 +183,24 @@ void AppleDocumentPlatformServices::set_cursor_visible(bool visible) const
#endif
}
void AppleDocumentPlatformServices::trigger_crash_test() const
{
if (bridge_.trigger_crash_test)
bridge_.trigger_crash_test();
}
void AppleDocumentPlatformServices::request_app_close() const
{
if (bridge_.request_app_close)
bridge_.request_app_close();
}
void AppleDocumentPlatformServices::start_sonarpen() const
{
if (bridge_.start_sonarpen)
bridge_.start_sonarpen();
}
void AppleDocumentPlatformServices::acquire_render_context() const
{
if (bridge_.acquire_render_context)

6
src/platform_apple/apple_platform_services.h
View File

@@ -22,6 +22,9 @@ struct AppleDocumentPickerBridge {
std::function<void(std::string path)> display_file;
std::function<void(std::string path)> share_file;
std::function<void(bool visible)> set_cursor_visible;
std::function<void()> trigger_crash_test;
std::function<void()> request_app_close;
std::function<void()> start_sonarpen;
std::function<void()> acquire_render_context;
std::function<void()> release_render_context;
std::function<void()> present_render_context;
@@ -53,6 +56,9 @@ public:
void display_file(std::string_view path) const;
void share_file(std::string_view path) const;
void set_cursor_visible(bool visible) const;
void trigger_crash_test() const;
void request_app_close() const;
void start_sonarpen() const;
void acquire_render_context() const;
void release_render_context() const;
void present_render_context() const;

24
src/platform_legacy/legacy_platform_services.cpp
View File

@@ -143,6 +143,12 @@ public:
[ios_view hide_keyboard];
});
};
bridge.trigger_crash_test = [ios_view] {
[ios_view crash];
};
bridge.start_sonarpen = [ios_view] {
[App::I->ios_app sonarpen_start];
};
bridge.acquire_render_context = [ios_view] {
[ios_view async_lock];
};
@@ -209,6 +215,14 @@ public:
[osx_view share_file:[NSString stringWithUTF8String:path.c_str()]];
});
};
bridge.trigger_crash_test = [osx_view] {
[osx_view hockeyapp_crash];
};
bridge.request_app_close = [osx_view] {
dispatch_async(dispatch_get_main_queue(), ^{
[osx_view close];
});
};
bridge.acquire_render_context = [osx_view] {
[osx_view async_lock];
};
@@ -318,9 +332,9 @@ public:
void trigger_crash_test() override
{
#ifdef __IOS__
[App::I->ios_view crash];
active_apple_document_platform_services().trigger_crash_test();
#elif __OSX__
[App::I->osx_view hockeyapp_crash];
active_apple_document_platform_services().trigger_crash_test();
#elif defined(__ANDROID__)
int *x = nullptr; *x = 42;
LOG("%d", *x);
@@ -663,7 +677,7 @@ public:
void start_sonarpen() override
{
#if __IOS__
[App::I->ios_app sonarpen_start];
active_apple_document_platform_services().start_sonarpen();
#endif
}
@@ -727,9 +741,7 @@ public:
void request_app_close() override
{
#ifdef __OSX__
dispatch_async(dispatch_get_main_queue(), ^{
[App::I->osx_view close];
});
active_apple_document_platform_services().request_app_close();
#elif __LINUX__
glfwSetWindowShouldClose(App::I->glfw_window, GLFW_TRUE);
#endif