From 601864c51d09fa57ba8917b7337efbe3df1a078c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 10 Sep 2019 14:03:19 +1000 Subject: [PATCH] added some more temporary debug info --- app/node/distort/transform/transform.cpp | 4 ++-- app/node/processor/renderer/renderer.cpp | 4 ++-- app/node/processor/renderer/rendererprocessthread.cpp | 11 +++++++++++ app/node/processor/renderer/rendererthreadbase.cpp | 4 ++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/node/distort/transform/transform.cpp b/app/node/distort/transform/transform.cpp index f200b9add..f009fce30 100644 --- a/app/node/distort/transform/transform.cpp +++ b/app/node/distort/transform/transform.cpp @@ -86,7 +86,7 @@ QVariant TransformDistort::Value(NodeOutput *output, const rational &time) QMatrix4x4 mat; // Position translate - QVector2D pos = position_input_->get_value(time).value() * 0.01f; + QVector2D pos = position_input_->get_value(time).value(); mat.translate(pos); // Rotation @@ -96,7 +96,7 @@ QVariant TransformDistort::Value(NodeOutput *output, const rational &time) mat.scale(scale_input_->get_value(time).value()*0.01f); // Anchor Point - mat.translate(anchor_input_->get_value(time).value() * 0.01f); + mat.translate(anchor_input_->get_value(time).value()); return mat; } diff --git a/app/node/processor/renderer/renderer.cpp b/app/node/processor/renderer/renderer.cpp index 9371d4425..cb1fae40a 100644 --- a/app/node/processor/renderer/renderer.cpp +++ b/app/node/processor/renderer/renderer.cpp @@ -139,10 +139,10 @@ void RendererProcessor::InvalidateCache(const rational &start_range, const ratio rational start_range_adj = qMax(rational(0), start_range); rational end_range_adj = qMin(length_input()->get_value(0).value(), end_range); - /*qDebug() << "[RendererProcessor] Cache invalidated between" + qDebug() << "[RendererProcessor] Cache invalidated between" << start_range_adj.toDouble() << "and" - << end_range_adj.toDouble();*/ + << end_range_adj.toDouble(); // Snap start_range to timebase double start_range_dbl = start_range_adj.toDouble(); diff --git a/app/node/processor/renderer/rendererprocessthread.cpp b/app/node/processor/renderer/rendererprocessthread.cpp index 253b5d10b..3dac12a65 100644 --- a/app/node/processor/renderer/rendererprocessthread.cpp +++ b/app/node/processor/renderer/rendererprocessthread.cpp @@ -79,6 +79,8 @@ void RendererProcessThread::ProcessLoop() // Main waiting condition wait_cond_.wait(&mutex_); + qDebug() << this << "woke for a queued frame"; + if (cancelled_) { break; } @@ -109,6 +111,8 @@ void RendererProcessThread::ProcessLoop() bool has_hash = parent_->HasHash(hash_); bool can_cache = false; + qDebug() << this << "starting background cache of frame" << path_.time().toDouble(); + if (!has_hash){ if ((can_cache = parent_->TryCache(hash_))) { @@ -123,10 +127,17 @@ void RendererProcessThread::ProcessLoop() } // Get the requested value + qDebug() << this << "starting cache of" << hash_.toHex(); texture_ = output_to_process->get_value(path_.time()).value(); render_instance()->context()->functions()->glFinish(); + + qDebug() << this << "completed cache of" << hash_.toHex(); + } else { + qDebug() << this << "hash is in use"; } + } else { + qDebug() << this << "hash" << hash_.toHex() << "exists"; } foreach (Node* dep, all_deps) { diff --git a/app/node/processor/renderer/rendererthreadbase.cpp b/app/node/processor/renderer/rendererthreadbase.cpp index 6a20a237a..cd744229c 100644 --- a/app/node/processor/renderer/rendererthreadbase.cpp +++ b/app/node/processor/renderer/rendererthreadbase.cpp @@ -54,9 +54,13 @@ void RendererThreadBase::run() instance.SetShareContext(share_ctx_); + qDebug() << this << "is starting its OpenGL context"; + // Allocate and create resources if (instance.Start()) { + qDebug() << this << "OpenGL context creation succeeded"; + // Main loop (use Cancel() to exit it) ProcessLoop();