merged q1bsp and q3bsp surface rendering

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 3f2cddeefa3c3cc4f5b35cb1df2f401e81e64d62..e861f118b8b0d228627c967c77d23ed28ba6dbd9 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "wad.h"
+
+#include "cl_video.h"
+
 
 static rtexture_t *char_texture;
 
@@ -34,6 +38,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......."
@@ -229,6 +268,14 @@ cachepic_t *Draw_CachePic (char *path)
        cachepic_t *pic;
        qpic_t *p;
 
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+               clvideo_t *video;
+
+               video = CL_GetVideo(path);
+               if( video )
+                       return &video->cpif;
+       }
+
        crc = CRC_Block(path, strlen(path));
        hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
        for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -266,8 +313,13 @@ 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/prydoncursor001.tga"))
+               pic->tex = draw_generatemousepointer();
        if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
                pic->tex = draw_generatecrosshair(0);
        if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga"))
@@ -283,7 +335,7 @@ cachepic_t  *Draw_CachePic (char *path)
        if (pic->tex == NULL)
        {
                Con_Printf("Draw_CachePic: failed to load %s\n", path);
-               pic->tex = r_notexture;
+               pic->tex = r_texture_notexture;
        }
 
        pic->width = R_TextureWidth(pic->tex);
@@ -425,8 +477,8 @@ void R_DrawQueue(void)
        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_fov_x = bound(0.1, r_refdef.fov_x, 170);
+       r_view_fov_y = bound(0.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);
 
@@ -450,7 +502,7 @@ void R_DrawQueue(void)
        {
                dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
                color = dq->color;
-               
+
                if(dq->flags == DRAWFLAG_ADDITIVE)
                        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
                else if(dq->flags == DRAWFLAG_MODULATE)
@@ -541,7 +593,7 @@ void R_DrawQueue(void)
                                // We have to convert the con coords into real coords
                                int x , y, width, height;
                                x = dq->x * ((float)vid.realwidth / vid.conwidth);
-                               // OGL uses top to bottom 
+                               // OGL uses top to bottom
                                y = dq->y * ((float) vid.realheight / vid.conheight);
                                width = dq->scalex * ((float)vid.realwidth / vid.conwidth);
                                height = dq->scaley * ((float)vid.realheight / vid.conheight);
@@ -553,7 +605,7 @@ void R_DrawQueue(void)
                        break;
                case DRAWQUEUE_RESETCLIP:
                        GL_ScissorTest(false);
-                       break;                          
+                       break;
                }
        }