Merge branch 'master' into DefaultUser/func_button_relay

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / slider_picmip.qc

diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc
index 7c1dec045e0c46c65574f0589c80c842a06f409e..c0b03af57df5afea037fda43c2953ad794ed596b 100644 (file)
--- a/qcsrc/menu/xonotic/slider_picmip.qc
+++ b/qcsrc/menu/xonotic/slider_picmip.qc
@@ -1,16 +1,5 @@
-#ifndef SLIDER_PICMIP_H
-#define SLIDER_PICMIP_H
-#include "textslider.qc"
-CLASS(XonoticPicmipSlider, XonoticTextSlider)
-       METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity));
-       METHOD(XonoticPicmipSlider, draw, void(entity));
-       METHOD(XonoticPicmipSlider, autofix, void(entity));
-       ATTRIB(XonoticPicmipSlider, have_s3tc, float, 0)
-ENDCLASS(XonoticPicmipSlider)
-entity makeXonoticPicmipSlider(); // note: you still need to call addValue and configureXonoticTextSliderValues!
-#endif
+#include "slider_picmip.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticPicmipSlider()
 {
        entity me;
@@ -20,7 +9,8 @@ entity makeXonoticPicmipSlider()
 }
 void XonoticPicmipSlider_configureXonoticPicmipSlider(entity me)
 {
-       me.configureXonoticTextSlider(me, "gl_picmip");
+       me.configureXonoticTextSlider(me, "gl_picmip",
+               _("Change the sharpness of the textures. Lowering it will effectively reduce texture memory usage, but make the textures appear very blurry."));
        me.autofix(me);
        me.have_s3tc = GL_Have_TextureCompression();
 }
@@ -28,8 +18,8 @@ float texmemsize(float s3tc)
 {
        return
        (
-                 2500 * pow(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
-               + 1500 * pow(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_world")))
+                 2500 * (0.25 ** max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
+               + 1500 * (0.25 ** max(0, cvar("gl_picmip") + cvar("gl_picmip_world")))
        ) * ((s3tc && (cvar("r_texture_dds_load") || cvar("gl_texturecompression"))) ? 0.2 : 1.0); // TC: normalmaps 50%, other 25%, few incompressible, guessing 40% as conservative average
 }
 void XonoticPicmipSlider_autofix(entity me)
@@ -52,4 +42,3 @@ void XonoticPicmipSlider_draw(entity me)
        me.autofix(me);
        SUPER(XonoticPicmipSlider).draw(me);
 }
-#endif