Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

fix viewer playback

shun-iwasawac1ce3c9ee044
diff --git a/toonz/sources/toonz/comboviewerpane.cpp b/toonz/sources/toonz/comboviewerpane.cpp
index a57f7be65..922d5624f 100644
--- a/toonz/sources/toonz/comboviewerpane.cpp
+++ b/toonz/sources/toonz/comboviewerpane.cpp
@@ -288,10 +288,9 @@ void ComboViewerPanel::onShowHideActionTriggered(QAction *act) {
void ComboViewerPanel::onDrawFrame(int frame,
const ImagePainter::VisualSettings &settings,
- QElapsedTimer *timer, qint64 targetInstant) {
+ QElapsedTimer *, qint64) {
TApp *app = TApp::instance();
m_sceneViewer->setVisual(settings);
- m_sceneViewer->setTimerAndTargetInstant(timer, targetInstant);
TFrameHandle *frameHandle = app->getCurrentFrame();
@@ -327,10 +326,6 @@ void ComboViewerPanel::onDrawFrame(int frame,
else if (settings.m_blankColor != TPixel::Transparent)
m_sceneViewer->update();
-
- // make sure to redraw the frame here.
- // repaint() does NOT immediately redraw the frame for QOpenGLWidget
- if (frameHandle->isPlaying()) qApp->processEvents();
}
//-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 98be9217f..01758ad6f 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -780,8 +780,7 @@ SceneViewer::SceneViewer(ImageUtils::FullScreenWidget *parent)
, m_editPreviewSubCamera(false)
, m_locator(NULL)
, m_isLocator(false)
- , m_isBusyOnTabletMove(false)
- , m_timer(nullptr) {
+ , m_isBusyOnTabletMove(false) {
m_visualSettings.m_sceneProperties =
TApp::instance()->getCurrentScene()->getScene()->getProperties();
#if defined(x64)
@@ -1937,14 +1936,6 @@ void SceneViewer::paintGL() {
if (!m_isPicking && m_lutCalibrator && m_lutCalibrator->isValid())
m_lutCalibrator->onEndDraw(m_fbo);
-
- // wait to achieve precise fps
- if (m_timer && m_timer->isValid()) {
- qint64 currentInstant = m_timer->nsecsElapsed();
- while (currentInstant < m_targetInstant) {
- currentInstant = m_timer->nsecsElapsed();
- }
- }
}
//-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h
index 4ad3e4a60..71946e49b 100644
--- a/toonz/sources/toonz/sceneviewer.h
+++ b/toonz/sources/toonz/sceneviewer.h
@@ -190,10 +190,6 @@ class SceneViewer final : public GLWidgetForHighDpi,
bool m_firstInitialized = true;
- // passed from PlaybackExecutor
- QElapsedTimer *m_timer;
- qint64 m_targetInstant;
-
public:
enum ReferenceMode {
NORMAL_REFERENCE = 1,
@@ -295,11 +291,6 @@ public:
void bindFBO() override;
void releaseFBO() override;
- void setTimerAndTargetInstant(QElapsedTimer *timer, qint64 target) {
- m_timer = timer;
- m_targetInstant = target;
- }
-
public:
// SceneViewer's gadget public functions
TPointD winToWorld(const QPointF &pos) const;
diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cpp
index e95f94d0b..b10fc5a88 100644
--- a/toonz/sources/toonz/viewerpane.cpp
+++ b/toonz/sources/toonz/viewerpane.cpp
@@ -263,10 +263,9 @@ void SceneViewerPanel::onShowHideActionTriggered(QAction *act) {
void SceneViewerPanel::onDrawFrame(int frame,
const ImagePainter::VisualSettings &settings,
- QElapsedTimer *timer, qint64 targetInstant) {
+ QElapsedTimer *, qint64) {
TApp *app = TApp::instance();
m_sceneViewer->setVisual(settings);
- m_sceneViewer->setTimerAndTargetInstant(timer, targetInstant);
TFrameHandle *frameHandle = app->getCurrentFrame();
@@ -301,10 +300,6 @@ void SceneViewerPanel::onDrawFrame(int frame,
else if (settings.m_blankColor != TPixel::Transparent)
m_sceneViewer->update();
-
- // make sure to redraw the frame here.
- // repaint() does NOT immediately redraw the frame for QOpenGLWidget
- if (frameHandle->isPlaying()) qApp->processEvents();
}
//-----------------------------------------------------------------------------
diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp
index f8bca5192..8babe3f07 100644
--- a/toonz/sources/toonzqt/flipconsole.cpp
+++ b/toonz/sources/toonzqt/flipconsole.cpp
@@ -219,10 +219,19 @@ void PlaybackExecutor::run() {
shortTermDelayAdjuster -= delayAdjust;
// Show the next frame, telling currently measured fps
- // The wait time will be inserted at the end of paintGL in order to
- // achieve precise playback
+ // For the Flipbook, the wait time will be inserted at the end of paintGL
+ // in order to achieve precise playback
emit nextFrame(fps, &m_timer, targetInstant);
+ // Playing on Viewer / Combo Viewer will advance the current frame.
+ // Calling qApp->processEvents() on drawing frame causes repaint of other
+ // panels which slows playback. Therefore in Viewer / Combo Viewer panels
+ // it just calls update() and necessary wait will be inserted here.
+ qint64 currentInstant = m_timer.nsecsElapsed();
+ while (currentInstant < targetInstant) {
+ currentInstant = m_timer.nsecsElapsed();
+ }
+
if (FlipConsole::m_areLinked) {
// In case there are linked consoles, update them too.
// Their load time must be included in the fps calculation.