zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-24 04:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
gzdoom/wadsrc/static/zscript/ui/statusbar/doom_sbar.zs

214 lines
6.6 KiB
Text
Raw Normal View History

- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
class DoomStatusBar : BaseStatusBar
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
HUDFont mHUDFont;
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
HUDFont mIndexFont;
- implemented the inventory bar. This object is a bit special because it requires a lot of parameters, most of which are easily set to defaults. To make handling easier, most are passed through a container object which does some processing up front. - finished work on the Doom status bar. I also took the opportunity to fix the layout of the inventory bar which is a bit broken in SBARINFO. - tuned the selection rules for deciding what creates the status bar, so that the most recent definition that can be found is chosen.
2017-03-26 23:02:10 +00:00
HUDFont mAmountFont;
InventoryBarState diparms;
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
override void Init()
{
Super.Init();
SetSize(32, 320, 200);
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
// Create the font used for the fullscreen HUD
Font fnt = "HUDFONT_DOOM";
Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString (#810) * - Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString * - added underlying type declaration for EMonospacing * - replaced "#include v_video.h" with a declaration of EMonospacing
2019-04-13 16:10:58 +00:00
mHUDFont = HUDFont.Create(fnt, fnt.GetCharWidth("0"), Mono_CellLeft, 1, 1);
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
fnt = "INDEXFONT_DOOM";
Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString (#810) * - Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString * - added underlying type declaration for EMonospacing * - replaced "#include v_video.h" with a declaration of EMonospacing
2019-04-13 16:10:58 +00:00
mIndexFont = HUDFont.Create(fnt, fnt.GetCharWidth("0"), Mono_CellLeft);
- implemented the inventory bar. This object is a bit special because it requires a lot of parameters, most of which are easily set to defaults. To make handling easier, most are passed through a container object which does some processing up front. - finished work on the Doom status bar. I also took the opportunity to fix the layout of the inventory bar which is a bit broken in SBARINFO. - tuned the selection rules for deciding what creates the status bar, so that the most recent definition that can be found is chosen.
2017-03-26 23:02:10 +00:00
mAmountFont = HUDFont.Create("INDEXFONT");
diparms = InventoryBarState.Create();
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
}
override void Draw (int state, double TicFrac)
{
Super.Draw (state, TicFrac);
if (state == HUD_StatusBar)
{
- implemented proper scaling for the status bar itself. This allows using the UI scale or its own value, like all other scaling values. In addition there is a choice between preserving equal pixel size or aspect ratio because the squashed non-corrected versions tend to look odd, but since proper scaling requires ununiform pixel sizes it is an option. - changed how status bar sizes are being handled. This has to recalculate all scaling and positioning factors, which can cause problems if the drawer leaves with some temporary values that do not reflect the status bar as a whole. Changed it so that the status bar stores the base values and restores them after drawing is complete.
2017-03-29 17:23:40 +00:00
BeginStatusBar();
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
DrawMainBar (TicFrac);
}
else if (state == HUD_Fullscreen)
{
- implemented proper scaling for the status bar itself. This allows using the UI scale or its own value, like all other scaling values. In addition there is a choice between preserving equal pixel size or aspect ratio because the squashed non-corrected versions tend to look odd, but since proper scaling requires ununiform pixel sizes it is an option. - changed how status bar sizes are being handled. This has to recalculate all scaling and positioning factors, which can cause problems if the drawer leaves with some temporary values that do not reflect the status bar as a whole. Changed it so that the status bar stores the base values and restores them after drawing is complete.
2017-03-29 17:23:40 +00:00
BeginHUD();
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
DrawFullScreenStuff ();
}
}
protected void DrawMainBar (double TicFrac)
{
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawImage("STBAR", (0, 168), DI_ITEM_OFFSETS);
DrawImage("STTPRCNT", (90, 171), DI_ITEM_OFFSETS);
DrawImage("STTPRCNT", (221, 171), DI_ITEM_OFFSETS);
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
- fixed: The ammo display in Doom should not be drawn if the current weapon does not use ammo.
2017-04-01 11:08:45 +00:00
Inventory a1 = GetCurrentAmmo();
if (a1 != null) DrawString(mHUDFont, FormatNumber(a1.Amount, 3), (44, 171), DI_TEXT_ALIGN_RIGHT|DI_NOSHADOW);
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawString(mHUDFont, FormatNumber(CPlayer.health, 3), (90, 171), DI_TEXT_ALIGN_RIGHT|DI_NOSHADOW);
DrawString(mHUDFont, FormatNumber(GetArmorAmount(), 3), (221, 171), DI_TEXT_ALIGN_RIGHT|DI_NOSHADOW);
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
DrawBarKeys();
DrawBarAmmo();
if (deathmatch || teamplay)
{
DrawString(mHUDFont, FormatNumber(CPlayer.FragCount, 3), (138, 171), DI_TEXT_ALIGN_RIGHT);
}
else
{
DrawBarWeapons();
}
if (multiplayer)
{
DrawImage("STFBANY", (143, 168), DI_ITEM_OFFSETS|DI_TRANSLATABLE);
}
if (CPlayer.mo.InvSel != null && !Level.NoInventoryBar)
{
DrawInventoryIcon(CPlayer.mo.InvSel, (160, 198));
if (CPlayer.mo.InvSel.Amount > 1)
{
DrawString(mAmountFont, FormatNumber(CPlayer.mo.InvSel.Amount), (175, 198-mIndexFont.mFont.GetHeight()), DI_TEXT_ALIGN_RIGHT, Font.CR_GOLD);
}
}
else
{
DrawTexture(GetMugShot(5), (143, 168), DI_ITEM_OFFSETS);
}
if (isInventoryBarVisible())
{
DrawInventoryBar(diparms, (48, 169), 7, DI_ITEM_LEFT_TOP);
}
}
protected virtual void DrawBarKeys()
{
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
bool locks[6];
String image;
for(int i = 0; i < 6; i++) locks[i] = CPlayer.mo.CheckKeys(i + 1, false, true);
// key 1
if (locks[1] && locks[4]) image = "STKEYS6";
else if (locks[1]) image = "STKEYS0";
else if (locks[4]) image = "STKEYS3";
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawImage(image, (239, 171), DI_ITEM_OFFSETS);
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
// key 2
if (locks[2] && locks[5]) image = "STKEYS7";
else if (locks[2]) image = "STKEYS1";
else if (locks[5]) image = "STKEYS4";
else image = "";
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawImage(image, (239, 181), DI_ITEM_OFFSETS);
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
// key 3
if (locks[0] && locks[3]) image = "STKEYS8";
else if (locks[0]) image = "STKEYS2";
else if (locks[3]) image = "STKEYS5";
else image = "";
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawImage(image, (239, 191), DI_ITEM_OFFSETS);
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
}
protected virtual void DrawBarAmmo()
{
- fixed: The ammo display in Doom should not be drawn if the current weapon does not use ammo.
2017-04-01 11:08:45 +00:00
int amt1, maxamt;
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
[amt1, maxamt] = GetAmount("Clip");
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawString(mIndexFont, FormatNumber(amt1, 3), (288, 173), DI_TEXT_ALIGN_RIGHT);
DrawString(mIndexFont, FormatNumber(maxamt, 3), (314, 173), DI_TEXT_ALIGN_RIGHT);
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
[amt1, maxamt] = GetAmount("Shell");
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawString(mIndexFont, FormatNumber(amt1, 3), (288, 179), DI_TEXT_ALIGN_RIGHT);
DrawString(mIndexFont, FormatNumber(maxamt, 3), (314, 179), DI_TEXT_ALIGN_RIGHT);
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
[amt1, maxamt] = GetAmount("RocketAmmo");
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawString(mIndexFont, FormatNumber(amt1, 3), (288, 185), DI_TEXT_ALIGN_RIGHT);
DrawString(mIndexFont, FormatNumber(maxamt, 3), (314, 185), DI_TEXT_ALIGN_RIGHT);
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
- implemented the regular Doom status bar. The DOOM status bar and HUD are complete, except the inventory bar.
2017-03-26 20:04:58 +00:00
[amt1, maxamt] = GetAmount("Cell");
- change statusbar drawers to use the top left of the virtual screen as origin, not the top left of the actual status bar, to bring this in line with SBARINFO. The Strife status bar which was still native code had it differently and that was used as the initial guideline.
2017-03-27 07:52:30 +00:00
DrawString(mIndexFont, FormatNumber(amt1, 3), (288, 191), DI_TEXT_ALIGN_RIGHT);
DrawString(mIndexFont, FormatNumber(maxamt, 3), (314, 191), DI_TEXT_ALIGN_RIGHT);
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
}
protected virtual void DrawBarWeapons()
{
DrawImage("STARMS", (104, 168), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(2)? "STYSNUM2" : "STGNUM2", (111, 172), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(3)? "STYSNUM3" : "STGNUM3", (123, 172), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(4)? "STYSNUM4" : "STGNUM4", (135, 172), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(5)? "STYSNUM5" : "STGNUM5", (111, 182), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(6)? "STYSNUM6" : "STGNUM6", (123, 182), DI_ITEM_OFFSETS);
DrawImage(CPlayer.HasWeaponsInSlot(7)? "STYSNUM7" : "STGNUM7", (135, 182), DI_ITEM_OFFSETS);
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
}
protected void DrawFullScreenStuff ()
{
Vector2 iconbox = (40, 20);
// Draw health
let berserk = CPlayer.mo.FindInventory("PowerStrength");
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawImage(berserk? "PSTRA0" : "MEDIA0", (20, -2));
DrawString(mHUDFont, FormatNumber(CPlayer.health, 3), (44, -20));
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
let armor = CPlayer.mo.FindInventory("BasicArmor");
- fixed: do not draw armor on the fullscreen HUD if the amount is 0.
2017-04-13 18:43:17 +00:00
if (armor != null && armor.Amount > 0)
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawInventoryIcon(armor, (20, -22));
DrawString(mHUDFont, FormatNumber(armor.Amount, 3), (44, -40));
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
}
Inventory ammotype1, ammotype2;
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
[ammotype1, ammotype2] = GetCurrentAmmo();
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
int invY = -20;
if (ammotype1 != null)
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawInventoryIcon(ammotype1, (-14, -4));
DrawString(mHUDFont, FormatNumber(ammotype1.Amount, 3), (-30, -20), DI_TEXT_ALIGN_RIGHT);
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
invY -= 20;
}
if (ammotype2 != null && ammotype2 != ammotype1)
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawInventoryIcon(ammotype2, (-14, invY + 17));
DrawString(mHUDFont, FormatNumber(ammotype2.Amount, 3), (-30, invY), DI_TEXT_ALIGN_RIGHT);
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
invY -= 20;
}
- renamed the level variables. currentUILevel is now primaryLevel. For ZScript, currentVMLevel was added. This is also exported as 'level' and will change as needed. This also means that no breaking deprecations will be needed in the future, because in order to sandbox a level only 4 variables need to be handled: level, players, playeringame and consoleplayer. The remaining global variables are not relevant for the level state. The static 'level' has been mostly removed from the code except some places that still need work.
2019-02-01 23:24:43 +00:00
if (!isInventoryBarVisible() && !Level.NoInventoryBar && CPlayer.mo.InvSel != null)
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawInventoryIcon(CPlayer.mo.InvSel, (-14, invY + 17));
DrawString(mHUDFont, FormatNumber(CPlayer.mo.InvSel.Amount, 3), (-30, invY), DI_TEXT_ALIGN_RIGHT);
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
}
if (deathmatch)
{
- implemented the inventory bar. This object is a bit special because it requires a lot of parameters, most of which are easily set to defaults. To make handling easier, most are passed through a container object which does some processing up front. - finished work on the Doom status bar. I also took the opportunity to fix the layout of the inventory bar which is a bit broken in SBARINFO. - tuned the selection rules for deciding what creates the status bar, so that the most recent definition that can be found is chosen.
2017-03-26 23:02:10 +00:00
DrawString(mHUDFont, FormatNumber(CPlayer.FragCount, 3), (-3, 1), DI_TEXT_ALIGN_RIGHT, Font.CR_GOLD);
- Doom keybar is working. I did not implement an equivalent to SBARINFO's DrawKeyBar. This is too limiting because it needs to consider any possibility. It really is easier to let a mod implement this itself and custom adjust it to its needs. - fixed some stuff, in particular use DrawInventoryIcon to get smarter icon lookup.
2017-03-25 22:43:19 +00:00
}
- reimplemented the Harmony status bar in ZScript * the Doom status bar has been partially virtualized to allow overriding specific parts of it, most notably the ammo display * the internal Harmony status bar has been removed because it only works with the now disabled Dehacked patch. * the SBARINFO definition has been removed, instead it uses a ZScript-based status bar now which overrides the ammo display to use the new ammo types instead.
2019-07-16 22:36:38 +00:00
DrawFullscreenKeys();
if (isInventoryBarVisible())
{
DrawInventoryBar(diparms, (0, 0), 7, DI_SCREEN_CENTER_BOTTOM, HX_SHADOW);
}
}
protected virtual void DrawFullscreenKeys()
{
// Draw the keys. This does not use a special draw function like SBARINFO because the specifics will be different for each mod
- Doom keybar is working. I did not implement an equivalent to SBARINFO's DrawKeyBar. This is too limiting because it needs to consider any possibility. It really is easier to let a mod implement this itself and custom adjust it to its needs. - fixed some stuff, in particular use DrawInventoryIcon to get smarter icon lookup.
2017-03-25 22:43:19 +00:00
// so it's easier to copy or reimplement the following piece of code instead of trying to write a complicated all-encompassing solution.
Vector2 keypos = (-10, 2);
int rowc = 0;
double roww = 0;
for(let i = CPlayer.mo.Inv; i != null; i = i.Inv)
{
if (i is "Key" && i.Icon.IsValid())
{
- simplified the parameters of the HUD draw functions by moving all booleans into one flags word and ordering them so that the less likely ones to be used can be made optional. - got rid of the image list in the Doom status bar. The cost of the texture lookup is mostly irrelevant here so clearer and shorter code is preferrable. - moved the box fitting code from DrawTexture into the native function to have all coordinate calculations in one place which is necessary to implement proper alignment default handling. Without higher level functions altering positioning the default can be set to automatic alignment determination, i.e. the value's sign decides where something is placed. Of course for special cases this can be overridden. - use ANIMDEFS to animate the inventory arrow,
2017-03-26 16:41:24 +00:00
DrawTexture(i.Icon, keypos, DI_SCREEN_RIGHT_TOP|DI_ITEM_LEFT_TOP);
- Doom keybar is working. I did not implement an equivalent to SBARINFO's DrawKeyBar. This is too limiting because it needs to consider any possibility. It really is easier to let a mod implement this itself and custom adjust it to its needs. - fixed some stuff, in particular use DrawInventoryIcon to get smarter icon lookup.
2017-03-25 22:43:19 +00:00
Vector2 size = TexMan.GetScaledSize(i.Icon);
keypos.Y += size.Y + 2;
roww = max(roww, size.X);
if (++rowc == 3)
{
keypos.Y = 2;
keypos.X -= roww + 2;
roww = 0;
rowc = 0;
}
}
}
- started port of Doom status bar to ZScript. Fullscreen HUD done with the exception of key and inventory bar. I also used the opportunity to make it a bit more resistant against badly designed inventory icons.
2017-03-25 20:40:17 +00:00
}
}
Reference in a new issue Copy permalink