added cl_screen.c/h (eventually most 2D stuff should be moved here)

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index a628b71d6aa96c301baacfd98aaf1aec6f2f2a61..6ab2619a0871efd27893fc29e70590f34689a663 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -5,162 +5,40 @@ cvar_t crosshair_alpha = {CVAR_SAVE, "crosshair_alpha", "1.0"};
 cvar_t crosshair_flashspeed = {CVAR_SAVE, "crosshair_flashspeed", "2"};
 cvar_t crosshair_flashrange = {CVAR_SAVE, "crosshair_flashrange", "0.1"};
 
+// must match NUMCROSSHAIRS in gl_draw.c
 #define NUMCROSSHAIRS 5
 
-static rtexturepool_t *crosshairtexturepool;
-
-static rtexture_t *crosshairtex[NUMCROSSHAIRS];
-
-static byte *crosshairtexdata[NUMCROSSHAIRS] =
-{
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0003300000033000"
-       "0003550000553000"
-       "0000577007750000"
-       "0000077007700000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000077007700000"
-       "0000577007750000"
-       "0003550000553000"
-       "0003300000033000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       ,
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0003000000003000"
-       "0000500000050000"
-       "0000070000700000"
-       "0000007007000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000007007000000"
-       "0000070000700000"
-       "0000500000050000"
-       "0003000000003000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       ,
-       "0000000000000000"
-       "0000000770000000"
-       "0000000770000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000440000000"
-       "0000000440000000"
-       "0770044004400770"
-       "0770044004400770"
-       "0000000440000000"
-       "0000000440000000"
-       "0000000000000000"
-       "0000000770000000"
-       "0000000770000000"
-       "0000000000000000"
-       "0000000000000000"
-       ,
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000077777770"
-       "0000000075200000"
-       "0000000072000000"
-       "0000000070000000"
-       "0000000070000000"
-       "0000000070000000"
-       "0000000000000000"
-       "0000000000000000"
-       ,
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000070000000"
-       "0000000000000000"
-       "0000000040000000"
-       "0000070404070000"
-       "0000000040000000"
-       "0000000000000000"
-       "0000000070000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-       "0000000000000000"
-};
-
-static void crosshairload(int num, byte *in)
-{
-       int i;
-       byte data[16*16][4];
-       for (i = 0;i < 16*16;i++)
-       {
-               data[i][0] = data[i][1] = data[i][2] = 255;
-               data[i][3] = (in[i] - '0') * 255 / 7;
-       }
-       crosshairtex[num] = R_LoadTexture(crosshairtexturepool, va("crosshair%02d", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
-}
-
-static void r_crosshairs_start(void)
-{
-       int i;
-       crosshairtexturepool = R_AllocTexturePool();
-       for (i = 0;i < NUMCROSSHAIRS;i++)
-               crosshairload(i, crosshairtexdata[i]);
-//     crosshairtex[1] = crosshairload(crosshairtex2);
-}
-
-static void r_crosshairs_shutdown(void)
-{
-       R_FreeTexturePool(&crosshairtexturepool);
-}
-
-static void r_crosshairs_newmap(void)
-{
-}
-
 void R_Crosshairs_Init(void)
 {
        Cvar_RegisterVariable(&crosshair_brightness);
        Cvar_RegisterVariable(&crosshair_alpha);
        Cvar_RegisterVariable(&crosshair_flashspeed);
        Cvar_RegisterVariable(&crosshair_flashrange);
-       R_RegisterModule("R_Crosshairs", r_crosshairs_start, r_crosshairs_shutdown, r_crosshairs_newmap);
 }
 
 void DrawCrosshair(int num)
 {
+       int i;
        byte *color;
        float scale, base;
        if (num < 0 || num >= NUMCROSSHAIRS)
                num = 0;
        if (cl.viewentity)
        {
-               int i = (cl.scores[cl.viewentity-1].colors & 0xF) << 4;
+               i = (cl.scores[cl.viewentity-1].colors & 0xF) << 4;
                if (i >= 208 && i < 224) // blue
                        i += 8;
                else if (i < 128 || i >= 224) // 128-224 are backwards ranges (bright to dark, rather than dark to bright)
                        i += 15;
-               color = (byte *) &d_8to24table[i];
        }
        else
-               color = (byte *) &d_8to24table[15];
+               i = 15;
+       color = (byte *) &d_8to24table[i];
        if (crosshair_flashspeed.value >= 0.01f)
-//             scale = (sin(realtime * crosshair_flashspeed.value * (M_PI*2.0f)) * crosshair_flashrange.value + 1.0f) * (1.0f / 255.0f);
                base = (sin(realtime * crosshair_flashspeed.value * (M_PI*2.0f)) * crosshair_flashrange.value);
        else
                base = 0.0f;
-       scale = crosshair_brightness.value / 255.0f;
-       Draw_GenericPic(crosshairtex[num], color[0] * scale + base, color[1] * scale + base, color[2] * scale + base, crosshair_alpha.value, vid.conwidth * 0.5f - 8.0f, vid.conheight * 0.5f - 8.0f, 16.0f, 16.0f);
+       scale = crosshair_brightness.value * (1.0f / 255.0f);
+       DrawQ_Pic(vid.conwidth * 0.5f - 8.0f, vid.conheight * 0.5f - 8.0f, va("gfx/crosshair%i.tga", num + 1), 16.0f, 16.0f, color[0] * scale + base, color[1] * scale + base, color[2] * scale + base, crosshair_alpha.value, 0);
 }