327

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 52ae5a6257d725ae3f560fadc381e864484282dc..336912a1be04020649fb70f95660914bc177dbd0 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "wad.h"
+
 
 static rtexture_t *char_texture;
 
@@ -34,6 +36,41 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
+static qbyte concharimage[11356] =
+{
+#include "lhfont.h"
+};
+
+extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
+
+static rtexture_t *draw_generateconchars(void)
+{
+       int i;
+       qbyte buffer[65536][4], *data = NULL;
+
+       fs_filesize = 11356;
+       data = LoadTGA (concharimage, 256, 256);
+       fs_filesize = -1;
+
+       for (i = 0;i < 32768;i++)
+       {
+               buffer[i][0] = 255;
+               buffer[i][1] = 255;
+               buffer[i][2] = 255;
+               buffer[i][3] = data[i*4+0];
+       }
+
+       for (i = 32768;i < 65536;i++)
+       {
+               buffer[i][0] = 255;
+               buffer[i][1] = 0;
+               buffer[i][2] = 0;
+               buffer[i][3] = data[i*4+0];
+       }
+       Mem_Free(data);
+       return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
 static qbyte pointerimage[256] =
 {
        "333333332......."
@@ -266,6 +303,9 @@ cachepic_t  *Draw_CachePic (char *path)
                                pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
                }
        }
+
+       if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
+               pic->tex = draw_generateconchars();
        if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
                pic->tex = draw_generatemousepointer();
        if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
@@ -418,7 +458,19 @@ void R_DrawQueue(void)
                        quadelements[pos++] = num + 3;
                }
        }
-       qglViewport(0, 0, vid.realwidth, vid.realheight);
+
+       r_view_width = bound(0, r_refdef.width, vid.realwidth);
+       r_view_height = bound(0, r_refdef.height, vid.realheight);
+       r_view_depth = 1;
+       r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width);
+       r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height);
+       r_view_z = 0;
+       r_view_fov_x = bound(1, r_refdef.fov_x, 170);
+       r_view_fov_y = bound(1, r_refdef.fov_y, 170);
+       r_view_matrix = r_refdef.viewentitymatrix;
+       GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
+
+       qglViewport(r_view_x, vid.realheight - (r_view_y + r_view_height), r_view_width, r_view_height);
        GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
        qglDepthFunc(GL_LEQUAL);
        R_Mesh_Matrix(&r_identitymatrix);