UI|Client: Rendering the busy transition frame

Instead of a custom method in ClientWindow, BusyWidget can now render its own copy of the game view into a separate framebuffer. This reuses the latest available player view texture(s).
skyjake · Oct 2, 2016 · c9b440a · c9b440a
1 parent ff53cf3
commit c9b440a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 17 deletions.
diff --git a/doomsday/apps/client/include/ui/clientwindow.h b/doomsday/apps/client/include/ui/clientwindow.h
@@ -147,13 +147,13 @@ class ClientWindow : public de::BaseWindow
      */
     void grab(image_t &image, bool halfSized = false) const;
 
-    /**
+    /*
      * Draws the untransformed game-related contents of the window. The drawing
      * is done immediately; this must be called from the main/UI thread.
      *
      * The current render target is cleared before drawing.
      */
-    void drawGameContent();
+    //void drawGameContent();
 
     void fadeContentFromBlack(de::TimeDelta const &duration);
     de::FadeToBlackWidget *contentFade();

diff --git a/doomsday/apps/client/include/ui/widgets/busywidget.h b/doomsday/apps/client/include/ui/widgets/busywidget.h
@@ -22,6 +22,8 @@
 #include <de/ProgressWidget>
 #include <de/GLTexture>
 
+class GameWidget;
+
 /**
  * Widget that takes care of the UI while busy mode is active.
  */
@@ -32,13 +34,15 @@ class BusyWidget : public de::GuiWidget
 
     de::ProgressWidget &progress();
 
+    void setGameWidget(GameWidget &gameWidget);
+
     void renderTransitionFrame();
     void releaseTransitionFrame();
     void clearTransitionFrameToBlack();
     de::GLTexture const *transitionFrame() const;
 
     // Events.
-    void viewResized();
+    //void viewResized();
     void update();
     void drawContent();
     bool handleEvent(de::Event const &event);

diff --git a/doomsday/apps/client/include/ui/widgets/gamewidget.h b/doomsday/apps/client/include/ui/widgets/gamewidget.h
@@ -46,6 +46,8 @@ class GameWidget : public de::GuiWidget
      */
     void pause();
 
+    void drawComposited();
+
     // Events.
     void viewResized() override;
     void update() override;

diff --git a/doomsday/apps/client/src/ui/busyvisual.cpp b/doomsday/apps/client/src/ui/busyvisual.cpp
@@ -151,8 +151,6 @@ static void sampleDoomWipe(void)
 
 void Con_DrawTransition(void)
 {
-    return; // TODO: re-enable with copied GameWidget FBO contents
-
     if (isDedicated) return;
     if (!Con_TransitionInProgress()) return;
 

diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -226,6 +226,7 @@ DENG2_PIMPL(ClientWindow)
 
         // Busy widget shows progress indicator and frozen game content.
         busy = new BusyWidget;
+        busy->setGameWidget(*game);
         busy->hide(); // normally hidden
         busy->rule().setRect(root.viewRule());
         root.add(busy);
@@ -1024,6 +1025,7 @@ void ClientWindow::grab(image_t &img, bool halfSized) const
     DENG_ASSERT(img.pixelSize != 0);
 }
 
+/*
 void ClientWindow::drawGameContent()
 {
     DENG_ASSERT_IN_MAIN_THREAD();
@@ -1033,6 +1035,7 @@ void ClientWindow::drawGameContent()
 
     d->root.drawUntil(*d->home);
 }
+*/
 
 void ClientWindow::fadeInTaskBarBlur(TimeDelta span)
 {

diff --git a/doomsday/apps/client/src/ui/widgets/busywidget.cpp b/doomsday/apps/client/src/ui/widgets/busywidget.cpp
@@ -39,6 +39,7 @@ DENG_GUI_PIMPL(BusyWidget)
     typedef DefaultVertexBuf VertexBuf;
 
     ProgressWidget *progress;
+    GameWidget *gameWidget = nullptr;
     Time frameDrawnAt;
     GLTextureFramebuffer transitionFrame;
     Drawable drawable;
@@ -93,11 +94,16 @@ ProgressWidget &BusyWidget::progress()
     return *d->progress;
 }
 
-void BusyWidget::viewResized()
+void BusyWidget::setGameWidget(GameWidget &gameWidget)
 {
-    GuiWidget::viewResized();
+    d->gameWidget = &gameWidget;
 }
 
+/*void BusyWidget::viewResized()
+{
+    GuiWidget::viewResized();
+}*/
+
 void BusyWidget::update()
 {
     GuiWidget::update();
@@ -134,8 +140,6 @@ void BusyWidget::drawContent()
 
     if (d->haveTransitionFrame())
     {
-        //glDisable(GL_ALPHA_TEST); /// @todo get rid of these
-        //glDisable(GL_BLEND);
         GLState::push()
                 .setAlphaTest(false)
                 .setBlend(false)
@@ -150,9 +154,6 @@ void BusyWidget::drawContent()
         d->drawable.draw();
 
         GLState::pop().apply();
-
-        //glEnable(GL_ALPHA_TEST);
-        //glEnable(GL_BLEND);
         glDisable(GL_TEXTURE_2D);
     }
 }
@@ -179,13 +180,14 @@ void BusyWidget::renderTransitionFrame()
 
     DENG_ASSERT_IN_MAIN_THREAD();
     DENG_ASSERT_GL_CONTEXT_ACTIVE();
+    DENG2_ASSERT(d->gameWidget);
 
-    Rectanglei grabRect = Rectanglei::fromSize(root().window().pixelSize());
+    Rectanglei grabRect = Rectanglei::fromSize(rule().recti().size());
 
     LOGDEV_GL_VERBOSE("Rendering transition frame, size %s pixels") << grabRect.size().asText();
 
+#if 1
     /// @todo This breaks Qt's QOpenGLWidget FBO for some reason!
-#if 0
     d->transitionFrame.resize(grabRect.size());
     if (!d->transitionFrame.isReady())
     {
@@ -197,7 +199,9 @@ void BusyWidget::renderTransitionFrame()
             .setViewport(Rectangleui::fromSize(d->transitionFrame.size()))
             .apply();
 
-    root().window().as<ClientWindow>().drawGameContent();
+    d->gameWidget->drawComposited();
+
+    //root().window().as<ClientWindow>().drawGameContent();
 
     GLState::pop().apply();
 

diff --git a/doomsday/apps/client/src/ui/widgets/gamewidget.cpp b/doomsday/apps/client/src/ui/widgets/gamewidget.cpp
@@ -91,7 +91,7 @@ DENG2_PIMPL(GameWidget)
      * border, HUD, finale, intermission, and engine/debug overlays. This is generally
      * a quick operation and can be done multiple times per window paint.
      */
-    void drawCompositedFrames()
+    void drawComposited()
     {
         int numLocal = 0;
         ClientApp::forLocalPlayers([this, &numLocal] (ClientPlayer &player)
@@ -135,7 +135,7 @@ DENG2_PIMPL(GameWidget)
             needFrames = false;
         }
 
-        drawCompositedFrames();
+        drawComposited();
     }
 
     void updateSize()
@@ -177,6 +177,11 @@ void GameWidget::pause()
     }
 }
 
+void GameWidget::drawComposited()
+{
+    d->drawComposited();
+}
+
 void GameWidget::viewResized()
 {
     GuiWidget::viewResized();