Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Crispy-Hud for Heretic #1234

Merged
merged 16 commits into from
Nov 5, 2024
Merged

Conversation

Noseey
Copy link

@Noseey Noseey commented Nov 3, 2024

Related issue:
#656

Changes Summary:

  • Added Screenblock 12 for new optional crispy hud.
  • Limit screenblock inputs to max. 11 for view sizes and draw sliders.
  • Modified DrawFullScreenstuff to distinguish based on screenblock if crispy-hud or vanilla fullscreen hud.
  • Implemented crispy-hud in DrawFullScreenstuff aligning with aspect ratio.

Noseey added 13 commits October 26, 2024 10:34
Raw Version of Crispy Hud
Alignment Keys and Armor in Fullscreen Hud
Update Comment
Expanding Screenblocks to 12.
Removal of unnecessary files.
Conservative Crispy Hud with moved jewels between Item and Ammo, height of widgets from the original hud.
Adjusted Jewels with original spacing to item
Update sb_bar.c to fix height of item selector
Cleanup comments and use non-transparent patch for item selector background.
Move Frags to be visible above health.
Moving Hud down by 10px
@@ -1125,7 +1125,7 @@ static void DrawOptionsMenu(void)

static void DrawOptions2Menu(void)
{
DrawSlider(&Options2Menu, 1, 9, screenblocks - 3);
DrawSlider(&Options2Menu, 1, 9, (screenblocks < 12 ? screenblocks : 11) - 3);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have a BETWEEN() macro for cases like this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The macro is now used in all three occasions.

@@ -1051,69 +1051,169 @@ void DrawInventoryBar(void)

void DrawFullScreenStuff(void)
{
const char *patch;
const char *patch;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No unrelated white space changes, please.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it.

Fixing Findings for Pull-Request #1234 Crispy-Hud:
#1234
Added "return" in crispy hud condition to keep indentation of original code intact.
Copy link
Owner

@fabiangreffrath fabiangreffrath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, we can do it like this. This is not eactly what I had in mind, but I like that the new code is now completely separate from the legacy code. Thank you!

@fabiangreffrath fabiangreffrath merged commit 5fe5332 into fabiangreffrath:master Nov 5, 2024
6 checks passed
@fabiangreffrath
Copy link
Owner

Next step: Crispy HUD for Hexen. Any takers?

@Noseey
Copy link
Author

Noseey commented Nov 5, 2024

Thanks alot for bringing it in!

Next step: Crispy HUD for Hexen. Any takers?

Not much of a Hexen player myself, but I will think about it. :)

@Noseey
Copy link
Author

Noseey commented Nov 6, 2024

Next step: Crispy HUD for Hexen. Any takers?

I made a suggestion in this issue, if you want to have a look:
#1235

fabiangreffrath pushed a commit that referenced this pull request Nov 21, 2024
* Updated Crispy Hud

Raw Version of Crispy Hud

* Alignment Keys and Armor in Fullscreen Hud

Alignment Keys and Armor in Fullscreen Hud

* Update Comment

Update Comment

* Expanding Screenblocks to 12

Expanding Screenblocks to 12.

* Removal of unnecessary files.

Removal of unnecessary files.

* Delete .project

* Conservative Crispy Hud

Conservative Crispy Hud with moved jewels between Item and Ammo, height of widgets from the original hud.

* Adjusted Jewels

Adjusted Jewels with original spacing to item

* Update sb_bar.c to fix height of item selector

Update sb_bar.c to fix height of item selector

* Update sb_bar.c

Cleanup comments and use non-transparent patch for item selector background.

* Update sb_bar.c

Move Frags to be visible above health.

* Update sb_bar.c

Moving Hud down by 10px

* Fixing Findings for Pull-Request #1234

Fixing Findings for Pull-Request #1234 Crispy-Hud:
#1234

* Restructuered DrawFullScreenStuff in sb_bar.c

Added "return" in crispy hud condition to keep indentation of original code intact.

* Adding rough Hexen crispy HUD

First rough version of Hexen crispy HUD, without shifting widgets or considering widescreendelta.

* Refine Hexen Crispy Hud

Shift widgets to the left and right, make it align with aspect ratio, fixing indentation.

* Shifting down Hexen Crispy Hud

Shifting down Hexen Crispy Hud by 7px. Cleanup comments.

* Refinement Hexen Crispy Hud

Shifting up by 1px again, shifting item widget to the left instead of right.

* Cirspy Hexen Hud - Inventory Bar Refinement

Only draw health and ammo widget once the inventory is open.

* Intersect check for Hexen Crispy Hud

Display frags even when inventory open, adding intersect check between ManaPatch2 and Gem1.

* Fix Hexen Crispy-Hud Item-Alignment

Fix Hexen Crispy-Hud Item-Alignment to match standard HUD.

* Align Heretic Crispy-HUD Bar with Hexen

To be consistent with the Hexen Crispy-Hud:
- Align height of Heretic HUD Item Selection Bar with vanilla fullscreen hud
- Don't draw Ammo and Jewels when Gem2 overlaps with Jewels

* Fixing PatchSELECTBOX Pos for Hexen Crispy-Hud

Fixing PatchSELECTBOX Pos for Hexen Crispy-Hud by moving it 2px to the left to align with non-fullscreen standard hud.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants