diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index 9b7516c2a..b736beeae 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/src/gl/compatibility/gl_20.cpp @@ -94,7 +94,30 @@ void gl_PatchMenu() if (gl_lightmode == 2 || gl_lightmode == 8) gl_lightmode = 3; if (gl_fogmode == 2) gl_fogmode = 1; - // todo: remove more unsupported stuff like postprocessing options. + // remove more unsupported stuff like postprocessing options. + // This cannot be done with a menu filter because the renderer gets initialized long after the menu is set up. + DMenuDescriptor **desc = MenuDescriptors.CheckKey("OpenGLOptions"); + if (desc != nullptr && (*desc)->IsKindOf(RUNTIME_CLASS(DOptionMenuDescriptor))) + { + auto md = static_cast(*desc); + for (int i = md->mItems.Size() - 1; i >= 0; i--) + { + if (!stricmp(md->mItems[i]->mAction.GetChars(), "gl_multisample") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_tonemap") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_bloom") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_lens") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_ssao") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_ssao_portals") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_fxaa") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_paltonemap_powtable") || + !stricmp(md->mItems[i]->mAction.GetChars(), "vr_mode") || + !stricmp(md->mItems[i]->mAction.GetChars(), "vr_enable_quadbuffered") || + !stricmp(md->mItems[i]->mAction.GetChars(), "gl_paltonemap_reverselookup")) + { + md->mItems.Delete(i); + } + } + } } diff --git a/src/gl/stereo3d/gl_stereo_cvars.cpp b/src/gl/stereo3d/gl_stereo_cvars.cpp index fe5ae3261..201e33590 100644 --- a/src/gl/stereo3d/gl_stereo_cvars.cpp +++ b/src/gl/stereo3d/gl_stereo_cvars.cpp @@ -67,6 +67,8 @@ void Stereo3DMode::setCurrentMode(const Stereo3DMode& mode) { /* static */ const Stereo3DMode& Stereo3DMode::getCurrentMode() { + if (gl.legacyMode) vr_mode = 0; // GL 2 does not support this feature. + // NOTE: Ensure that these vr_mode values correspond to the ones in wadsrc/static/menudef.z switch (vr_mode) { diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 0e0e9831d..1a4a97148 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2642,7 +2642,8 @@ MUSIC_DM2INT = "dm2int"; // GZDoom exclusive: -DSPLYMNU_GLOPT = "OpenGL Options"; +DSPLYMNU_GLOPT = "OpenGL Renderer"; +DSPLYMNU_SWOPT = "Software Renderer"; DSPLYMNU_GAMMA = "Gamma correction"; DSPLYMNU_CONTRAST ="Contrast"; DSPLYMNU_HWGAMMA = "Hardware Gamma"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index ad96a2155..b36572891 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -690,13 +690,6 @@ OptionValue GPUSwitch 2.0, "$OPTVAL_INTEGRATED" } -OptionMenu "OpenGLOptions" -{ - Title "$GLMNU_TITLE" - Submenu "$GLMNU_DYNLIGHT", "GLLightOptions" - Submenu "$GLMNU_TEXOPT", "GLTextureGLOptions" - Submenu "$GLMNU_PREFS", "GLPrefOptions" -} OptionMenu "TrueColorOptions" { @@ -709,12 +702,24 @@ OptionMenu "TrueColorOptions" Option "$TCMNU_DYNLIGHTS", "r_dynlights", "OnOff" } +OptionMenu "SWROptions" +{ + Title "$DSPLYMNU_SWOPT" + Submenu "$DSPLYMNU_TCOPT", "TrueColorOptions" + Option "$DSPLYMNU_BLENDMETHOD", "r_blendmethod", "BlendMethods" + StaticText " " + Option "$DSPLYMNU_SKYMODE", "r_skymode", "SkyModes" + Option "$DSPLYMNU_LINEARSKY", "r_linearsky", "OnOff" + Option "$DSPLYMNU_GZDFULLBRIGHT", "r_fullbrightignoresectorcolor", "OnOff" +} + OptionMenu "VideoOptions" { Title "$DSPLYMNU_TITLE" Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions" - Submenu "$DSPLYMNU_TCOPT", "TrueColorOptions" + Submenu "$DSPLYMNU_SWOPT", "SWROptions" + Submenu "$GLMNU_DYNLIGHT", "GLLightOptions" Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions" StaticText " " Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0 @@ -729,7 +734,6 @@ OptionMenu "VideoOptions" Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 2 Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2 Slider "$DSPLYMNU_WATERFADE", "underwater_fade_scalar", 0.0, 1.0, 0.05, 2 - Option "$DSPLYMNU_BLENDMETHOD", "r_blendmethod", "BlendMethods" StaticText " " Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes" @@ -737,13 +741,8 @@ OptionMenu "VideoOptions" IfOption(Windows) { Option "$DSPLYMNU_SHOWENDOOM", "showendoom", "Endoom" - //Option "$DSPLYMNU_PALLETEHACK", "vid_palettehack", "OnOff" - //Option "$DSPLYMNU_ATTACHEDSURFACES", "vid_attachedsurfaces", "OnOff" } - Option "$DSPLYMNU_SKYMODE", "r_skymode", "SkyModes" - Option "$DSPLYMNU_LINEARSKY", "r_linearsky", "OnOff" - Option "$DSPLYMNU_GZDFULLBRIGHT", "r_fullbrightignoresectorcolor", "OnOff" Option "$DSPLYMNU_DRAWFUZZ", "r_drawfuzz", "Fuzziness" Slider "$DSPLYMNU_TRANSSOUL", "transsouls", 0.25, 1.0, 0.05, 2 Option "$DSPLYMNU_FAKECONTRAST", "r_fakecontrast", "Contrast" @@ -1916,3 +1915,271 @@ OptionValue ExtraTicMode 1, "1" 2, "$OPTVAL_ALLUNACKNOWLEDGED" } + +OptionValue "LookupOrder" +{ + 0, "$OPTVAL_OBVERSEFIRST" + 1, "$OPTVAL_REVERSEFIRST" +} + +OptionValue "SpriteclipModes" +{ + 0, "$OPTVAL_NEVER" + 1, "$OPTVAL_SMART" + 2, "$OPTVAL_ALWAYS" + 3, "$OPTVAL_SMARTER" +} + +OptionValue "EnhancedStealth" +{ + 0, "$OPTVAL_NEVER" + 1, "$OPTVAL_INFRAREDONLY" + 2, "$OPTVAL_INFRAREDANDTORCH" + 3, "$OPTVAL_ANYFIXEDCOLORMAP" +} + +OptionValue "FilterModes" +{ + 0, "$OPTVAL_NONE" + 1, "$OPTVAL_NONENEARESTMIPMAP" + 5, "$OPTVAL_NONELINEARMIPMAP" + 6, "$OPTVAL_NONETRILINEAR" + 2, "$OPTVAL_LINEAR" + 3, "$OPTVAL_BILINEAR" + 4, "$OPTVAL_TRILINEAR" +} + +OptionValue "HWGammaModes" +{ + 0, "$OPTVAL_ON" + 1, "$OPTVAL_OFF" + 2, "$OPTVAL_FULLSCREENONLY" +} + +OptionValue "TonemapModes" +{ + 0, "$OPTVAL_OFF" + 1, "$OPTVAL_UNCHARTED2" + 2, "$OPTVAL_HEJLDAWSON" + 3, "$OPTVAL_REINHARD" + 4, "$OPTVAL_LINEAR" + 5, "$OPTVAL_PALETTE" +} + +OptionValue "SSAOModes" +{ + 0, "$OPTVAL_OFF" + 1, "$OPTVAL_LOW" + 2, "$OPTVAL_MEDIUM" + 3, "$OPTVAL_HIGH" +} + +OptionValue "FXAAQuality" +{ + 0, "$OPTVAL_OFF" + 1, "$OPTVAL_LOW" + 2, "$OPTVAL_MEDIUM" + 3, "$OPTVAL_HIGH" + 4, "$OPTVAL_EXTREME" +} + +OptionValue "TextureFormats" +{ + 0, "$OPTVAL_RGBA8" + 1, "$OPTVAL_RGB5A1" + 2, "$OPTVAL_RGBA4" + 3, "$OPTVAL_RGBA2" + // [BB] Added modes for texture compression. + 4, "$OPTVAL_COMPRRGBA" + 5, "$OPTVAL_S3TCDXT1" + 6, "$OPTVAL_S3TCDXT3" + 7, "$OPTVAL_S3TCDXT5" +} + +OptionValue "Anisotropy" +{ + 1, "$OPTVAL_OFF" + 2, "$OPTVAL_2X" + 4, "$OPTVAL_4X" + 8, "$OPTVAL_8X" + 16, "$OPTVAL_16X" +} + +OptionValue "Multisample" +{ + 1, "$OPTVAL_OFF" + 2, "$OPTVAL_2X" + 4, "$OPTVAL_4X" + 8, "$OPTVAL_8X" + 16, "$OPTVAL_16X" + 32, "$OPTVAL_32X" +} + +OptionValue "Colormaps" +{ + 0, "$OPTVAL_USEASPALETTE" + 1, "$OPTVAL_BLEND" +} + +OptionValue "LightingModes" +{ + 0, "$OPTVAL_STANDARD" + 1, "$OPTVAL_BRIGHT" + 2, "$OPTVAL_DOOM" + 3, "$OPTVAL_DARK" + 4, "$OPTVAL_LEGACY" + 8, "$OPTVAL_SOFTWARE" +} + +OptionValue "Precision" +{ + 0, "$OPTVAL_SPEED" + 1, "$OPTVAL_QUALITY" +} + + +OptionValue "Hz" +{ + 0, "$OPTVAL_OPTIMAL" + 60, "$OPTVAL_60" + 70, "$OPTVAL_70" + 72, "$OPTVAL_72" + 75, "$OPTVAL_75" + 85, "$OPTVAL_85" + 100, "$OPTVAL_100" +} + +OptionValue "BillboardModes" +{ + 0, "$OPTVAL_YAXIS" + 1, "$OPTVAL_XYAXIS" +} + + +OptionValue "Particles" +{ + 0, "$OPTVAL_SQUARE" + 1, "$OPTVAL_ROUND" + 2, "$OPTVAL_SMOOTH" +} + +OptionValue "HqResizeModes" +{ + 0, "$OPTVAL_OFF" + 1, "$OPTVAL_SCALE2X" + 2, "$OPTVAL_SCALE3X" + 3, "$OPTVAL_SCALE4X" + 4, "$OPTVAL_HQ2X" + 5, "$OPTVAL_HQ3X" + 6, "$OPTVAL_HQ4X" + 7, "$OPTVAL_HQ2XMMX" + 8, "$OPTVAL_HQ3XMMX" + 9, "$OPTVAL_HQ4XMMX" + 10, "xBRZ 2x" + 11, "xBRZ 3x" + 12, "xBRZ 4x" + 13, "xBRZ_old 2x" + 14, "xBRZ_old 3x" + 15, "xBRZ_old 4x" +} + +OptionValue "FogMode" +{ + 0, "$OPTVAL_OFF" + 1, "$OPTVAL_STANDARD" + 2, "$OPTVAL_RADIAL" +} + +OptionValue "FuzzStyle" +{ + 0, "$OPTVAL_SHADOW" + 1, "$OPTVAL_PIXELFUZZ" + 2, "$OPTVAL_SMOOTHFUZZ" + 3, "$OPTVAL_SWIRLYFUZZ" + 4, "$OPTVAL_TRANSLUCENTFUZZ" + 6, "$OPTVAL_NOISE" + 7, "$OPTVAL_SMOOTHNOISE" + //5, "$OPTVAL_JAGGEDFUZZ" I can't see any difference between this and 4 so it's disabled for now. +} + +OptionValue VRMode +{ + 0, "$OPTVAL_NORMAL" + 1, "$OPTVAL_GREENMAGENTA" + 2, "$OPTVAL_REDCYAN" + 9, "$OPTVAL_AMBERBLUE" + 3, "$OPTVAL_SBSFULL" + 4, "$OPTVAL_SBSNARROW" + 11, "$OPTVAL_TOPBOTTOM" + 12, "$OPTVAL_ROWINTERLEAVED" + 13, "$OPTVAL_COLUMNINTERLEAVED" + 14, "$OPTVAL_CHECKERBOARD" + 5, "$OPTVAL_LEFTEYE" + 6, "$OPTVAL_RIGHTEYE" + 7, "$OPTVAL_QUADBUFFERED" +} + +OptionMenu "GLTextureGLOptions" +{ + Title "$GLTEXMNU_TITLE" + Option "$GLTEXMNU_TEXENABLED", gl_texture, "YesNo" + Option "$GLTEXMNU_TEXFILTER", gl_texture_filter, "FilterModes" + Option "$GLTEXMNU_ANISOTROPIC", gl_texture_filter_anisotropic, "Anisotropy" + Option "$GLTEXMNU_TEXFORMAT", gl_texture_format, "TextureFormats" + Option "$GLTEXMNU_ENABLEHIRES", gl_texture_usehires, "YesNo" + Option "$GLTEXMNU_HQRESIZE", gl_texture_hqresize, "HqResizeModes" + Option "$GLTEXMNU_RESIZETEX", gl_texture_hqresize_textures, "OnOff" + Option "$GLTEXMNU_RESIZESPR", gl_texture_hqresize_sprites, "OnOff" + Option "$GLTEXMNU_RESIZEFNT", gl_texture_hqresize_fonts, "OnOff" + Option "$GLTEXMNU_PRECACHETEX", gl_precache, "YesNo" + Option "$GLTEXMNU_TRIMSPREDGE", gl_trimsprites, "OnOff" + Option "$GLTEXMNU_SORTDRAWLIST", gl_sort_textures, "YesNo" +} + +OptionMenu "GLLightOptions" +{ + Title "$GLLIGHTMNU_TITLE" + Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "YesNo" + Option "$GLLIGHTMNU_LIGHTDEFS", gl_attachedlights, "YesNo" + Option "$GLLIGHTMNU_CLIPLIGHTS", gl_lights_checkside, "YesNo" + Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo" + Option "$GLLIGHTMNU_LIGHTPARTICLES", gl_light_particles, "YesNo" + Option "$GLLIGHTMNU_LIGHTSHADOWMAP", gl_light_shadowmap, "YesNo" +} + +OptionMenu "OpenGLOptions" +{ + Title "$GLMNU_TITLE" + Submenu "$GLMNU_TEXOPT", "GLTextureGLOptions" + StaticText " " + Option "$GLPREFMNU_SECLIGHTMODE", gl_lightmode, "LightingModes" + Option "$GLPREFMNU_SWLMBANDED", gl_bandedswlight, "OnOff" + Option "$GLPREFMNU_FOGMODE", gl_fogmode, "FogMode" + Option "$GLPREFMNU_FOGFORCEFULLBRIGHT", gl_brightfog, "YesNo" + Slider "$GLPREFMNU_WPNLIGHTSTR", gl_weaponlight, 0,32, 2 + Option "$GLPREFMNU_ENVIRONMENTMAPMIRROR", gl_mirror_envmap, "OnOff" + Option "$GLPREFMNU_ENV", gl_enhanced_nightvision, "OnOff" + Option "$GLPREFMNU_ENVSTEALTH", gl_enhanced_nv_stealth, "EnhancedStealth" + Option "$GLPREFMNU_SPRBRIGHTFOG", gl_spritebrightfog, "OnOff" + Option "$GLPREFMNU_SPRCLIP", gl_spriteclip, "SpriteclipModes" + Option "$GLPREFMNU_SPRBLEND", gl_sprite_blend, "OnOff" + Option "$GLPREFMNU_FUZZSTYLE", gl_fuzztype, "FuzzStyle" + Option "$GLPREFMNU_SPRBILLBOARD", gl_billboard_mode, "BillboardModes" + Option "$GLPREFMNU_SPRBILLFACECAMERA", gl_billboard_faces_camera, "OnOff" + Option "$GLPREFMNU_PARTICLESTYLE", gl_particles_style, "Particles" + Option "$GLPREFMNU_RENDERQUALITY", gl_render_precise, "Precision" + StaticText " " + Option "$GLPREFMNU_VRMODE", vr_mode, "VRMode" + Option "$GLPREFMNU_VRQUADSTEREO", vr_enable_quadbuffered, "OnOff" + StaticText " " + Option "$GLPREFMNU_MULTISAMPLE", gl_multisample, "Multisample" + Option "$GLPREFMNU_TONEMAP", gl_tonemap, "TonemapModes" + Option "$GLPREFMNU_BLOOM", gl_bloom, "OnOff" + Option "$GLPREFMNU_LENS", gl_lens, "OnOff" + Option "$GLPREFMNU_SSAO", gl_ssao, "SSAOModes" + Slider "$GLPREFMNU_SSAO_PORTALS", gl_ssao_portals, 0.0, 4.0, 1.0, 0 + Option "$GLPREFMNU_FXAA", gl_fxaa, "FXAAQuality" + StaticText " " + Slider "$GLPREFMNU_PALTONEMAPPOWER", gl_paltonemap_powtable, 0.2, 3.0, 0.1, 1 + Option "$GLPREFMNU_PALTONEMAPORDER", gl_paltonemap_reverselookup, "LookupOrder" +} diff --git a/wadsrc/static/menudef.zz b/wadsrc/static/menudef.zz deleted file mode 100644 index 054c5ac67..000000000 --- a/wadsrc/static/menudef.zz +++ /dev/null @@ -1,263 +0,0 @@ -OptionValue "LookupOrder" -{ - 0, "$OPTVAL_OBVERSEFIRST" - 1, "$OPTVAL_REVERSEFIRST" -} - -OptionValue "SpriteclipModes" -{ - 0, "$OPTVAL_NEVER" - 1, "$OPTVAL_SMART" - 2, "$OPTVAL_ALWAYS" - 3, "$OPTVAL_SMARTER" -} - -OptionValue "EnhancedStealth" -{ - 0, "$OPTVAL_NEVER" - 1, "$OPTVAL_INFRAREDONLY" - 2, "$OPTVAL_INFRAREDANDTORCH" - 3, "$OPTVAL_ANYFIXEDCOLORMAP" -} - -OptionValue "FilterModes" -{ - 0, "$OPTVAL_NONE" - 1, "$OPTVAL_NONENEARESTMIPMAP" - 5, "$OPTVAL_NONELINEARMIPMAP" - 6, "$OPTVAL_NONETRILINEAR" - 2, "$OPTVAL_LINEAR" - 3, "$OPTVAL_BILINEAR" - 4, "$OPTVAL_TRILINEAR" -} - -OptionValue "HWGammaModes" -{ - 0, "$OPTVAL_ON" - 1, "$OPTVAL_OFF" - 2, "$OPTVAL_FULLSCREENONLY" -} - -OptionValue "TonemapModes" -{ - 0, "$OPTVAL_OFF" - 1, "$OPTVAL_UNCHARTED2" - 2, "$OPTVAL_HEJLDAWSON" - 3, "$OPTVAL_REINHARD" - 4, "$OPTVAL_LINEAR" - 5, "$OPTVAL_PALETTE" -} - -OptionValue "SSAOModes" -{ - 0, "$OPTVAL_OFF" - 1, "$OPTVAL_LOW" - 2, "$OPTVAL_MEDIUM" - 3, "$OPTVAL_HIGH" -} - -OptionValue "FXAAQuality" -{ - 0, "$OPTVAL_OFF" - 1, "$OPTVAL_LOW" - 2, "$OPTVAL_MEDIUM" - 3, "$OPTVAL_HIGH" - 4, "$OPTVAL_EXTREME" -} - -OptionValue "TextureFormats" -{ - 0, "$OPTVAL_RGBA8" - 1, "$OPTVAL_RGB5A1" - 2, "$OPTVAL_RGBA4" - 3, "$OPTVAL_RGBA2" - // [BB] Added modes for texture compression. - 4, "$OPTVAL_COMPRRGBA" - 5, "$OPTVAL_S3TCDXT1" - 6, "$OPTVAL_S3TCDXT3" - 7, "$OPTVAL_S3TCDXT5" -} - -OptionValue "Anisotropy" -{ - 1, "$OPTVAL_OFF" - 2, "$OPTVAL_2X" - 4, "$OPTVAL_4X" - 8, "$OPTVAL_8X" - 16, "$OPTVAL_16X" -} - -OptionValue "Multisample" -{ - 1, "$OPTVAL_OFF" - 2, "$OPTVAL_2X" - 4, "$OPTVAL_4X" - 8, "$OPTVAL_8X" - 16, "$OPTVAL_16X" - 32, "$OPTVAL_32X" -} - -OptionValue "Colormaps" -{ - 0, "$OPTVAL_USEASPALETTE" - 1, "$OPTVAL_BLEND" -} - -OptionValue "LightingModes" -{ - 0, "$OPTVAL_STANDARD" - 1, "$OPTVAL_BRIGHT" - 2, "$OPTVAL_DOOM" - 3, "$OPTVAL_DARK" - 4, "$OPTVAL_LEGACY" - 8, "$OPTVAL_SOFTWARE" -} - -OptionValue "Precision" -{ - 0, "$OPTVAL_SPEED" - 1, "$OPTVAL_QUALITY" -} - - -OptionValue "Hz" -{ - 0, "$OPTVAL_OPTIMAL" - 60, "$OPTVAL_60" - 70, "$OPTVAL_70" - 72, "$OPTVAL_72" - 75, "$OPTVAL_75" - 85, "$OPTVAL_85" - 100, "$OPTVAL_100" -} - -OptionValue "BillboardModes" -{ - 0, "$OPTVAL_YAXIS" - 1, "$OPTVAL_XYAXIS" -} - - -OptionValue "Particles" -{ - 0, "$OPTVAL_SQUARE" - 1, "$OPTVAL_ROUND" - 2, "$OPTVAL_SMOOTH" -} - -OptionValue "HqResizeModes" -{ - 0, "$OPTVAL_OFF" - 1, "$OPTVAL_SCALE2X" - 2, "$OPTVAL_SCALE3X" - 3, "$OPTVAL_SCALE4X" - 4, "$OPTVAL_HQ2X" - 5, "$OPTVAL_HQ3X" - 6, "$OPTVAL_HQ4X" - 7, "$OPTVAL_HQ2XMMX" - 8, "$OPTVAL_HQ3XMMX" - 9, "$OPTVAL_HQ4XMMX" - 10, "xBRZ 2x" - 11, "xBRZ 3x" - 12, "xBRZ 4x" - 13, "xBRZ_old 2x" - 14, "xBRZ_old 3x" - 15, "xBRZ_old 4x" -} - -OptionValue "FogMode" -{ - 0, "$OPTVAL_OFF" - 1, "$OPTVAL_STANDARD" - 2, "$OPTVAL_RADIAL" -} - -OptionValue "FuzzStyle" -{ - 0, "$OPTVAL_SHADOW" - 1, "$OPTVAL_PIXELFUZZ" - 2, "$OPTVAL_SMOOTHFUZZ" - 3, "$OPTVAL_SWIRLYFUZZ" - 4, "$OPTVAL_TRANSLUCENTFUZZ" - 6, "$OPTVAL_NOISE" - 7, "$OPTVAL_SMOOTHNOISE" - //5, "$OPTVAL_JAGGEDFUZZ" I can't see any difference between this and 4 so it's disabled for now. -} - -OptionValue VRMode -{ - 0, "$OPTVAL_NORMAL" - 1, "$OPTVAL_GREENMAGENTA" - 2, "$OPTVAL_REDCYAN" - 9, "$OPTVAL_AMBERBLUE" - 3, "$OPTVAL_SBSFULL" - 4, "$OPTVAL_SBSNARROW" - 11, "$OPTVAL_TOPBOTTOM" - 12, "$OPTVAL_ROWINTERLEAVED" - 13, "$OPTVAL_COLUMNINTERLEAVED" - 14, "$OPTVAL_CHECKERBOARD" - 5, "$OPTVAL_LEFTEYE" - 6, "$OPTVAL_RIGHTEYE" - 7, "$OPTVAL_QUADBUFFERED" -} - -OptionMenu "GLTextureGLOptions" -{ - Title "$GLTEXMNU_TITLE" - Option "$GLTEXMNU_TEXENABLED", gl_texture, "YesNo" - Option "$GLTEXMNU_TEXFILTER", gl_texture_filter, "FilterModes" - Option "$GLTEXMNU_ANISOTROPIC", gl_texture_filter_anisotropic, "Anisotropy" - Option "$GLTEXMNU_TEXFORMAT", gl_texture_format, "TextureFormats" - Option "$GLTEXMNU_ENABLEHIRES", gl_texture_usehires, "YesNo" - Option "$GLTEXMNU_HQRESIZE", gl_texture_hqresize, "HqResizeModes" - Option "$GLTEXMNU_RESIZETEX", gl_texture_hqresize_textures, "OnOff" - Option "$GLTEXMNU_RESIZESPR", gl_texture_hqresize_sprites, "OnOff" - Option "$GLTEXMNU_RESIZEFNT", gl_texture_hqresize_fonts, "OnOff" - Option "$GLTEXMNU_PRECACHETEX", gl_precache, "YesNo" - Option "$GLTEXMNU_TRIMSPREDGE", gl_trimsprites, "OnOff" - Option "$GLTEXMNU_SORTDRAWLIST", gl_sort_textures, "YesNo" -} - -OptionMenu "GLLightOptions" -{ - Title "$GLLIGHTMNU_TITLE" - Option "$GLLIGHTMNU_LIGHTSENABLED", gl_lights, "YesNo" - Option "$GLLIGHTMNU_LIGHTDEFS", gl_attachedlights, "YesNo" - Option "$GLLIGHTMNU_CLIPLIGHTS", gl_lights_checkside, "YesNo" - Option "$GLLIGHTMNU_LIGHTSPRITES", gl_light_sprites, "YesNo" - Option "$GLLIGHTMNU_LIGHTPARTICLES", gl_light_particles, "YesNo" - Option "$GLLIGHTMNU_LIGHTSHADOWMAP", gl_light_shadowmap, "YesNo" -} - -OptionMenu "GLPrefOptions" -{ - Title "$GLPREFMNU_TITLE" - Option "$GLPREFMNU_SECLIGHTMODE", gl_lightmode, "LightingModes" - Option "$GLPREFMNU_SWLMBANDED", gl_bandedswlight, "OnOff" - Option "$GLPREFMNU_FOGMODE", gl_fogmode, "FogMode" - Option "$GLPREFMNU_FOGFORCEFULLBRIGHT", gl_brightfog, "YesNo" - Slider "$GLPREFMNU_WPNLIGHTSTR", gl_weaponlight, 0,32, 2 - Option "$GLPREFMNU_ENVIRONMENTMAPMIRROR", gl_mirror_envmap, "OnOff" - Option "$GLPREFMNU_ENV", gl_enhanced_nightvision, "OnOff" - Option "$GLPREFMNU_ENVSTEALTH", gl_enhanced_nv_stealth, "EnhancedStealth" - Option "$GLPREFMNU_SPRBRIGHTFOG", gl_spritebrightfog, "OnOff" - Option "$GLPREFMNU_SPRCLIP", gl_spriteclip, "SpriteclipModes" - Option "$GLPREFMNU_SPRBLEND", gl_sprite_blend, "OnOff" - Option "$GLPREFMNU_FUZZSTYLE", gl_fuzztype, "FuzzStyle" - Option "$GLPREFMNU_SPRBILLBOARD", gl_billboard_mode, "BillboardModes" - Option "$GLPREFMNU_SPRBILLFACECAMERA", gl_billboard_faces_camera, "OnOff" - Option "$GLPREFMNU_PARTICLESTYLE", gl_particles_style, "Particles" - Option "$GLPREFMNU_RENDERQUALITY", gl_render_precise, "Precision" - Option "$GLPREFMNU_VRMODE", vr_mode, "VRMode" - Option "$GLPREFMNU_VRQUADSTEREO", vr_enable_quadbuffered, "OnOff" - Option "$GLPREFMNU_MULTISAMPLE", gl_multisample, "Multisample" - Option "$GLPREFMNU_TONEMAP", gl_tonemap, "TonemapModes" - Option "$GLPREFMNU_BLOOM", gl_bloom, "OnOff" - Option "$GLPREFMNU_LENS", gl_lens, "OnOff" - Option "$GLPREFMNU_SSAO", gl_ssao, "SSAOModes" - Slider "$GLPREFMNU_SSAO_PORTALS", gl_ssao_portals, 0.0, 4.0, 1.0, 0 - Option "$GLPREFMNU_FXAA", gl_fxaa, "FXAAQuality" - StaticText " " - Slider "$GLPREFMNU_PALTONEMAPPOWER", gl_paltonemap_powtable, 0.2, 3.0, 0.1, 1 - Option "$GLPREFMNU_PALTONEMAPORDER", gl_paltonemap_reverselookup, "LookupOrder" -} diff --git a/wadsrc/static/zscript/menu/optionmenuitems.txt b/wadsrc/static/zscript/menu/optionmenuitems.txt index c57391d44..2bbb4a82b 100644 --- a/wadsrc/static/zscript/menu/optionmenuitems.txt +++ b/wadsrc/static/zscript/menu/optionmenuitems.txt @@ -637,9 +637,9 @@ class OptionMenuSliderBase : OptionMenuItem int mDrawX; int mSliderShort; - protected void Init(String label, double min, double max, double step, int showval) + protected void Init(String label, double min, double max, double step, int showval, Name command = 'none') { - Super.Init(label, 'None'); + Super.Init(label, command); mMin = min; mMax = max; mStep = step; @@ -784,7 +784,7 @@ class OptionMenuItemSlider : OptionMenuSliderBase OptionMenuItemSlider Init(String label, Name command, double min, double max, double step, int showval = 1) { - Super.Init(label, min, max, step, showval); + Super.Init(label, min, max, step, showval, command); mCVar =CVar.FindCVar(command); return self; }