zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- moved status bar base class to 'common'.

This commit is contained in:
Christoph Oelckers 2020-10-28 15:02:23 +01:00
parent e6c96bcb75
commit 53a6b9ee59
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -588,6 +588,7 @@ file( GLOB HEADER_FILES
common/utility/*.h common/utility/*.h
common/engine/*.h common/engine/*.h
common/menu/*.h common/menu/*.h
common/statusbar/*.h
common/fonts/*.h common/fonts/*.h
common/objects/*.h common/objects/*.h
common/filesystem/*.h common/filesystem/*.h
@ -905,7 +906,6 @@ set (PCH_SOURCES
g_statusbar/sbarinfo.cpp g_statusbar/sbarinfo.cpp
g_statusbar/sbar_mugshot.cpp g_statusbar/sbar_mugshot.cpp
g_statusbar/shared_sbar.cpp g_statusbar/shared_sbar.cpp
g_statusbar/base_sbar.cpp
rendering/2d/f_wipe.cpp rendering/2d/f_wipe.cpp
rendering/2d/v_blend.cpp rendering/2d/v_blend.cpp
rendering/hwrenderer/hw_entrypoint.cpp rendering/hwrenderer/hw_entrypoint.cpp
@ -1107,6 +1107,7 @@ set (PCH_SOURCES
common/menu/resolutionmenu.cpp common/menu/resolutionmenu.cpp
common/menu/menudef.cpp common/menu/menudef.cpp
common/menu/savegamemanager.cpp common/menu/savegamemanager.cpp
common/statusbar/base_sbar.cpp
common/rendering/v_framebuffer.cpp common/rendering/v_framebuffer.cpp
common/rendering/v_video.cpp common/rendering/v_video.cpp
@ -1245,6 +1246,7 @@ include_directories( .
common/console common/console
common/engine common/engine
common/menu common/menu
common/statusbar
common/fonts common/fonts
common/objects common/objects
common/rendering common/rendering

4
src/common/scripting/interface/vmnatives.cpp
View File

@ -289,7 +289,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(DStatusBarCore, BeginHUD, BeginHUD)
DHUDFont* CreateHudFont(FFont* fnt, int spac, int mono, int sx, int sy) DHUDFont* CreateHudFont(FFont* fnt, int spac, int mono, int sx, int sy)
{ {
return (Create<DHUDFont>(fnt, spac, EMonospacing(mono), sy, sy)); return Create<DHUDFont>(fnt, spac, EMonospacing(mono), sy, sy);
} }
DEFINE_ACTION_FUNCTION_NATIVE(DHUDFont, Create, CreateHudFont) DEFINE_ACTION_FUNCTION_NATIVE(DHUDFont, Create, CreateHudFont)
@ -300,7 +300,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(DHUDFont, Create, CreateHudFont)
PARAM_INT(mono); PARAM_INT(mono);
PARAM_INT(sx); PARAM_INT(sx);
PARAM_INT(sy); PARAM_INT(sy);
ACTION_RETURN_POINTER(Create<DHUDFont>(fnt, spac, EMonospacing(mono), sy, sy)); ACTION_RETURN_POINTER(CreateHudFont(fnt, spac, mono, sy, sy));
} }

2
src/g_statusbar/base_sbar.cpp → src/common/statusbar/base_sbar.cpp
View File

@ -52,7 +52,7 @@ static int CrosshairNum;
IMPLEMENT_CLASS(DStatusBarCore, true, false) IMPLEMENT_CLASS(DStatusBarCore, true, false)
IMPLEMENT_CLASS(DHUDFont, true, false); IMPLEMENT_CLASS(DHUDFont, false, false);
CVAR(Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE); CVAR(Color, crosshaircolor, 0xff0000, CVAR_ARCHIVE);

7
src/g_statusbar/base_sbar.h → src/common/statusbar/base_sbar.h
View File

@ -51,8 +51,11 @@ enum DI_Flags
DI_SCREEN_LEFT_TOP = DI_SCREEN_TOP | DI_SCREEN_LEFT, DI_SCREEN_LEFT_TOP = DI_SCREEN_TOP | DI_SCREEN_LEFT,
DI_SCREEN_RIGHT_TOP = DI_SCREEN_TOP | DI_SCREEN_RIGHT, DI_SCREEN_RIGHT_TOP = DI_SCREEN_TOP | DI_SCREEN_RIGHT,
DI_SCREEN_LEFT_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_LEFT, DI_SCREEN_LEFT_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_LEFT,
DI_SCREEN_LEFT_CENTER = DI_SCREEN_VCENTER | DI_SCREEN_LEFT,
DI_SCREEN_RIGHT_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_RIGHT, DI_SCREEN_RIGHT_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_RIGHT,
DI_SCREEN_RIGHT_CENTER = DI_SCREEN_VCENTER | DI_SCREEN_RIGHT,
DI_SCREEN_CENTER = DI_SCREEN_VCENTER | DI_SCREEN_HCENTER, DI_SCREEN_CENTER = DI_SCREEN_VCENTER | DI_SCREEN_HCENTER,
DI_SCREEN_CENTER_TOP = DI_SCREEN_TOP | DI_SCREEN_HCENTER,
DI_SCREEN_CENTER_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_HCENTER, DI_SCREEN_CENTER_BOTTOM = DI_SCREEN_BOTTOM | DI_SCREEN_HCENTER,
DI_SCREEN_OFFSETS = DI_SCREEN_HOFFSET | DI_SCREEN_VOFFSET, DI_SCREEN_OFFSETS = DI_SCREEN_HOFFSET | DI_SCREEN_VOFFSET,
@ -104,7 +107,7 @@ enum DI_Flags
class DHUDFont : public DObject class DHUDFont : public DObject
{ {
// this blocks CreateNew on this class which is the intent here. // this blocks CreateNew on this class which is the intent here.
DECLARE_ABSTRACT_CLASS(DHUDFont, DObject); DECLARE_CLASS(DHUDFont, DObject);
public: public:
FFont* mFont; FFont* mFont;
@ -113,6 +116,8 @@ public:
int mShadowX; int mShadowX;
int mShadowY; int mShadowY;
DHUDFont() = default;
DHUDFont(FFont* f, int sp, EMonospacing ms, int sx, int sy) DHUDFont(FFont* f, int sp, EMonospacing ms, int sx, int sy)
: mFont(f), mSpacing(sp), mMonospacing(ms), mShadowX(sx), mShadowY(sy) : mFont(f), mSpacing(sp), mMonospacing(ms), mShadowX(sx), mShadowY(sy)
{} {}