Skip to content

[GEN][ZH] Enable resolutions with aspect ratios different from 4:3 in Options Menu #460

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 30, 2025
Merged

[GEN][ZH] Enable resolutions with aspect ratios different from 4:3 in Options Menu #460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a357a6
[GEN][ZH] Allow to select all resolutions supported by display (#460)
valeronm Mar 19, 2025
6a0efd5
Updated comments according to review
valeronm Jun 30, 2025
34478fe
Updated text of comment once more based on review
valeronm Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,14 @@ W3DDisplay::~W3DDisplay()

} // end ~W3DDisplay

// TheSuperHackers @tweak valeronm 20/03/2025 Only accept 24-bit modes with min width 800
inline Bool isResolutionSupported(const ResolutionDescClass &res)
{
static const Int minBitDepth = 24;

return res.Width >= MIN_DISPLAY_RESOLUTION_X && res.BitDepth >= minBitDepth;
}

/*Return number of screen modes supported by the current device*/
Int W3DDisplay::getDisplayModeCount(void)
{
Expand All @@ -455,8 +463,8 @@ Int W3DDisplay::getDisplayModeCount(void)
for (int res = 0; res < resolutions.Count (); res ++)
{
// Is this the resolution we are looking for?
if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= 800 && (fabs((Real)resolutions[res].Width/(Real)resolutions[res].Height - 1.3333f)) < 0.01f) //only accept 4:3 aspect ratio modes.
{
if (isResolutionSupported(resolutions[res]))
{
numResolutions++;
}
}
Expand All @@ -473,7 +481,7 @@ void W3DDisplay::getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres,
for (int res = 0; res < resolutions.Count (); res ++)
{
// Is this the resolution we are looking for?
if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= 800 && (fabs((Real)resolutions[res].Width/(Real)resolutions[res].Height - 1.3333f)) < 0.01f) //only accept 4:3 aspect ratio modes.
if (isResolutionSupported(resolutions[res]))
{
if (numResolutions == modeIndex)
{ //found the mode
Expand Down
20 changes: 7 additions & 13 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,17 +481,13 @@ W3DDisplay::~W3DDisplay()

} // end ~W3DDisplay


Bool IS_FOUR_BY_THREE_ASPECT( Real x, Real y )
// TheSuperHackers @tweak valeronm 20/03/2025 Only accept 24-bit modes with min width 800
inline Bool isResolutionSupported(const ResolutionDescClass &res)
{
if ( y == 0 )
return FALSE;

Real aspectRatio = fabs( x / y );
return (( aspectRatio > 1.332f) && ( aspectRatio < 1.334f));

}
static const Int minBitDepth = 24;

return res.Width >= MIN_DISPLAY_RESOLUTION_X && res.BitDepth >= minBitDepth;
}

/*Return number of screen modes supported by the current device*/
Int W3DDisplay::getDisplayModeCount(void)
Expand All @@ -516,8 +512,7 @@ Int W3DDisplay::getDisplayModeCount(void)
for (int res = 0; res < resolutions.Count (); res ++)
{
// Is this the resolution we are looking for?
if (resolutions[res].BitDepth >= 24 && resolutions[res].Width >= MIN_DISPLAY_RESOLUTION_X
&& IS_FOUR_BY_THREE_ASPECT( (Real)resolutions[res].Width, (Real)resolutions[res].Height ) ) //only accept 4:3 aspect ratio modes.
if (isResolutionSupported(resolutions[res]))
{
numResolutions++;
}
Expand All @@ -535,8 +530,7 @@ void W3DDisplay::getDisplayModeDescription(Int modeIndex, Int *xres, Int *yres,
for (int res = 0; res < resolutions.Count (); res ++)
{
// Is this the resolution we are looking for?
if ( resolutions[res].BitDepth >= 24 && resolutions[res].Width >= MIN_DISPLAY_RESOLUTION_X
&& IS_FOUR_BY_THREE_ASPECT( (Real)resolutions[res].Width, (Real)resolutions[res].Height ) ) //only accept 4:3 aspect ratio modes.
if (isResolutionSupported(resolutions[res]))
{
if (numResolutions == modeIndex)
{ //found the mode
Expand Down
Loading