Client: Disable old Bloom filter with Gloom

Gloom has its own HDR bloom pass.
skyjake · Feb 14, 2020 · 8ef666f · 8ef666f
1 parent 8d78762
commit 8ef666f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/doomsday/apps/client/include/clientapp.h b/doomsday/apps/client/include/clientapp.h
@@ -106,6 +106,7 @@ class ClientApp : public de::BaseGuiApp, public DoomsdayApp
     static bool hasInput();
     static bool hasRender();
     static bool hasAudio();
+    static bool hasClassicWorld();
 
 #if defined (DE_HAVE_UPDATER)
     static Updater &updater();

diff --git a/doomsday/apps/client/src/clientapp.cpp b/doomsday/apps/client/src/clientapp.cpp
@@ -1045,6 +1045,11 @@ bool ClientApp::hasAudio()
     return ClientApp::app().d->audioSys != nullptr;
 }
 
+bool ClientApp::hasClassicWorld()
+{
+    return ClientApp::app().d->classicWorld != nullptr;
+}
+
 ClientResources &ClientApp::resources()
 {
     ClientApp &a = ClientApp::app();

diff --git a/doomsday/apps/client/src/render/cameralensfx.cpp b/doomsday/apps/client/src/render/cameralensfx.cpp
@@ -62,17 +62,21 @@ using namespace de;
 
 static int fxFramePlayerNum; ///< Player view currently being drawn.
 
-#define IDX_LENS_FLARES         2
+//#define IDX_LENS_FLARES         2
 
 void LensFx_Init()
 {
     for (int i = 0; i < DDMAXPLAYERS; ++i)
     {
         ConsoleEffectStack &stack = DD_Player(i)->fxStack();
-        stack.effects
-                << new fx::Bloom(i)
-                << new fx::Vignette(i)
-                << new fx::LensFlares(i)        // IDX_LENS_FLARES
+
+        if (ClientApp::hasClassicWorld()) // Gloom does its own HDR bloom.
+        {
+            stack.effects << new fx::Bloom(i);
+        }
+
+        stack.effects << new fx::Vignette(i)
+//                << new fx::LensFlares(i)        // IDX_LENS_FLARES
                 << new fx::ColorFilter(i)
                 << new fx::Ramp(i);
     }
@@ -140,18 +144,20 @@ void LensFx_Draw(int playerNum)
         effect->draw();
     }
 
-    for (int i = effects.size() - 1; i >= 0; --i)
+    for (int i = effects.sizei() - 1; i >= 0; --i)
     {
         effects.at(i)->endFrame();
     }
 
     GLState::pop();
 }
 
-void LensFx_MarkLightVisibleInFrame(const IPointLightSource &lightSource)
+void LensFx_MarkLightVisibleInFrame(const IPointLightSource &/*lightSource*/)
 {
+    /*
     const auto &effects = DD_Player(fxFramePlayerNum)->fxStack().effects;
 
     static_cast<fx::LensFlares *>(effects.at(IDX_LENS_FLARES))->
             markLightPotentiallyVisibleForCurrentFrame(&lightSource);
+    */
 }
diff --git a/doomsday/apps/client/src/render/fx/vignette.cpp b/doomsday/apps/client/src/render/fx/vignette.cpp
@@ -104,14 +104,12 @@ Vignette::Vignette(int console) : ConsoleEffect(console)
 
 void Vignette::draw()
 {
-    if (!ClientApp::world().hasMap())
+    if (ClientApp::world().hasMap())
     {
-        return;
-    }
-
-    /// @todo Field of view should be console-specific.
+        /// @todo Field of view should be console-specific.
 
-    Vignette_Render(viewRect(), Rend_FieldOfView());
+        Vignette_Render(viewRect(), Rend_FieldOfView());
+    }
 }
 
 void Vignette::consoleRegister()

diff --git a/doomsday/apps/client/src/render/rendersystem.cpp b/doomsday/apps/client/src/render/rendersystem.cpp
@@ -238,7 +238,7 @@ DE_PIMPL(RenderSystem)
 
         // Load the required packages.
         pkgLoader.load("net.dengine.client.renderer");
-        pkgLoader.load("net.dengine.client.renderer.lensflares");
+//        pkgLoader.load("net.dengine.client.renderer.lensflares");
         pkgLoader.load("net.dengine.gloom");
 
         loadImages();

diff --git a/doomsday/libs/gloom/src/world.cpp b/doomsday/libs/gloom/src/world.cpp
@@ -393,6 +393,7 @@ void World::render(const ICamera &camera)
 
     if (d->renderContext.uDebugMode.toInt() != 0)
     {
+        d->debugQuad.state().setTarget(GLState::current().target());
         d->debugQuad.render();
     }