Skip to content

Commit

Permalink
MiniMap: Fix useNormalizedCoords DualScreenMode (#541)
Browse files Browse the repository at this point in the history
* MiniMap: Fix useNormalizedCoords DualScreenMode

This changes render behaviour of CMiniMap::RenderCachedTexture to match
CMiniMap::DrawForReal.
  • Loading branch information
esainane committed Aug 25, 2020
1 parent d3c0012 commit f775ea1
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions rts/Game/UI/MiniMap.cpp
Expand Up @@ -1448,7 +1448,12 @@ bool CMiniMap::RenderCachedTexture(bool useNormalizedCoors)

if (useNormalizedCoors) {
glPushMatrix();
glTranslatef(curPos.x * globalRendering->pixelX, curPos.y * globalRendering->pixelY, 0.0f);

if (globalRendering->dualScreenMode)
glViewport(curPos.x, curPos.y, curDim.x, curDim.y);
else
glTranslatef(curPos.x * globalRendering->pixelX, curPos.y * globalRendering->pixelY, 0.0f);

glScalef(curDim.x * globalRendering->pixelX, curDim.y * globalRendering->pixelY, 1.0f);
}

Expand All @@ -1465,8 +1470,12 @@ bool CMiniMap::RenderCachedTexture(bool useNormalizedCoors)

DrawCameraFrustumAndMouseSelection();

if (useNormalizedCoors)
if (useNormalizedCoors) {
if (globalRendering->dualScreenMode)
glViewport(globalRendering->viewPosX, 0, globalRendering->viewSizeX, globalRendering->viewSizeY);

glPopMatrix();
}

glDisable(GL_TEXTURE_2D);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
Expand Down

0 comments on commit f775ea1

Please sign in to comment.