Fixed|PostFX: Clear view effects when needed

The PostFX shader was not being reset when a game was unloaded, or when a savegame was loaded. The public GL API was bumped with a new function for reseting all view effects (color filter, post-processing shader, full bright flag). IssueID #2004
skyjake · Mar 28, 2015 · 517cd8b · 517cd8b
1 parent 9ea6960
commit 517cd8b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 7 deletions.
diff --git a/doomsday/apps/api/api_gl.h b/doomsday/apps/api/api_gl.h
@@ -338,6 +338,11 @@ DENG_API_TYPEDEF(GL)
     void (*ConfigureBorderedProjection)(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode);
     void (*BeginBorderedProjection)(dgl_borderedprojectionstate_t* bp);
     void (*EndBorderedProjection)(dgl_borderedprojectionstate_t* bp);
+
+    /**
+     * Disable the color filter and clear PostFX (for consoleplayer).
+     */
+    void (*ResetViewEffects)();
 }
 DENG_API_T(GL);
 
@@ -415,6 +420,7 @@ DENG_API_T(GL);
 #define GL_ConfigureBorderedProjection  _api_GL.ConfigureBorderedProjection
 #define GL_BeginBorderedProjection  _api_GL.BeginBorderedProjection
 #define GL_EndBorderedProjection    _api_GL.EndBorderedProjection
+#define GL_ResetViewEffects         _api_GL.ResetViewEffects
 #endif
 
 #if defined __DOOMSDAY__ && defined __CLIENT__

diff --git a/doomsday/apps/api/apis.h b/doomsday/apps/api/apis.h
@@ -100,7 +100,8 @@ enum {
 
     DE_API_GL_v1                = 800,     // 1.10
     DE_API_GL_v2                = 801,     // 1.13
-    DE_API_GL                   = DE_API_GL_v2,
+    DE_API_GL_v3                = 802,     // 1.15
+    DE_API_GL                   = DE_API_GL_v3,
 
     DE_API_INFINE_v1            = 900,     // 1.10
     DE_API_INFINE               = DE_API_INFINE_v1,

diff --git a/doomsday/apps/client/src/client/cl_main.cpp b/doomsday/apps/client/src/client/cl_main.cpp
@@ -108,8 +108,7 @@ void Cl_CleanUp()
     Cl_ResetTransTables();
 
     // Reset any view effects.
-    GL_SetFilter(false);
-    Con_Executef(CMDS_DDAY, true, "postfx %i none", consolePlayer);
+    GL_ResetViewEffects();
 
     // Forget all packets we've received but haven't yet handled.
     N_ClearMessages();

diff --git a/doomsday/apps/client/src/dd_main.cpp b/doomsday/apps/client/src/dd_main.cpp
@@ -1487,7 +1487,7 @@ bool App_ChangeGame(Game &game, bool allowReload)
         Rend_ParticleLoadSystemTextures();
     }
 
-    GL_SetFilter(false);
+    GL_ResetViewEffects();
 
     if(!game.isNull())
     {

diff --git a/doomsday/apps/client/src/gl/dgl_common.cpp b/doomsday/apps/client/src/gl/dgl_common.cpp
@@ -929,6 +929,7 @@ DENG_EXTERN_C void GL_ConfigureBorderedProjection2(dgl_borderedprojectionstate_t
 DENG_EXTERN_C void GL_ConfigureBorderedProjection(dgl_borderedprojectionstate_t* bp, int flags, int width, int height, int availWidth, int availHeight, scalemode_t overrideMode);
 DENG_EXTERN_C void GL_BeginBorderedProjection(dgl_borderedprojectionstate_t* bp);
 DENG_EXTERN_C void GL_EndBorderedProjection(dgl_borderedprojectionstate_t* bp);
+DENG_EXTERN_C void GL_ResetViewEffects();
 
 DENG_DECLARE_API(GL) =
 {
@@ -1005,5 +1006,6 @@ DENG_DECLARE_API(GL) =
     GL_ConfigureBorderedProjection2,
     GL_ConfigureBorderedProjection,
     GL_BeginBorderedProjection,
-    GL_EndBorderedProjection
+    GL_EndBorderedProjection,
+    GL_ResetViewEffects
 };
diff --git a/doomsday/apps/client/src/gl/gl_draw.cpp b/doomsday/apps/client/src/gl/gl_draw.cpp
@@ -300,6 +300,14 @@ DENG_EXTERN_C void GL_SetFilter(dd_bool enabled)
     drawFilter = CPP_BOOL(enabled);
 }
 
+#undef GL_ResetViewEffects
+DENG_EXTERN_C void GL_ResetViewEffects()
+{
+    GL_SetFilter(false);
+    Con_Executef(CMDS_DDAY, true, "postfx %i none", consolePlayer);
+    DD_SetInteger(DD_FULLBRIGHT, false);
+}
+
 #undef GL_SetFilterColor
 DENG_EXTERN_C void GL_SetFilterColor(float r, float g, float b, float a)
 {

diff --git a/doomsday/apps/plugins/common/src/d_netcl.cpp b/doomsday/apps/plugins/common/src/d_netcl.cpp
@@ -647,7 +647,7 @@ void NetCl_Intermission(reader_s *msg)
             ST_CloseAll(i, true/*fast*/);
         }
 
-        GL_SetFilter(false);
+        GL_ResetViewEffects();
 
 #if __JHEXEN__
         SN_StopAllSequences();

diff --git a/doomsday/apps/plugins/common/src/g_game.cpp b/doomsday/apps/plugins/common/src/g_game.cpp
@@ -1405,7 +1405,7 @@ static void runGameAction()
 
             if(!IS_DEDICATED)
             {
-                GL_SetFilter(false);
+                GL_ResetViewEffects();
             }
 
             // Go to an intermission?
@@ -2358,6 +2358,7 @@ D_CMD(LoadSession)
             if(Hu_IsMessageActive()) return false;
 
             S_LocalSound(SFX_QUICKLOAD_PROMPT, nullptr);
+
             // Compose the confirmation message.
             String const &existingDescription = COMMON_GAMESESSION->savedUserDescription(sslot->saveName());
             AutoStr *msg = Str_Appendf(AutoStr_NewStd(), QLPROMPT,

diff --git a/doomsday/apps/plugins/common/src/gamesession.cpp b/doomsday/apps/plugins/common/src/gamesession.cpp
@@ -29,6 +29,7 @@
 #include <de/game/SavedSession>
 #include <doomsday/defs/episode.h>
 #include "acs/system.h"
+#include "api_gl.h"
 #include "d_netsv.h"
 #include "g_common.h"
 #include "g_game.h"
@@ -1013,9 +1014,15 @@ void GameSession::end()
 {
     if(!hasBegun()) return;
 
+    // Reset state of relevant subsystems.
 #if __JHEXEN__
     Game_ACScriptSystem().reset();
 #endif
+    if(!IS_DEDICATED)
+    {
+        GL_ResetViewEffects();
+    }
+
     Session::removeSaved(internalSavePath);
 
     d->inProgress = false;