Skip to content

Commit

Permalink
UI|Client: Drawing the game UI in the GameUIWidget
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Nov 4, 2013
1 parent 7f66d94 commit a0aaa4c
Showing 1 changed file with 23 additions and 18 deletions.
41 changes: 23 additions & 18 deletions doomsday/client/src/ui/widgets/gameuiwidget.cpp
Expand Up @@ -39,29 +39,34 @@ DENG2_PIMPL(GameUIWidget)

void draw()
{
if(!App_GameLoaded() && titleFinale == 0)
if(App_GameLoaded())
{
// Title finale is not playing. Lets do it manually.
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glOrtho(0, SCREENWIDTH, SCREENHEIGHT, 0, -1, 1);

R_RenderBlankView();
/*
if(titleFinale == 0)
{
// Title animation is not playing. Lets do it manually.
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glOrtho(0, SCREENWIDTH, SCREENHEIGHT, 0, -1, 1);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
}
R_RenderBlankView();
if(!(UI_IsActive() && UI_Alpha() >= 1.0))
{
UI2_Drawer();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
}
*/

// Draw any full window game graphics.
if(App_GameLoaded() && gx.DrawWindow)
if(!(UI_IsActive() && UI_Alpha() >= 1.0))
{
Size2Raw dimensions(DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT);
gx.DrawWindow(&dimensions);
UI2_Drawer();

// Draw any full window game graphics.
if(gx.DrawWindow)
{
Size2Raw dimensions(DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT);
gx.DrawWindow(&dimensions);
}
}
}

Expand Down

0 comments on commit a0aaa4c

Please sign in to comment.