bugfix(gui): implement resolution scaling for unit health and info #1607

Mauller · 2025-09-19T19:55:39Z

This PR implements raw resolution and aspect ratio scaling for the unit health bar and other info icons.
This PR also adds functions to the display for calculating the display width and height relative to the default resolutions. And a function to calculate the diference in the current aspect ratio from the default.

Zoom based scaling to keep unit info scaled relative to units will be looked at in another PR.

There is also a small fix for the veterancy icon positioning as this was not implemented properly in the original code and broke when the health bar is scaled properly.

The only thing not scaled in this at the moment is the bombed icons, these will be dealt with in another PR.
This is due to icon placement changes being required so the icon is placed on the target instead of at the feet of the unit placing the bomb.

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

Mauller · 2025-09-19T20:02:47Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp


-	// do this so health bar doesn't get too skinny or fat after scaling
-	//healthBoxHeight = max(3.0f, healthBoxHeight);
-	healthBoxHeight = 3.0f;


The retrieved health box height from the object is already 3.0f, at higher resoutions this code prevents the health box from scaling relative to the vehicles and looks wrong. Which is why i removed it.

I reinstated the clamp on the max size of the health bar to prevent it shrinking too much when the resolution is scaled. This will also come into play more when zoom scaling is added.

xezon · 2025-09-20T10:33:39Z

Is this a piece split off of #1573 ?

Mauller · 2025-09-20T10:42:14Z

Is this a piece split off of #1573 ?

Yes, this only implements the resolution scaling of the UI elements and some small fixes to the veterancy icon and compute health region code.

I did not close the original as I will build the zoom scaling off this pr when finalised and merged.

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/Display.h

xezon · 2025-09-20T11:14:25Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -2959,8 +2954,8 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 #else
 	Real scale = 1.0f;


It looks like EA already tried to do some scaling here with TheGlobalData->m_ammoPipScaleFactor in SCALE_ICONS_WITH_ZOOM_ML. Does SCALE_ICONS_WITH_ZOOM_ML still have any relevance? What does it do? If it is not useful, can that be removed before we add a new scaling for it?

Scale icons with zoom does not have any real relevance once I properly implement the zoom scaling.

But the idea was to rescale the info icons as you zoomed into units so their size was kept uniform relative to the health bar. Which is what I reimplemented.

We could still make use of the pipscale factor though.

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

Mauller · 2025-09-20T16:17:16Z

Quick Rebase

Mauller · 2025-09-20T17:12:50Z

Tweaked this now so the followup can implement user based options within InGameUI.

This version also reduces the overhead a little since the scaling factor is only calculated once at initialisation and when the resolution gets changed.

So with this, the unit info acts the same as with retail, but scales all the unit gui elements properly with resolution.

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Mauller · 2025-09-21T09:46:31Z

Moved the scale variable into the SCALE_ICONS_WITH_ZOOM_ML for the draw veterancy function

Mauller · 2025-09-21T10:00:49Z

Tweaked veterancy icon position, it should be in exactly the same place now, it might look slightly offset but that's actually the health bar being marginally shifted left due to the above mentioned change.

xezon · 2025-09-21T10:07:06Z

Health bar size is not correct on higher solution.

In 800x600, health bar is 1 pixel high. In 1600x1200 it is 4 pixels high.

Mauller · 2025-09-21T10:16:52Z

Health bar size is not correct on higher solution.

In 800x600, health bar is 1 pixel high. In 1600x1200 it is 4 pixels high.

Yes because it's scaling with the resolution, it's proportions are the same compared to 800x600

If the health bar remaind the same thickness as it is at 800x600 then you will barely see anything of it at higher resolutions.

xezon · 2025-09-21T10:19:27Z

I think it is wrong. If health bar is 1px at 800x600, then it should be 2px at 1600x1200.

Mauller · 2025-09-21T10:28:43Z

I think it is wrong. If health bar is 1px at 800x600, then it should be 2px at 1600x1200.

Its not wrong, it's because of the way the health bar is setup. The border does not scale with the health bar and remains at only 1 pixel in height.

The health bar region is 6 pixels high, which is double the default of 3 at 800x600, but there is always a 1 pixel border.

This means that at 800x600 there is only a single pixel for the health bar info itself while theres 4 at 1600x1200

So overall the health bar is scaled properly, it's just that relatively more of the health bar is taken up by the border at 800x600

Mauller · 2025-09-21T10:34:16Z

The other way to work this would be to also scale the health bar border at higher resolutions, it would also make the health bar more visible when health is getting depleted and should keep the health info itself scaled similar to 800x600

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

xezon · 2025-09-21T10:42:27Z

I think it is wrong. If health bar is 1px at 800x600, then it should be 2px at 1600x1200.

Its not wrong, it's because of the way the health bar is setup. The border does not scale with the health bar and remains at only 1 pixel in height.

The health bar region is 6 pixels high, which is double the default of 3 at 800x600, but there is always a 1 pixel border.

This means that at 800x600 there is only a single pixel for the health bar info itself while theres 4 at 1600x1200

So overall the health bar is scaled properly, it's just that relatively more of the health bar is taken up by the border at 800x600

I think visually it should look twice as big. Right now it looks 4 times as big.

Mauller · 2025-09-21T15:21:56Z

I think it is wrong. If health bar is 1px at 800x600, then it should be 2px at 1600x1200.

Its not wrong, it's because of the way the health bar is setup. The border does not scale with the health bar and remains at only 1 pixel in height.
The health bar region is 6 pixels high, which is double the default of 3 at 800x600, but there is always a 1 pixel border.
This means that at 800x600 there is only a single pixel for the health bar info itself while theres 4 at 1600x1200
So overall the health bar is scaled properly, it's just that relatively more of the health bar is taken up by the border at 800x600

I think visually it should look twice as big. Right now it looks 4 times as big.

I am working on something that should do that, some of the functions aren't working quite right for drawing rectangles with outlines so just currently investigating that.

Mauller · 2025-09-21T18:08:51Z

Well that was a pain to dig through and find the bottom of the border drawing issue, but this should literally be looking good now.

xezon

Looks promising, but there are still some things.

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp

xezon · 2025-09-22T19:07:30Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -3925,23 +3916,23 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)

 		}

+		Real healthBoxWidth = healthBarRegion->width();


Health bar width looks a bit different, noticeable on Troopcrawler. See right side.

IT looks like it comes up to the black viewport to me in both, the thing that makes it look significnatly bigger is the placement of the contained pips.

Something i noticed is that the contained pips seem to integer scale and have a fixed seperation.#
So they will pop sideways at times in different resolutions or zoom levels.
When zooming with zoom scaling enabled they would often pop and move about by nearly an entire pip to the left or right

At 800x600

at 1600x1200

i think like with the health bar border, i might need to also scale the pip spacing

Yes scaling the pip spacing made it match
1600x1200

will make sure to do the same for ammo pips

In 1280x720 the discrepancy still occurs. Maybe is inevitable because of integer rounding?

The images themselves are integer rounded within the image draw functions. so you then have that compounding loss over every extra pip while there is only a single rounding on the health bars width.

xezon · 2025-09-22T19:22:20Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -3925,23 +3916,23 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)

 		}

+		Real healthBoxWidth = healthBarRegion->width();
+		Real healthBoxHeight = max(3, healthBarRegion->height());


With 1280x720 the scaling of the health bar will be fractionized. This creates an unfortunate coloring with washed greens in the center.

Can the positioning or rounding be optimized in a way to preserve finer details on fractional scale, for example by moving the pixels by 0.5 in both x and y ?

1280x720 at 300% zoom

Okay to correct this i have to floor the scaled thickness of the border, this then makes sure that the border does not grow too large in intermediate resolutions.

800x600

1280x720

1600x1200

Are the lines integer? If we could have float coords for the bars then the intermediate center green bar for example could cover 1 full pixel line + 2x 0.5 pixel line above and below. This should then scale nicely from 800x600 towards 1600x1200 and beyond.

Technically a half pixel line means a line with 50% opacity.

I tested 1280x720 and the health looks too big (the center green part). I suggest explore fractionalized drawing.

We could integer scale the height of the health bar, this way it always looks clear and sharp.

Then the health bar region is only ever multiples of 3 high then the green bit scales as 1, 2, 3 pixels high etc.

Keeping the sharp look makes it clearer to see, i think having any kind of blending will make it less distinct, considering we are dealing with something only a few pixels in size.

tweaked it so the border part is less transparent and decreases with the health

It does not scale correctly:

I think the health bar scaling will be easier to test in combination with the zoom scaling. So for testing, perhaps enable the zoom scaling. I think it is important to have fractional scale, especially on the health bars, not just for resolution, but also for zoom. We do not want blocky transitions, but smooth transitions. Try to get rid of the integer positions and only lock the pixels on the screen pixel grid, not on the health bar itself.

The health bar itself is already scaled in pixels, the underlying functions that draw to the screen deal in screen coordinates of pixels. This includes the line and rect drawing functions.

I can enable the zoom scaling for the vertical axis of the health bar if you want to look more at that.

I think the bar needs to be scaled in fractions of pixels, and positioned in pixels.

Do you need help with the implementation for it?

I should be alright for the minute, need to experiment with getting rect and line functions working that don't use whole pixel coordinates.

…ns relative to defaults

Mauller · 2025-09-23T19:23:41Z

Should be looking better now, ho ho ho.

…cons

Mauller commented Sep 19, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp Outdated Show resolved Hide resolved

Mauller commented Sep 19, 2025

View reviewed changes

Mauller self-assigned this Sep 19, 2025

xezon reviewed Sep 20, 2025

View reviewed changes

Mauller force-pushed the fix-unit-info-res-scaling branch from 20904b1 to 09d6dae Compare September 20, 2025 16:17

Mauller force-pushed the fix-unit-info-res-scaling branch from 09d6dae to d068267 Compare September 20, 2025 17:11

xezon reviewed Sep 21, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp Show resolved Hide resolved

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated Show resolved Hide resolved

Mauller force-pushed the fix-unit-info-res-scaling branch from d068267 to a64a7ee Compare September 21, 2025 09:45

Mauller force-pushed the fix-unit-info-res-scaling branch from a64a7ee to c172cfe Compare September 21, 2025 10:00

xezon reviewed Sep 21, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated Show resolved Hide resolved

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated Show resolved Hide resolved

Mauller force-pushed the fix-unit-info-res-scaling branch from c172cfe to 6ca0750 Compare September 21, 2025 18:08

xezon modified the milestones: Important features, Major bug fixes Sep 22, 2025

xezon reviewed Sep 22, 2025

View reviewed changes

xezon modified the milestones: Major bug fixes, Important features Sep 23, 2025

xezon added Enhancement Is new feature or request and removed Bug Something is not working right, typically is user facing labels Sep 23, 2025

tweak(display): add new functions to return ratios of screen dimensio…

5ef9232

…ns relative to defaults

Mauller force-pushed the fix-unit-info-res-scaling branch from 6ca0750 to bdca8c3 Compare September 23, 2025 19:23

Mauller force-pushed the fix-unit-info-res-scaling branch 2 times, most recently from db916a5 to 4b5bfae Compare September 25, 2025 19:14

fix(gui): implement resolution scaling for unit health bar and info i…

542f98b

…cons

Mauller force-pushed the fix-unit-info-res-scaling branch from 4b5bfae to 542f98b Compare September 26, 2025 17:17

		@@ -2959,8 +2954,8 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
		#else
		Real scale = 1.0f;

		@@ -3925,23 +3916,23 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)

		}

		Real healthBoxWidth = healthBarRegion->width();

bugfix(gui): implement resolution scaling for unit health and info #1607

Are you sure you want to change the base?

bugfix(gui): implement resolution scaling for unit health and info #1607

Uh oh!

Conversation

Mauller commented Sep 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xezon commented Sep 20, 2025

Uh oh!

Mauller commented Sep 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Mauller Sep 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Mauller commented Sep 20, 2025

Uh oh!

Mauller commented Sep 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Mauller commented Sep 21, 2025

Uh oh!

Mauller commented Sep 21, 2025

Uh oh!

xezon commented Sep 21, 2025

Uh oh!

Mauller commented Sep 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xezon commented Sep 21, 2025

Uh oh!

Mauller commented Sep 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mauller commented Sep 21, 2025

Uh oh!

Uh oh!

Uh oh!

xezon commented Sep 21, 2025

Uh oh!

Mauller commented Sep 21, 2025

Uh oh!

Mauller commented Sep 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Mauller Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Mauller Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Mauller commented Sep 19, 2025 •

edited

Loading

Mauller commented Sep 20, 2025 •

edited

Loading

Mauller Sep 20, 2025 •

edited

Loading

Mauller commented Sep 20, 2025 •

edited

Loading

Mauller commented Sep 21, 2025 •

edited

Loading

Mauller commented Sep 21, 2025 •

edited

Loading

Mauller commented Sep 21, 2025 •

edited

Loading

Mauller Sep 23, 2025 •

edited

Loading

Mauller Sep 23, 2025 •

edited

Loading

Mauller Sep 24, 2025 •

edited

Loading

xezon Sep 24, 2025 •

edited

Loading

Mauller Sep 24, 2025 •

edited

Loading