Changeset 25289

Timestamp:

Apr 18, 2021, 6:23:10 PM (3 years ago)

Author:

Vladislav Belov

Message:

Moves cinematic overlay to GUI.

Differential Revision: ​https://code.wildfiregames.com/D3869

Location:

ps/trunk

Files:

• binaries/data/mods/public/gui/session/session.js (modified) (2 diffs)
• binaries/data/mods/public/gui/session/session.xml (modified) (1 diff)
• source/graphics/CinemaManager.cpp (modified) (3 diffs)
• source/graphics/CinemaManager.h (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gui/session/session.js

@@ -630 +630 @@
     updateTimers();
     Engine.GuiInterfaceCall("ClearRenamedEntities");
+
+
+
+
 }
 
@@ -676 +680 @@
 
     Engine.GetGUIObjectByName("session").hidden = !g_ShowGUI || isPlayingCinemaPath;
+
     Engine.ConfigDB_CreateValue("user", "silhouettes", !isPlayingCinemaPath && Engine.ConfigDB_GetValue("user", "silhouettes") == "true" ? "true" : "false");
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

ps/trunk/binaries/data/mods/public/gui/session/session.xml

@@ -118 +118 @@
 <object name="bandbox" type="image" sprite="bandbox" ghost="true" hidden="true" z="200"/>
 
+
+
+
+
+
+
 </objects>

ps/trunk/source/graphics/CinemaManager.cpp

@@ -1 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -65 +65 @@
 void CCinemaManager::Render() const
 {
-    if (IsEnabled())
-        DrawBars();
-    else if (m_DrawPaths)
+    if (!IsEnabled() && m_DrawPaths)
         DrawPaths();
 }
@@ -184 +182 @@
 }
 
-void CCinemaManager::DrawBars() const
-{
-    int height = (float)g_xres / 2.39f;
-    int shift = (g_yres - height) / 2;
-    if (shift <= 0)
-        return;
-
-#if CONFIG2_GLES
-    #warning TODO : implement bars for GLES
-#else
-    // Set up transform for GL bars
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-    CMatrix3D transform;
-    transform.SetOrtho(0.f, (float)g_xres, 0.f, (float)g_yres, -1.f, 1000.f);
-    glLoadMatrixf(&transform._11);
-
-    glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
-
-    glEnable(GL_BLEND);
-    glDisable(GL_DEPTH_TEST);
-
-    glBegin(GL_QUADS);
-    glVertex2i(0, 0);
-    glVertex2i(g_xres, 0);
-    glVertex2i(g_xres, shift);
-    glVertex2i(0, shift);
-    glEnd();
-
-    glBegin(GL_QUADS);
-    glVertex2i(0, g_yres - shift);
-    glVertex2i(g_xres, g_yres - shift);
-    glVertex2i(g_xres, g_yres);
-    glVertex2i(0, g_yres);
-    glEnd();
-
-    glDisable(GL_BLEND);
-    glEnable(GL_DEPTH_TEST);
-
-    // Restore transform
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-#endif
-}
-
 bool CCinemaManager::IsEnabled() const
 {

ps/trunk/source/graphics/CinemaManager.h

@@ -1 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -38 +38 @@
      */
     void Render() const;
-    void DrawBars() const;
     void DrawPaths() const;
     void DrawSpline(const RNSpline& spline, const CColor& splineColor, int smoothness, bool lines) const;