UI|Client: After startup busy mode, do a fade from black

skyjake · Aug 24, 2015 · f368661 · f368661
1 parent c42cc6f
commit f368661
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/doomsday/apps/client/include/ui/clientwindow.h b/doomsday/apps/client/include/ui/clientwindow.h
@@ -24,6 +24,7 @@
 #include <de/PersistentCanvasWindow>
 #include <de/BaseWindow>
 #include <de/NotificationAreaWidget>
+#include <de/FadeToBlackWidget>
 
 #include "ui/clientrootwidget.h"
 #include "resource/image.h"
@@ -150,6 +151,9 @@ class ClientWindow : public de::BaseWindow,
      */
     void drawGameContent();
 
+    void fadeContentFromBlack(de::TimeDelta const &duration);
+    de::FadeToBlackWidget *contentFade();
+
     void fadeInTaskBarBlur(de::TimeDelta span);
     void fadeOutTaskBarBlur(de::TimeDelta span);
 

diff --git a/doomsday/apps/client/src/busyrunner.cpp b/doomsday/apps/client/src/busyrunner.cpp
@@ -61,6 +61,7 @@ DENG2_PIMPL_NOREF(BusyRunner)
     timespan_t  busyTime = 0;
     bool        busyWillAnimateTransition = false;
     bool        busyWasIgnoringInput = false;
+    bool        fadeFromBlack = false;
 
     Instance()
     {
@@ -80,13 +81,19 @@ DENG2_PIMPL_NOREF(BusyRunner)
 
     void busyModeWillBegin(BusyTask &firstTask)
     {
+        if(auto *fader = ClientWindow::main().contentFade())
+        {
+            fader->cancel();
+        }
+
         // Are we doing a transition effect?
         busyWillAnimateTransition = animatedTransitionActive(firstTask.mode);
         if(busyWillAnimateTransition)
         {
             Con_TransitionConfigure();
         }
 
+        fadeFromBlack        = (firstTask.mode & BUSYF_STARTUP) != 0;
         busyWasIgnoringInput = ClientApp::inputSystem().ignoreEvents();
 
         // Limit frame rate to 60, no point pushing it any faster while busy.
@@ -136,6 +143,11 @@ DENG2_PIMPL_NOREF(BusyRunner)
         busyThread = nullptr;
 
         eventLoop->exit(result);
+
+        if(fadeFromBlack)
+        {
+            ClientWindow::main().fadeContentFromBlack(2);
+        }
     }
 };
 

diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -37,8 +37,10 @@
 #include <de/Drawable>
 #include <de/CompositorWidget>
 #include <de/NotificationAreaWidget>
+#include <de/FadeToBlackWidget>
 #include <de/SignalAction>
 #include <de/VRWindowTransform>
+#include <de/GuiWidgetRef>
 #include <de/concurrency.h>
 #include <doomsday/console/exec.h>
 #include "api_console.h"
@@ -96,8 +98,9 @@ DENG2_PIMPL(ClientWindow)
     LabelWidget *background = nullptr;
     GuiWidget *iwadNotice = nullptr;
     GameSelectionWidget *gameSelMenu = nullptr;
+    GuiWidgetRef<FadeToBlackWidget> fader;
     BusyWidget *busy = nullptr;
-    GuiWidget *sidebar = nullptr;    
+    GuiWidget *sidebar = nullptr;
     PrivilegedLogWidget *privLog = nullptr;
     LabelWidget *cursor = nullptr;
     ConstantRule *cursorX;
@@ -824,6 +827,27 @@ DENG2_PIMPL(ClientWindow)
             cursorHasBeenHidden = false;
         }
     }
+
+    void setupFadeFromBlack(TimeDelta const &span)
+    {
+        if(!fader)
+        {
+            fader.reset(new FadeToBlackWidget);
+            fader->rule().setRect(root.viewRule());
+            root.add(fader); // on top of everything else
+        }
+        fader->initFadeFromBlack(span);
+        fader->start();
+    }
+
+    void completeFade()
+    {
+        // Check if the fade is done.
+        if(fader)
+        {
+            fader->disposeIfDone();
+        }
+    }
 };
 
 ClientWindow::ClientWindow(String const &id)
@@ -999,6 +1023,7 @@ void ClientWindow::postDraw()
 
     ClientApp::app().postFrame(); /// @todo what about multiwindow?
     d->updateFpsNotification(frameRate());
+    d->completeFade();
 }
 
 void ClientWindow::canvasGLResized(Canvas &canvas)
@@ -1214,6 +1239,16 @@ bool ClientWindow::handleFallbackEvent(Event const &event)
     return d->handleFallbackEvent(event);
 }
 
+void ClientWindow::fadeContentFromBlack(TimeDelta const &duration)
+{
+    d->setupFadeFromBlack(duration);
+}
+
+FadeToBlackWidget *ClientWindow::contentFade()
+{
+    return d->fader;
+}
+
 #if defined(UNIX) && !defined(MACOSX)
 void GL_AssertContextActive()
 {