Client|UI|GL: Player view rendered in final size (all scaling factore…

…d in)

Rather than using a viewport to restrict the game view to a smaller
section of the framebuffer, the player view is now rendered into an
appropriately sized texture. The layer composition then positions
the view texture as needed considering the view window scaling.

doomsday/apps/client/include/render/viewports.h

@@ -136,6 +136,13 @@ void R_UseViewPort(viewport_t const *vp);
 
 void R_UseViewPort(int consoleNum);
 
+/**
+ * Determines the location of the viewport of a player.
+ * @param console  Player number.
+ * @return View rectangle in UI coordinates.
+ */
+de::Rectanglei R_ConsoleViewRect(int console);
+
 void R_UpdateViewer(int consoleNum);
 
 void R_ResetViewer();

doomsday/apps/client/src/gl/gl_main.cpp

@@ -424,13 +424,16 @@ void GL_SwitchTo3DState(dd_bool pushState, viewport_t const *port, viewdata_t co
 
     std::memcpy(&currentView, port, sizeof(currentView));
 
-    viewpx = port->geometry.topLeft.x + viewData->window.topLeft.x;
-    viewpy = port->geometry.topLeft.y + viewData->window.topLeft.y;
+    //viewpx = port->geometry.topLeft.x + viewData->window.topLeft.x;
+    //viewpy = port->geometry.topLeft.y + viewData->window.topLeft.y;
+
+    viewpx = 0;
+    viewpy = 0;
     viewpw = de::min(port->geometry.width(), viewData->window.width());
     viewph = de::min(port->geometry.height(), viewData->window.height());
 
-    ClientWindow::main().game().glApplyViewport(Rectanglei::fromSize(Vector2i(viewpx, viewpy),
-                                                                     Vector2ui(viewpw, viewph)));
+    /*ClientWindow::main().game().glApplyViewport(Rectanglei::fromSize(Vector2i(viewpx, viewpy),
+                                                                     Vector2ui(viewpw, viewph)));*/
 
     // The 3D projection matrix.
     GL_ProjectionMatrix();
@@ -496,7 +499,7 @@ void GL_Restore2DState(dint step, viewport_t const *port, viewdata_t const *view
         break; }
 
     case 2: // After Restore Step 2 we're back in 2D rendering mode.
-        ClientWindow::main().game().glApplyViewport(currentView.geometry);
+        //ClientWindow::main().game().glApplyViewport(currentView.geometry);
         LIBGUI_GL.glMatrixMode(GL_PROJECTION);
         LIBGUI_GL.glPopMatrix();
         LIBGUI_GL.glMatrixMode(GL_MODELVIEW);

doomsday/apps/client/src/render/viewports.cpp

@@ -713,6 +713,33 @@ void R_UseViewPort(viewport_t const *vp)
     }
 }
 
+void R_UseViewPort(int consoleNum)
+{
+    int local = P_ConsoleToLocal(consoleNum);
+    if (local >= 0)
+    {
+        R_UseViewPort(&viewportOfLocalPlayer[local]);
+    }
+    else
+    {
+        R_UseViewPort(nullptr);
+    }
+}
+
+Rectanglei R_ConsoleViewRect(int console)
+{
+    int local = P_ConsoleToLocal(console);
+    if (local < 0) return Rectanglei();
+
+    auto const &pv = DD_Player(console)->viewport();
+    auto const &port = viewportOfLocalPlayer[local];
+
+    return Rectanglei(port.geometry.topLeft.x + pv.window.topLeft.x,
+                      port.geometry.topLeft.y + pv.window.topLeft.y,
+                      de::min(port.geometry.width(),  pv.window.width()),
+                      de::min(port.geometry.height(), pv.window.height()));
+}
+
 viewport_t const *R_CurrentViewPort()
 {
     return currentViewport;
@@ -1493,16 +1520,3 @@ void Viewports_Register()
 
     C_CMD("viewgrid", "ii", ViewGrid);
 }
-
-void R_UseViewPort(int consoleNum)
-{
-    int local = P_ConsoleToLocal(consoleNum);
-    if (local >= 0)
-    {
-        R_UseViewPort(&viewportOfLocalPlayer[local]);
-    }
-    else
-    {
-        R_UseViewPort(nullptr);
-    }
-}

doomsday/apps/client/src/ui/viewcompositor.cpp

@@ -78,13 +78,19 @@ DENG2_PIMPL(ViewCompositor)
 
     GLFramebuffer::Size framebufferSize() const
     {
-        RectRaw geom;
-        R_ViewPortGeometry(playerNum, &geom);
-        GLFramebuffer::Size size { uint(geom.size.width), uint(geom.size.height) };
+        //RectRaw geom;
+        //R_ViewPortGeometry(playerNum, &geom);
+        Rectanglei const playerView = R_ConsoleViewRect(playerNum);
+        GLFramebuffer::Size size = playerView.size();
 
-        // Apply game view scaling.
+        // Game view scaling for vanilla emulation.
+        //viewdata_t const &vd = DD_Player(playerNum)->viewport();
 
-        // Apply pixel density.
+        /*Rectanglei vdWindow(vd.window.topLeft.x, vd.window.topLeft.y,
+                            vd.window.width(), vd.window.height());*/
+        //qDebug() << vdWindow.asText();
+
+        // Pixel density.
         size *= scaleFactor();
 
         return size;
@@ -171,10 +177,12 @@ void ViewCompositor::drawCompositedLayers(Rectanglei const &rect)
             .setDepthTest(false)
             .setCull     (gl::None);
 
+    Rectanglei const playerView = R_ConsoleViewRect(d->playerNum);
+
     // First the game view (using the previously rendered texture).
     d->uFrameTex  = d->viewFramebuf.colorTexture();
     d->uMvpMatrix = ClientWindow::main().root().projMatrix2D() *
-                    Matrix4f::scaleThenTranslate(rect.size(), rect.topLeft);
+                    Matrix4f::scaleThenTranslate(playerView.size(), playerView.topLeft);
     d->frameDrawable.draw();
 
     // View border around the game view.

doomsday/apps/client/src/ui/widgets/gamewidget.cpp

@@ -157,6 +157,7 @@ GameWidget::GameWidget(String const &name)
 
 void GameWidget::glApplyViewport(Rectanglei const &rect)
 {
+    qDebug() << "glApplyViewport:" << rect.asText();
     GLState::current()
             .setNormalizedViewport(normalizedRect(rect))
             .apply();