fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

wip 1

Browse source
This commit is contained in:
Eric Wasylishen 2017-05-01 00:00:38 -06:00
parent 414ec8f369
commit 7d0fc25d3a
3 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quakespasm/Quake/gl_rmain.c
View file

@ -237,7 +237,7 @@ void GLSLGamma_GammaCorrect (void)
glDisable (GL_ALPHA_TEST); glDisable (GL_ALPHA_TEST);
glDisable (GL_DEPTH_TEST); glDisable (GL_DEPTH_TEST);
glViewport (glx, gly, glwidth, glheight); glViewport (0, 0, vid.unscaled_width, vid.unscaled_height);
smax = glwidth/(float)r_gamma_texture_width; smax = glwidth/(float)r_gamma_texture_width;
tmax = glheight/(float)r_gamma_texture_height; tmax = glheight/(float)r_gamma_texture_height;

39
quakespasm/Quake/gl_vidsdl.c
View file

@ -154,6 +154,7 @@ static cvar_t vid_borderless = {"vid_borderless", "0", CVAR_ARCHIVE}; // QuakeSp
cvar_t vid_gamma = {"gamma", "1", CVAR_ARCHIVE}; //johnfitz -- moved here from view.c cvar_t vid_gamma = {"gamma", "1", CVAR_ARCHIVE}; //johnfitz -- moved here from view.c
cvar_t vid_contrast = {"contrast", "1", CVAR_ARCHIVE}; //QuakeSpasm, MarkV cvar_t vid_contrast = {"contrast", "1", CVAR_ARCHIVE}; //QuakeSpasm, MarkV
cvar_t vid_scaled = {"vid_scaled", "0", CVAR_ARCHIVE}; // QuakeSpasm, MarkV
//========================================================================== //==========================================================================
// //
@ -350,6 +351,37 @@ static int VID_GetCurrentHeight (void)
#endif #endif
} }
/*
=======================
VID_CalcRenderSize
returns the size that we will render to, possilby smaller than the actual
framebuffer size if the vid_scaled cvar is in use.
=======================
*/
static void VID_GetRenderSize (int *w, int *h)
{
float scale_factor;
#if defined(USE_SDL2)
SDL_GetWindowSize(draw_context, w, h);
#else
*w = draw_context->w;
*h = draw_context->h;
#endif
if (vid_scaled.value == 1) {
scale_factor = 1/2.0f;
} else if (vid_scaled.value == 2) {
scale_factor = 1/3.0f;
} else {
scale_factor = 1.0f;
}
*w *= scale_factor;
*h *= scale_factor;
}
/* /*
==================== ====================
VID_GetCurrentBPP VID_GetCurrentBPP
@ -667,8 +699,9 @@ static qboolean VID_SetMode (int width, int height, int bpp, qboolean fullscreen
SDL_WM_SetCaption(caption, caption); SDL_WM_SetCaption(caption, caption);
#endif /* !defined(USE_SDL2) */ #endif /* !defined(USE_SDL2) */
vid.width = VID_GetCurrentWidth(); VID_GetRenderSize(&vid.width, &vid.height);
vid.height = VID_GetCurrentHeight(); vid.unscaled_width = VID_GetCurrentWidth();
vid.unscaled_height = VID_GetCurrentHeight();
vid.conwidth = vid.width & 0xFFFFFFF8; vid.conwidth = vid.width & 0xFFFFFFF8;
vid.conheight = vid.conwidth * vid.height / vid.width; vid.conheight = vid.conwidth * vid.height / vid.width;
vid.numpages = 2; vid.numpages = 2;
@ -1520,6 +1553,7 @@ void VID_Init (void)
Cvar_RegisterVariable (&vid_fsaa); //QuakeSpasm Cvar_RegisterVariable (&vid_fsaa); //QuakeSpasm
Cvar_RegisterVariable (&vid_desktopfullscreen); //QuakeSpasm Cvar_RegisterVariable (&vid_desktopfullscreen); //QuakeSpasm
Cvar_RegisterVariable (&vid_borderless); //QuakeSpasm Cvar_RegisterVariable (&vid_borderless); //QuakeSpasm
Cvar_RegisterVariable (&vid_scaled); //QuakeSpasm
Cvar_SetCallback (&vid_fullscreen, VID_Changed_f); Cvar_SetCallback (&vid_fullscreen, VID_Changed_f);
Cvar_SetCallback (&vid_width, VID_Changed_f); Cvar_SetCallback (&vid_width, VID_Changed_f);
Cvar_SetCallback (&vid_height, VID_Changed_f); Cvar_SetCallback (&vid_height, VID_Changed_f);
@ -1528,6 +1562,7 @@ void VID_Init (void)
Cvar_SetCallback (&vid_fsaa, VID_FSAA_f); Cvar_SetCallback (&vid_fsaa, VID_FSAA_f);
Cvar_SetCallback (&vid_desktopfullscreen, VID_Changed_f); Cvar_SetCallback (&vid_desktopfullscreen, VID_Changed_f);
Cvar_SetCallback (&vid_borderless, VID_Changed_f); Cvar_SetCallback (&vid_borderless, VID_Changed_f);
Cvar_SetCallback (&vid_scaled, VID_Changed_f);
Cmd_AddCommand ("vid_unlock", VID_Unlock); //johnfitz Cmd_AddCommand ("vid_unlock", VID_Unlock); //johnfitz
Cmd_AddCommand ("vid_restart", VID_Restart); //johnfitz Cmd_AddCommand ("vid_restart", VID_Restart); //johnfitz

2
quakespasm/Quake/vid.h
View file

@ -54,6 +54,8 @@ typedef struct
int rowbytes; // may be > width if displayed in a window int rowbytes; // may be > width if displayed in a window
int width; int width;
int height; int height;
int unscaled_width;
int unscaled_height;
float aspect; // width / height -- < 0 is taller than wide float aspect; // width / height -- < 0 is taller than wide
int numpages; int numpages;
int recalc_refdef; // if true, recalc vid-based stuff int recalc_refdef; // if true, recalc vid-based stuff