Bump GL back to 1.5; rework movie player to not hijack application loop

edge-classic · Nov 4, 2024 · 811316d · 811316d
1 parent 2903498
commit 811316d
Show file tree

Hide file tree

Showing 25 changed files with 360 additions and 901 deletions.
diff --git a/libraries/glad/include/glad/glad.h b/libraries/glad/include/glad/glad.h
diff --git a/libraries/glad/src/glad.c b/libraries/glad/src/glad.c
diff --git a/source_files/edge/con_con.cc b/source_files/edge/con_con.cc
@@ -43,6 +43,7 @@
 #include "hu_stuff.h"
 #include "hu_style.h"
 #include "i_defs_gl.h"
+#include "i_movie.h"
 #include "i_system.h"
 #include "m_argv.h"
 #include "n_network.h"
@@ -1536,6 +1537,9 @@ bool ConsoleResponder(InputEvent *ev)
 
 void ConsoleTicker(void)
 {
+    if (playing_movie)
+        return;
+
     console_cursor = (console_cursor + 1) & 31;
 
     if (console_visible != kConsoleVisibilityNotVisible)

diff --git a/source_files/edge/dm_defs.h b/source_files/edge/dm_defs.h
@@ -40,7 +40,7 @@ enum GameState
     kGameStateTitleScreen,
     kGameStateLevel,
     kGameStateIntermission,
-    kGameStateFinale,
+    kGameStateFinale
 };
 
 //

diff --git a/source_files/edge/e_input.cc b/source_files/edge/e_input.cc
@@ -39,6 +39,7 @@
 #include "epi_sdl.h"
 #include "epi_str_util.h"
 #include "hu_stuff.h"
+#include "i_movie.h"
 #include "m_math.h"
 #include "m_misc.h"
 #include "r_misc.h"
@@ -682,6 +683,9 @@ void ProcessInputEvents(void)
     {
         ev = &events[event_tail];
 
+        if (MovieResponder(ev))
+            continue;
+
         if (ConsoleResponder(ev))
             continue;      // Console ate the event
 

diff --git a/source_files/edge/e_main.cc b/source_files/edge/e_main.cc
@@ -605,73 +605,79 @@ void EdgeDisplay(void)
 
     HUDFrameSetup();
 
-    switch (game_state)
+    if (!playing_movie)
     {
-    case kGameStateLevel:
-        PaletteTicker();
+        switch (game_state)
+        {
+        case kGameStateLevel:
+            PaletteTicker();
 
-        if (LuaUseLuaHUD())
-            LuaRunHUD();
-        else
-            COALRunHUD();
+            if (LuaUseLuaHUD())
+                LuaRunHUD();
+            else
+                COALRunHUD();
 
-        if (need_save_screenshot)
-        {
-            CreateSaveScreenshot();
-            need_save_screenshot = false;
-        }
+            if (need_save_screenshot)
+            {
+                CreateSaveScreenshot();
+                need_save_screenshot = false;
+            }
 
-        HUDDrawer();
-        ScriptDrawer();
-        break;
+            HUDDrawer();
+            ScriptDrawer();
+            break;
 
-    case kGameStateIntermission:
-        IntermissionDrawer();
-        break;
+        case kGameStateIntermission:
+            IntermissionDrawer();
+            break;
 
-    case kGameStateFinale:
-        FinaleDrawer();
-        break;
+        case kGameStateFinale:
+            FinaleDrawer();
+            break;
 
-    case kGameStateTitleScreen:
-        TitleDrawer();
-        break;
+        case kGameStateTitleScreen:
+            TitleDrawer();
+            break;
 
-    case kGameStateNothing:
-        break;
-    }
+        case kGameStateNothing:
+            break;
+        }
 
-    if (wipe_gl_active)
-    {
-        // -AJA- Wipe code for GL.  Sorry for all this ugliness, but it just
-        //       didn't fit into the existing wipe framework.
-        //
-        if (DoWipe())
+        if (wipe_gl_active)
         {
-            StopWipe();
-            wipe_gl_active = false;
+            // -AJA- Wipe code for GL.  Sorry for all this ugliness, but it just
+            //       didn't fit into the existing wipe framework.
+            //
+            if (DoWipe())
+            {
+                StopWipe();
+                wipe_gl_active = false;
+            }
         }
-    }
 
-    // save the current screen if about to wipe
-    if (need_wipe)
-    {
-        need_wipe      = false;
-        wipe_gl_active = true;
+        // save the current screen if about to wipe
+        if (need_wipe)
+        {
+            need_wipe      = false;
+            wipe_gl_active = true;
 
-        InitializeWipe(wipe_method);
-    }
+            InitializeWipe(wipe_method);
+        }
 
-    if (paused)
-        DisplayPauseImage();
+        if (paused)
+            DisplayPauseImage();
 
-    // menus go directly to the screen
-    MenuDrawer(); // menu is drawn even on top of everything (except console)
+        // menus go directly to the screen
+        MenuDrawer(); // menu is drawn even on top of everything (except console)
+    }
+    else
+        MovieDrawer();
 
     // process mouse and keyboard events
     NetworkUpdate();
 
-    ConsoleDrawer();
+    if (!playing_movie)
+        ConsoleDrawer();
 
     if (!hud_overlays.at(video_overlay.d_).empty())
     {
@@ -2447,6 +2453,7 @@ void EdgeTicker(void)
         GameTicker();
 
         // user interface stuff (skull anim, etc)
+        MovieTicker();
         ConsoleTicker();
         MenuTicker();
         SoundTicker();

diff --git a/source_files/edge/g_game.cc b/source_files/edge/g_game.cc
@@ -42,6 +42,7 @@
 #include "epi_str_util.h"
 #include "f_finale.h"
 #include "f_interm.h"
+#include "i_movie.h"
 #include "i_system.h"
 #include "m_cheat.h"
 #include "m_menu.h"
@@ -417,6 +418,9 @@ static void CheckPlayersReborn(void)
 
 void DoBigGameStuff(void)
 {
+    if (playing_movie)
+        return;
+
     // do things to change the game state
     while (game_action != kGameActionNothing)
     {
@@ -466,6 +470,9 @@ void DoBigGameStuff(void)
 
 void GameTicker(void)
 {
+    if (playing_movie)
+        return;
+
     // ANIMATE FLATS AND TEXTURES GLOBALLY
     AnimationTicker();