zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add option to texture hqresize resize model skins.

Browse source
This commit is contained in:
Rachael Alexanderson 2020-10-08 00:30:12 -04:00
parent 4aec72be5d
commit a2f0c27651
5 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/textures/gametexture.h
View file

@ -366,7 +366,8 @@ enum EUpscaleFlags
UF_None = 0, UF_None = 0,
UF_Texture = 1, UF_Texture = 1,
UF_Sprite = 2, UF_Sprite = 2,
UF_Font = 4 UF_Font = 4,
UF_Skin = 8
}; };
extern int upscalemask; extern int upscalemask;

3
src/common/textures/hires/hqresize.cpp
View file

@ -75,7 +75,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_maxinputsize, 512, CVAR_ARCHIVE | CVAR_GLOB
TexMan.FlushAll(); TexMan.FlushAll();
} }
CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 15, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
TexMan.FlushAll(); TexMan.FlushAll();
UpdateUpscaleMask(); UpdateUpscaleMask();
@ -84,6 +84,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFI
CVAR (Flag, gl_texture_hqresize_textures, gl_texture_hqresize_targets, 1); CVAR (Flag, gl_texture_hqresize_textures, gl_texture_hqresize_targets, 1);
CVAR (Flag, gl_texture_hqresize_sprites, gl_texture_hqresize_targets, 2); CVAR (Flag, gl_texture_hqresize_sprites, gl_texture_hqresize_targets, 2);
CVAR (Flag, gl_texture_hqresize_fonts, gl_texture_hqresize_targets, 4); CVAR (Flag, gl_texture_hqresize_fonts, gl_texture_hqresize_targets, 4);
CVAR (Flag, gl_texture_hqresize_skins, gl_texture_hqresize_targets, 8);
CVAR(Bool, gl_texture_hqresize_multithread, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, gl_texture_hqresize_multithread, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);

6
src/gameconfigfile.cpp
View file

@ -71,6 +71,7 @@ EXTERN_CVAR (Bool, vid_scale_linear)
EXTERN_CVAR(Float, m_sensitivity_x) EXTERN_CVAR(Float, m_sensitivity_x)
EXTERN_CVAR(Float, m_sensitivity_y) EXTERN_CVAR(Float, m_sensitivity_y)
EXTERN_CVAR(Int, adl_volume_model) EXTERN_CVAR(Int, adl_volume_model)
EXTERN_CVAR (Int, gl_texture_hqresize_targets)
#ifdef _WIN32 #ifdef _WIN32
EXTERN_CVAR(Int, in_mouse) EXTERN_CVAR(Int, in_mouse)
@ -592,6 +593,11 @@ void FGameConfigFile::DoGlobalSetup ()
m_sensitivity_y = (float)yfact; m_sensitivity_y = (float)yfact;
adl_volume_model = 0; adl_volume_model = 0;
// if user originally wanted the in-game textures resized, set model skins to resize too
int old_targets = gl_texture_hqresize_targets;
old_targets |= (old_targets & 1) ? 8 : 0;
gl_texture_hqresize_targets = old_targets;
} }
} }
} }

2
src/rendering/hwrenderer/hw_models.cpp
View file

@ -114,7 +114,7 @@ void FHWModelRenderer::SetInterpolation(double inter)
void FHWModelRenderer::SetMaterial(FGameTexture *skin, bool clampNoFilter, int translation) void FHWModelRenderer::SetMaterial(FGameTexture *skin, bool clampNoFilter, int translation)
{ {
state.SetMaterial(skin, UF_None, 0, clampNoFilter ? CLAMP_NOFILTER : CLAMP_NONE, translation, -1); state.SetMaterial(skin, UF_Skin, 0, clampNoFilter ? CLAMP_NOFILTER : CLAMP_NONE, translation, -1);
state.SetLightIndex(modellightindex); state.SetLightIndex(modellightindex);
} }

1
wadsrc/static/menudef.txt
View file

@ -2585,6 +2585,7 @@ OptionMenu "GLTextureGLOptions" protected
Option "$GLTEXMNU_RESIZETEX", gl_texture_hqresize_textures, "OnOff" Option "$GLTEXMNU_RESIZETEX", gl_texture_hqresize_textures, "OnOff"
Option "$GLTEXMNU_RESIZESPR", gl_texture_hqresize_sprites, "OnOff" Option "$GLTEXMNU_RESIZESPR", gl_texture_hqresize_sprites, "OnOff"
Option "$GLTEXMNU_RESIZEFNT", gl_texture_hqresize_fonts, "OnOff" Option "$GLTEXMNU_RESIZEFNT", gl_texture_hqresize_fonts, "OnOff"
Option "$GLTEXMNU_RESIZESKN", gl_texture_hqresize_skins, "OnOff"
Option "$GLTEXMNU_PRECACHETEX", gl_precache, "YesNo" Option "$GLTEXMNU_PRECACHETEX", gl_precache, "YesNo"
Option "$GLTEXMNU_SORTDRAWLIST", gl_sort_textures, "YesNo" Option "$GLTEXMNU_SORTDRAWLIST", gl_sort_textures, "YesNo"
Class "GLTextureGLOptions" Class "GLTextureGLOptions"