-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor|UI|Client: Split GameUIWidget from GameWidget
The new widget handles the drawing of all overlaid UI elements visible on top of the game's 3D world.
- Loading branch information
Showing
7 changed files
with
185 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** @file gameuiwidget.h Widget for legacy game UI elements. | ||
| * | ||
| * @authors Copyright (c) 2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * <small>This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. This program is distributed in the hope that it | ||
| * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
| * Public License for more details. You should have received a copy of the GNU | ||
| * General Public License along with this program; if not, see: | ||
| * http://www.gnu.org/licenses</small> | ||
| */ | ||
|
|
||
| #ifndef DENG_CLIENT_GAMEUIWIDGET_H | ||
| #define DENG_CLIENT_GAMEUIWIDGET_H | ||
|
|
||
| #include "GuiWidget" | ||
|
|
||
| /** | ||
| * Widget that encapsulates game-side UI elements. | ||
| */ | ||
| class GameUIWidget : public GuiWidget | ||
| { | ||
| public: | ||
| GameUIWidget(); | ||
|
|
||
| void draw(); | ||
|
|
||
| private: | ||
| DENG2_PRIVATE(d) | ||
| }; | ||
|
|
||
| #endif // DENG_CLIENT_GAMEUIWIDGET_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /** @file gameuiwidget.cpp Widget for legacy game UI elements. | ||
| * | ||
| * @authors Copyright (c) 2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * <small>This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. This program is distributed in the hope that it | ||
| * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
| * Public License for more details. You should have received a copy of the GNU | ||
| * General Public License along with this program; if not, see: | ||
| * http://www.gnu.org/licenses</small> | ||
| */ | ||
|
|
||
| #include "ui/widgets/gameuiwidget.h" | ||
|
|
||
| #include "de_base.h" | ||
| #include "de_console.h" | ||
| #include "de_ui.h" | ||
| #include "de_render.h" | ||
| #include "audio/s_main.h" | ||
|
|
||
| #include "gl/gl_main.h" | ||
| #include "edit_bias.h" | ||
| #include "ui/busyvisual.h" | ||
|
|
||
| #include <de/GLState> | ||
|
|
||
| using namespace de; | ||
|
|
||
| DENG2_PIMPL(GameUIWidget) | ||
| { | ||
| Instance(Public *i) : Base(i) | ||
| {} | ||
|
|
||
| void draw() | ||
| { | ||
| if(!App_GameLoaded() && titleFinale == 0) | ||
| { | ||
| // Title finale is not playing. Lets do it manually. | ||
| glMatrixMode(GL_PROJECTION); | ||
| glPushMatrix(); | ||
| glLoadIdentity(); | ||
| glOrtho(0, SCREENWIDTH, SCREENHEIGHT, 0, -1, 1); | ||
|
|
||
| R_RenderBlankView(); | ||
|
|
||
| glMatrixMode(GL_PROJECTION); | ||
| glPopMatrix(); | ||
| } | ||
|
|
||
| if(!(UI_IsActive() && UI_Alpha() >= 1.0)) | ||
| { | ||
| UI2_Drawer(); | ||
|
|
||
| // Draw any full window game graphics. | ||
| if(App_GameLoaded() && gx.DrawWindow) | ||
| { | ||
| Size2Raw dimensions(DENG_GAMEVIEW_WIDTH, DENG_GAMEVIEW_HEIGHT); | ||
| gx.DrawWindow(&dimensions); | ||
| } | ||
| } | ||
|
|
||
| /// @todo Transition must be done at window level to work correctly. | ||
| if(Con_TransitionInProgress()) | ||
| Con_DrawTransition(); | ||
|
|
||
| // Draw the widgets of the Shadow Bias Editor (if active). | ||
| SBE_DrawGui(); | ||
|
|
||
| /* | ||
| * Draw debug information. | ||
| */ | ||
| if(App_World().hasMap() && App_World().map().hasLightGrid()) | ||
| { | ||
| App_World().map().lightGrid().drawDebugVisual(); | ||
| } | ||
| Net_Drawer(); | ||
| S_Drawer(); | ||
|
|
||
| if(UI_IsActive()) | ||
| { | ||
| // Draw user interface. | ||
| UI_Drawer(); | ||
| } | ||
|
|
||
| DGL_End(); | ||
| } | ||
| }; | ||
|
|
||
| GameUIWidget::GameUIWidget() : GuiWidget("game_ui"), d(new Instance(this)) | ||
| {} | ||
|
|
||
| void GameUIWidget::draw() | ||
| { | ||
| if(isDisabled() || !GL_IsFullyInited()) | ||
| return; | ||
|
|
||
| GLState::push(); | ||
|
|
||
| /* | ||
| Rectanglei pos; | ||
| if(hasChangedPlace(pos)) | ||
| { | ||
| // Automatically update if the widget is resized. | ||
| d->updateSize(); | ||
| }*/ | ||
|
|
||
| d->draw(); | ||
|
|
||
| GLState::considerNativeStateUndefined(); | ||
| GLState::pop(); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters