Skip to content

Add HD resolution & FOV settings #667

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
Lgt2x merged 9 commits into from
Mar 7, 2025
Merged

Add HD resolution & FOV settings #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40c7f0d
Add higher resolutions to the settings
Lgt2x Feb 18, 2025
b803ad2
Renderer: use window dimensions only to work out aspect ratio
Lgt2x Feb 19, 2025
51fb3fe
Resolution configuration: display current resolution in menu
Lgt2x Feb 20, 2025
9d1e824
Add FOV setting
Lgt2x Feb 20, 2025
8b53fb0
Fix windows compilation and warnings
Lgt2x Feb 20, 2025
b3eb34b
Wait until we're out of the config menu to change resolution
Lgt2x Feb 23, 2025
a968908
Scale HUD text
Lgt2x Feb 23, 2025
3f47099
test native resolution by default
Lgt2x Feb 23, 2025
7b123e9
Default resolution choices: use display resolutions if possible
Lgt2x Feb 25, 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
4 changes: 2 additions & 2 deletions Descent3/GameLoop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@
extern bool Display_renderer_stats;

// Current zoom factor (this is the tan of 29.25, which is half our FOV of 58.5)
float Render_FOV = D3_DEFAULT_FOV;
float Render_FOV = Render_FOV_setting;
float Render_zoom = D3_DEFAULT_ZOOM;

// How long (in seconds) the last frame took
Expand Down Expand Up @@ -2117,7 +2117,7 @@ void ProcessTestKeys(int key) {
break;

case KEY_8:
Render_FOV = D3_DEFAULT_FOV;
Render_FOV = Render_FOV_setting;
AddHUDMessage("FOV has been reset to %f", Render_FOV);
break;

Expand Down
6 changes: 3 additions & 3 deletions Descent3/WeaponFire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2680,7 +2680,7 @@ void DoZoomStay() {
if (Zoom_fov_time < 0) {
Zoom_fov_time = 0;
Players[Player_num].flags &= ~PLAYER_FLAGS_ZOOMED;
Render_FOV = D3_DEFAULT_FOV;
Render_FOV = Render_FOV_setting;
}
}
}
Expand All @@ -2689,7 +2689,7 @@ void DoZoomStay() {
void DoZoomEffect(player_weapon *pw, uint8_t clear) {
if (pw->firing_time < .5) {
Players[Player_num].turn_scalar = 1.0;
Render_FOV = D3_DEFAULT_FOV;
Render_FOV = Render_FOV_setting;

if (!clear)
DoZoomStay();
Expand Down Expand Up @@ -2738,7 +2738,7 @@ void DoZoomEffect(player_weapon *pw, uint8_t clear) {
// calculate zoom effect
float norm = (pw->firing_time - .5) * 2;

Render_FOV = (ZOOM_FOV_TARGET * norm) + ((1.0 - norm) * D3_DEFAULT_FOV);
Render_FOV = (ZOOM_FOV_TARGET * norm) + ((1.0 - norm) * Render_FOV_setting);

return;
}
Expand Down
Loading
Loading