added a firstvertex parameter to R_Mesh_DrawMesh

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 88f5a9558ab9b6c67747c7e3fe826475bf7124a1..0ab9c19d7920551f53f81998164008b92526dea3 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;
 
@@ -264,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)
@@ -306,6 +318,8 @@ cachepic_t  *Draw_CachePic (char *path)
                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"))
@@ -321,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);
@@ -463,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);
 
@@ -488,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)
@@ -545,7 +559,7 @@ void R_DrawQueue(void)
                                        if (batchcount >= 128)
                                        {
                                                GL_LockArrays(0, batchcount * 4);
-                                               R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+                                               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
                                                GL_LockArrays(0, 0);
                                                batchcount = 0;
                                                at = varray_texcoord2f[0];
@@ -557,7 +571,7 @@ void R_DrawQueue(void)
                        if (batchcount > 0)
                        {
                                GL_LockArrays(0, batchcount * 4);
-                               R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+                               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
                                GL_LockArrays(0, 0);
                        }
                        break;
@@ -571,7 +585,7 @@ void R_DrawQueue(void)
                                m.pointer_texcoord[0] = NULL;
                        R_Mesh_State(&m);
                        GL_LockArrays(0, mesh->num_vertices);
-                       R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+                       R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
                        GL_LockArrays(0, 0);
                        break;
                case DRAWQUEUE_SETCLIP:
@@ -579,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);
@@ -591,7 +605,7 @@ void R_DrawQueue(void)
                        break;
                case DRAWQUEUE_RESETCLIP:
                        GL_ScissorTest(false);
-                       break;                          
+                       break;
                }
        }
 
@@ -617,7 +631,7 @@ void R_DrawQueue(void)
                        while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
                        {
                                GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
-                               R_Mesh_Draw(3, 1, polygonelements);
+                               R_Mesh_Draw(0, 3, 1, polygonelements);
                                VectorScale(c, 0.5, c);
                        }
                }
@@ -633,7 +647,7 @@ void R_DrawQueue(void)
                {
                        GL_BlendFunc(GL_ONE, GL_ONE);
                        GL_Color(c[0], c[1], c[2], 1);
-                       R_Mesh_Draw(3, 1, polygonelements);
+                       R_Mesh_Draw(0, 3, 1, polygonelements);
                }
        }
 }