From: Rudolf Polzer Date: Fri, 10 Sep 2010 15:59:46 +0000 (+0200) Subject: also fix picmip directly on startup X-Git-Tag: xonotic-v0.1.0preview~315^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68303f81304d173a2b54e156aa5fdabbc5282ed5;p=xonotic%2Fxonotic-data.pk3dir.git also fix picmip directly on startup --- diff --git a/qcsrc/menu/xonotic/slider_picmip.c b/qcsrc/menu/xonotic/slider_picmip.c index 752987889..e906242fe 100644 --- a/qcsrc/menu/xonotic/slider_picmip.c +++ b/qcsrc/menu/xonotic/slider_picmip.c @@ -2,6 +2,7 @@ CLASS(XonoticPicmipSlider) EXTENDS(XonoticTextSlider) METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity)) METHOD(XonoticPicmipSlider, draw, void(entity)) + METHOD(XonoticPicmipSlider, autofix, void(entity)) ENDCLASS(XonoticPicmipSlider) entity makeXonoticPicmipSlider(); // note: you still need to call addValue and configureXonoticTextSliderValues! #endif @@ -17,6 +18,7 @@ entity makeXonoticPicmipSlider() void XonoticPicmipSlider_configureXonoticPicmipSlider(entity me) { me.configureXonoticTextSlider(me, "gl_picmip"); + me.autofix(me); } float texmemsize() { @@ -26,7 +28,7 @@ float texmemsize() + 1500 * pow(0.5, max(0, cvar("gl_picmip") + cvar("gl_picmip_world"))) ) * ((cvar("r_texture_dds_load") || cvar("gl_texturecompression")) ? 0.4 : 1.0); // TC: normalmaps 50%, other 25%, few incompressible, guessing 40% as conservative average } -void XonoticPicmipSlider_draw(entity me) +void XonoticPicmipSlider_autofix(entity me) { float max_hard, max_soft; max_hard = cvar("sys_memsize_virtual"); @@ -38,6 +40,10 @@ void XonoticPicmipSlider_draw(entity me) } // TODO also check the soft limit! // TODO better handling than clamping the slider! +} +void XonoticPicmipSlider_draw(entity me) +{ + me.autofix(me); SUPER(XonoticPicmipSlider).draw(me); } #endif