timelapse frame on stroke idle

This commit is contained in:
2019-11-02 15:13:31 +01:00
parent 167cceabfd
commit 7db1739df6
4 changed files with 25 additions and 48 deletions

View File

@@ -613,53 +613,6 @@ void App::draw(float dt)
glDisable(GL_SCISSOR_TEST);
}
if (rec_running)
{
static float rec_timer = 0.f;
rec_timer += dt;
if (rec_timer > 0.3f && canvas->m_canvas->m_dirty_stroke)
{
canvas->m_canvas->m_dirty_stroke = false;
LOG("rec tick");
rec_timer = 0.f;
Canvas::I->draw_merge(true);
Texture2D equirect = Canvas::I->m_layers_merge.gen_equirect({ 1024, 512 });
auto img = std::make_unique<Image>(equirect.get_image());
{
std::lock_guard<std::mutex> lock(rec_mutex);
rec_frames.emplace_back(std::move(img));
rec_cv.notify_all();
}
equirect.destroy();
/*
auto img = std::make_unique<Image>();
img->create(width, height);
#if __IOS__
[ios_view->glview bindDrawable];
#else
glBindFramebuffer(GL_FRAMEBUFFER, 0);
#endif
GLint dfbo, rfbo;
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &rfbo);
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &dfbo);
if (dfbo != rfbo)
LOG("DIFFERENT FB");
glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, img->m_data.get());
{
std::lock_guard<std::mutex> lock(rec_mutex);
rec_frames.emplace_back(std::move(img));
rec_cv.notify_all();
}
*/
update_rec_frames();
}
}
redraw = false;
}
@@ -745,7 +698,7 @@ void App::update_rec_frames()
if (rec_running)
{
static char buffer[128];
sprintf(buffer, "Recorder %d frames", rec_count);
sprintf(buffer, "Recorded %d frames", rec_count);
txt->set_text(buffer);
}
else
@@ -859,6 +812,7 @@ void App::rec_loop()
lock.unlock();
if (frame)
m_encoder->encode(*frame);
update_rec_frames();
}
}