diff --git a/source/build/include/build.h b/source/build/include/build.h index 6d3549eca..d0b8e7350 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -706,8 +706,6 @@ enum { extern int32_t gltexmaxsize; -EXTERN_CVAR(Bool, hw_detailmapping) -EXTERN_CVAR(Bool, hw_glowmapping) EXTERN_CVAR(Bool, hw_animsmoothing) EXTERN_CVAR(Bool, hw_hightile) EXTERN_CVAR(Bool, hw_models) diff --git a/source/build/src/mdsprite.cpp b/source/build/src/mdsprite.cpp index 34f6eb048..e052ddda9 100644 --- a/source/build/src/mdsprite.cpp +++ b/source/build/src/mdsprite.cpp @@ -1478,21 +1478,6 @@ static int32_t polymost_md3draw(md3model_t *m, tspriteptr_t tspr) FGameTexture *det = nullptr, *glow = nullptr; float detscale = 1.f; -#if 0 - // The data lookup here is one incredible mess. Thanks to whoever cooked this up... :( - // Todo: assign the layers to the base textures at setup time - if (!(tspr->clipdist & TSPR_FLAGS_MDHACK)) - { - det = tex = hw_detailmapping ? mdloadskin((md2model_t *) m, tile2model[Ptile2tile(tspr->picnum, lpal)].skinnum, DETAILPAL, surfi, nullptr) : nullptr; - if (det) - { - for (auto sk = m->skinmap; sk; sk = sk->next) - if ((int32_t) sk->palette == DETAILPAL && sk->skinnum == tile2model[Ptile2tile(tspr->picnum, lpal)].skinnum && sk->surfnum == surfi) - detscale = sk->param; - } - glow = hw_glowmapping ? mdloadskin((md2model_t *) m, tile2model[Ptile2tile(tspr->picnum, lpal)].skinnum, GLOWPAL, surfi, nullptr) : 0; - } -#endif int palid = TRANSLATION(Translation_Remap + curbasepal, globalpal); GLInterface.SetFade(sector[tspr->sectnum].floorpal); GLInterface.SetTexture(tex, palid, CLAMP_XY); diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index ac0c82394..ddb3cc397 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -25,8 +25,6 @@ Ken Silverman's official web site: http://www.advsys.net/ken int checkTranslucentReplacement(FTextureID picnum, int pal); -CVAR(Bool, hw_detailmapping, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Bool, hw_glowmapping, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVARD(Bool, hw_animsmoothing, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "enable/disable model animation smoothing") CVARD(Bool, hw_hightile, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "enable/disable hightile texture rendering") CVARD(Bool, hw_models, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "enable/disable model rendering") diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 64bdaa581..f48a3073e 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1184,9 +1184,6 @@ OptionMenu "PolymostOptions" Option "$POLYMOST_TC", "hw_hightile", "OnOff" Option "$POLYMOST_CACHE", "r_precache", "OnOff" StaticText "" - Option "$POLYMOST_DETAIL", "hw_detailmapping", "OnOff", "hw_hightile" - Option "$POLYMOST_GLOW", "hw_glowmapping", "OnOff", "hw_hightile" - StaticText "" Option "$POLYMOST_PALETTEEMU", "hw_useindexedcolortextures", "OnOff" Option "$POLYMOST_PALINTER", "hw_shadeinterpolate", "OnOff", "hw_useindexedcolortextures" StaticText ""