moved SCR_UpdateScreen and SCR_DrawScreen code to cl_screen.c and rearranged them...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 21 Mar 2006 02:23:27 +0000 (02:23 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 21 Mar 2006 02:23:27 +0000 (02:23 +0000)
moved DrawQ_ functions to gl_draw.c and eliminated r_refdef.drawqueue (this saves some memory and makes all the 2D code more efficient)
disabled unused R_Mesh_CacheArray stuff in gl_backend.c

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6151 d7cf8633-e32d-0410-b094-e92efae38249

cl_main.c
cl_screen.c
cl_screen.h
client.h
draw.h
gl_backend.c
gl_backend.h
gl_draw.c
todo

index 8a12110..d677dbb 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -1719,10 +1719,6 @@ void CL_Init (void)
        // max entities sent to renderer per frame
        r_refdef.maxentities = MAX_EDICTS + 256 + 512;
        r_refdef.entities = (entity_render_t **)Mem_Alloc(cls.mempool, sizeof(entity_render_t *) * r_refdef.maxentities);
-       // 256k drawqueue buffer
-       // TODO: make dynamic
-       r_refdef.maxdrawqueuesize = 256 * 1024;
-       r_refdef.drawqueue = (unsigned char *)Mem_Alloc(cls.mempool, r_refdef.maxdrawqueuesize);
 
        CL_InitInput ();
 
index 5eafdbe..d8f34cc 100644 (file)
@@ -1,6 +1,7 @@
 
 #include "quakedef.h"
 #include "cl_video.h"
+#include "image.h"
 #include "jpeg.h"
 #include "cl_collision.h"
 #include "csprogs.h"
@@ -10,7 +11,8 @@ cvar_t scr_fov = {CVAR_SAVE, "fov","90", "field of vision, 1-170 degrees, defaul
 cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900", "speed of console open/close"}; // LordHavoc: quake used 300
 cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background"};
 cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2", "brightness of console background (0 = black, 1 = image)"};
-cvar_t scr_conforcewhiledisconnected = {CVAR_SAVE, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"};
+cvar_t scr_conforcewhiledisconnected = {0, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"};
+cvar_t scr_menuforcewhiledisconnected = {0, "scr_menuforcewhiledisconnected", "1", "forces menu while disconnected"};
 cvar_t scr_centertime = {0, "scr_centertime","2", "how long centerprint messages show"};
 cvar_t scr_showram = {CVAR_SAVE, "showram","1", "show ram icon if low on surface cache memory (not used)"};
 cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0", "show turtle icon when framerate is too low (not used)"};
@@ -29,8 +31,17 @@ cvar_t cl_capturevideo_sound = {0, "cl_capturevideo_sound", "0", "enables saving
 cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30", "how many frames per second to save (29.97 for NTSC, 30 for typical PC video, 15 can be useful)"};
 cvar_t cl_capturevideo_rawrgb = {0, "cl_capturevideo_rawrgb", "0", "saves a single .rgb video file containing raw RGB images (you'll need special processing tools to encode this to something more useful)"};
 cvar_t cl_capturevideo_rawyv12 = {0, "cl_capturevideo_rawyv12", "0", "saves a single .yv12 video file containing raw YV12 (luma plane, then half resolution chroma planes, first chroma blue then chroma red, this is the format used internally by many encoders, some tools can read it directly)"};
-cvar_t r_textshadow = {0, "r_textshadow", "0", "draws a shadow on all text to improve readability"};
 cvar_t r_letterbox = {0, "r_letterbox", "0", "reduces vertical height of view to simulate a letterboxed movie effect (can be used by mods for cutscenes)"};
+cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation of eyes in the world (try negative values too)"};
+cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views (for those who can't afford glasses but can afford eye strain)"};
+cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"};
+cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"};
+cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"};
+cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0", "displays a zoomed in overlay window"};
+cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20", "horizontal viewsize of zoom window"};
+cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", "vertical viewsize of zoom window"};
+cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"};
+
 
 int jpeg_supported = false;
 
@@ -47,114 +58,6 @@ static void R_Envmap_f (void);
 // backend
 void R_ClearScreen(void);
 
-// color tag printing
-static vec4_t string_colors[] =
-{
-       // Quake3 colors
-       // LordHavoc: why on earth is cyan before magenta in Quake3?
-       // LordHavoc: note: Doom3 uses white for [0] and [7]
-       {0.0, 0.0, 0.0, 1.0}, // black
-       {1.0, 0.0, 0.0, 1.0}, // red
-       {0.0, 1.0, 0.0, 1.0}, // green
-       {1.0, 1.0, 0.0, 1.0}, // yellow
-       {0.0, 0.0, 1.0, 1.0}, // blue
-       {0.0, 1.0, 1.0, 1.0}, // cyan
-       {1.0, 0.0, 1.0, 1.0}, // magenta
-       {1.0, 1.0, 1.0, 1.0}, // white
-       // [515]'s BX_COLOREDTEXT extension
-       {1.0, 1.0, 1.0, 0.5}, // half transparent
-       {0.5, 0.5, 0.5, 1.0}  // half brightness
-       // Black's color table
-       //{1.0, 1.0, 1.0, 1.0},
-       //{1.0, 0.0, 0.0, 1.0},
-       //{0.0, 1.0, 0.0, 1.0},
-       //{0.0, 0.0, 1.0, 1.0},
-       //{1.0, 1.0, 0.0, 1.0},
-       //{0.0, 1.0, 1.0, 1.0},
-       //{1.0, 0.0, 1.0, 1.0},
-       //{0.1, 0.1, 0.1, 1.0}
-};
-
-#define STRING_COLORS_COUNT    (sizeof(string_colors) / sizeof(vec4_t))
-
-// color is read and changed in the end
-void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor )
-{
-       vec_t *color;
-       int len;
-       int colorindex;
-       const char *start, *current;
-
-       if( !outcolor || *outcolor == -1 ) {
-               colorindex = STRING_COLOR_DEFAULT;
-       } else {
-               colorindex = *outcolor;
-       }
-       color = string_colors[colorindex];
-
-       if( maxlen < 1)
-               len = (int)strlen( text );
-       else
-               len = min( maxlen, (int) strlen( text ) );
-
-       start = current = text;
-       while( len > 0 ) {
-               // check for color control char
-               if( *current == STRING_COLOR_TAG ) {
-                       // get next char
-                       current++;
-                       len--;
-                       if( len == 0 ) {
-                               break;
-                       }
-                       // display the tag char?
-                       if( *current == STRING_COLOR_TAG ) {
-                               // only display one of the two
-                               start = current;
-                               // get the next char
-                               current++;
-                               len--;
-                       } else if( '0' <= *current && *current <= '9' ) {
-                               colorindex = 0;
-                               do {
-                                       colorindex = colorindex * 10 + (*current - '0');
-                                       // only read as long as it makes a valid index
-                                       if( colorindex >= (int)STRING_COLORS_COUNT ) {
-                                               // undo the last operation
-                                               colorindex /= 10;
-                                               break;
-                                       }
-                                       current++;
-                                       len--;
-                               } while( len > 0 && '0' <= *current && *current <= '9' );
-                               // set the color
-                               color = string_colors[colorindex];
-                               // we jump over the color tag
-                               start = current;
-                       }
-               }
-               // go on and read normal text in until the next control char
-               while( len > 0 && *current != STRING_COLOR_TAG ) {
-                       current++;
-                       len--;
-               }
-               // display the text
-               if( start != current ) {
-                       // draw the string
-                       DrawQ_String( x, y, start, current - start, scalex, scaley, basered * color[0], basegreen * color[1], baseblue * color[2], basealpha * color[3], flags );
-                       // update x to be at the new start position
-                       x += (current - start) * scalex;
-                       // set start accordingly
-                       start = current;
-               }
-       }
-
-       // return the last colorindex
-       if( outcolor ) {
-               *outcolor = colorindex;
-       }
-}
-
 /*
 ===============================================================================
 
@@ -424,10 +327,21 @@ void SCR_SetUpToDrawConsole (void)
 {
        // lines of console to display
        float conlines;
+       static int framecounter = 0;
 
        Con_CheckResize ();
 
-       if (key_dest == key_game && cls.signon != SIGNONS && scr_conforcewhiledisconnected.integer)
+       if (scr_menuforcewhiledisconnected.integer && key_dest == key_game && cls.state == ca_disconnected)
+       {
+               if (framecounter >= 2)
+                       MR_ToggleMenu_f();
+               else
+                       framecounter++;
+       }
+       else
+               framecounter = 0;
+
+       if (scr_conforcewhiledisconnected.integer && key_dest == key_game && cls.signon != SIGNONS)
                key_consoleactive |= KEY_CONSOLEACTIVE_FORCED;
        else
                key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED;
@@ -514,7 +428,7 @@ void R_TimeReport(char *desc)
        qglFinish();
        r_timereport_temp = r_timereport_current;
        r_timereport_current = Sys_DoubleTime();
-       t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0);
+       t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0 + 0.5);
 
        dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %-11s", t, desc);
        length = (int)strlen(tempbuf);
@@ -523,17 +437,8 @@ void R_TimeReport(char *desc)
                strlcat(r_speeds_string, "\n", sizeof(r_speeds_string));
                speedstringcount = 0;
        }
-       // skip the space at the beginning if it's the first on the line
-       if (speedstringcount == 0)
-       {
-               strlcat(r_speeds_string, tempbuf + 1, sizeof(r_speeds_string));
-               speedstringcount = length - 1;
-       }
-       else
-       {
-               strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string));
-               speedstringcount += length;
-       }
+       strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string));
+       speedstringcount += length;
 }
 
 void R_TimeReport_Frame(void)
@@ -543,9 +448,11 @@ void R_TimeReport_Frame(void)
        if (r_speeds_string[0])
        {
                if (r_timereport_active)
+               {
+                       r_timereport_current = r_timereport_start;
                        R_TimeReport("total");
+               }
 
-               r_timereport_current = r_timereport_start;
                if (r_speeds_string[strlen(r_speeds_string)-1] == '\n')
                        r_speeds_string[strlen(r_speeds_string)-1] = 0;
                lines = 1;
@@ -587,7 +494,7 @@ void R_TimeReport_Frame(void)
                if (r_speeds.integer >= 2)
                {
                        r_timereport_active = true;
-                       r_timereport_start = Sys_DoubleTime();
+                       r_timereport_start = r_timereport_current = Sys_DoubleTime();
                }
        }
 }
@@ -625,6 +532,7 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&scr_conalpha);
        Cvar_RegisterVariable (&scr_conbrightness);
        Cvar_RegisterVariable (&scr_conforcewhiledisconnected);
+       Cvar_RegisterVariable (&scr_menuforcewhiledisconnected);
        Cvar_RegisterVariable (&scr_showram);
        Cvar_RegisterVariable (&scr_showturtle);
        Cvar_RegisterVariable (&scr_showpause);
@@ -642,8 +550,16 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&cl_capturevideo_fps);
        Cvar_RegisterVariable (&cl_capturevideo_rawrgb);
        Cvar_RegisterVariable (&cl_capturevideo_rawyv12);
-       Cvar_RegisterVariable (&r_textshadow);
        Cvar_RegisterVariable (&r_letterbox);
+       Cvar_RegisterVariable(&r_stereo_separation);
+       Cvar_RegisterVariable(&r_stereo_sidebyside);
+       Cvar_RegisterVariable(&r_stereo_redblue);
+       Cvar_RegisterVariable(&r_stereo_redcyan);
+       Cvar_RegisterVariable(&r_stereo_redgreen);
+       Cvar_RegisterVariable(&scr_zoomwindow);
+       Cvar_RegisterVariable(&scr_zoomwindow_viewsizex);
+       Cvar_RegisterVariable(&scr_zoomwindow_viewsizey);
+       Cvar_RegisterVariable(&scr_zoomwindow_fov);
 
        Cmd_AddCommand ("sizeup",SCR_SizeUp_f, "increase view size (increases viewsize cvar)");
        Cmd_AddCommand ("sizedown",SCR_SizeDown_f, "decrease view size (decreases viewsize cvar)");
@@ -653,252 +569,6 @@ void CL_Screen_Init(void)
        scr_initialized = true;
 }
 
-void DrawQ_Clear(void)
-{
-       r_refdef.drawqueuesize = 0;
-}
-
-static int picelements[6] = {0, 1, 2, 0, 2, 3};
-void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
-{
-       DrawQ_SuperPic(x,y,pic,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
-}
-
-void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
-{
-       int size, len;
-       drawqueue_t *dq;
-       char *out;
-       if (alpha < (1.0f / 255.0f))
-               return;
-       if (maxlen < 1)
-               len = (int)strlen(string);
-       else
-               for (len = 0;len < maxlen && string[len];len++);
-       for (;len > 0 && string[0] == ' ';string++, x += scalex, len--);
-       for (;len > 0 && string[len - 1] == ' ';len--);
-       if (len < 1)
-               return;
-       if (x >= vid_conwidth.integer || y >= vid_conheight.integer || x < (-scalex * len) || y < (-scaley))
-               return;
-       size = sizeof(*dq) + ((len + 1 + 3) & ~3);
-       if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
-               return;
-       red = bound(0, red, 1);
-       green = bound(0, green, 1);
-       blue = bound(0, blue, 1);
-       alpha = bound(0, alpha, 1);
-       dq = (drawqueue_t *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = size;
-       dq->command = DRAWQUEUE_STRING;
-       dq->flags = flags;
-       dq->color = ((unsigned int) (red * 255.0f) << 24) | ((unsigned int) (green * 255.0f) << 16) | ((unsigned int) (blue * 255.0f) << 8) | ((unsigned int) (alpha * 255.0f));
-       dq->x = x;
-       dq->y = y;
-       dq->scalex = scalex;
-       dq->scaley = scaley;
-       out = (char *)(dq + 1);
-       memcpy(out, string, len);
-       out[len] = 0;
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
-{
-       if (r_textshadow.integer)
-               DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags);
-
-       DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags);
-}
-
-void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
-{
-       float floats[36];
-       drawqueuemesh_t mesh;
-       memset(&mesh, 0, sizeof(mesh));
-       if (pic)
-       {
-               if (width == 0)
-                       width = pic->width;
-               if (height == 0)
-                       height = pic->height;
-               mesh.texture = pic->tex;
-       }
-       mesh.num_triangles = 2;
-       mesh.num_vertices = 4;
-       mesh.data_element3i = picelements;
-       mesh.data_vertex3f = floats;
-       mesh.data_texcoord2f = floats + 12;
-       mesh.data_color4f = floats + 20;
-       memset(floats, 0, sizeof(floats));
-       mesh.data_vertex3f[0] = mesh.data_vertex3f[9] = x;
-       mesh.data_vertex3f[1] = mesh.data_vertex3f[4] = y;
-       mesh.data_vertex3f[3] = mesh.data_vertex3f[6] = x + width;
-       mesh.data_vertex3f[7] = mesh.data_vertex3f[10] = y + height;
-       mesh.data_texcoord2f[0] = s1;mesh.data_texcoord2f[1] = t1;mesh.data_color4f[ 0] = r1;mesh.data_color4f[ 1] = g1;mesh.data_color4f[ 2] = b1;mesh.data_color4f[ 3] = a1;
-       mesh.data_texcoord2f[2] = s2;mesh.data_texcoord2f[3] = t2;mesh.data_color4f[ 4] = r2;mesh.data_color4f[ 5] = g2;mesh.data_color4f[ 6] = b2;mesh.data_color4f[ 7] = a2;
-       mesh.data_texcoord2f[4] = s4;mesh.data_texcoord2f[5] = t4;mesh.data_color4f[ 8] = r4;mesh.data_color4f[ 9] = g4;mesh.data_color4f[10] = b4;mesh.data_color4f[11] = a4;
-       mesh.data_texcoord2f[6] = s3;mesh.data_texcoord2f[7] = t3;mesh.data_color4f[12] = r3;mesh.data_color4f[13] = g3;mesh.data_color4f[14] = b3;mesh.data_color4f[15] = a3;
-       DrawQ_Mesh (&mesh, flags);
-}
-
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
-{
-       int size;
-       void *p;
-       drawqueue_t *dq;
-       drawqueuemesh_t *m;
-       size = sizeof(*dq);
-       size += sizeof(drawqueuemesh_t);
-       size += sizeof(int[3]) * mesh->num_triangles;
-       size += sizeof(float[3]) * mesh->num_vertices;
-       size += sizeof(float[2]) * mesh->num_vertices;
-       size += sizeof(float[4]) * mesh->num_vertices;
-       if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
-               return;
-       dq = (drawqueue_t *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = size;
-       dq->command = DRAWQUEUE_MESH;
-       dq->flags = flags;
-       dq->color = 0;
-       dq->x = 0;
-       dq->y = 0;
-       dq->scalex = 0;
-       dq->scaley = 0;
-       p = (void *)(dq + 1);
-       m = (drawqueuemesh_t *)p;p = (unsigned char*)p + sizeof(drawqueuemesh_t);
-       m->num_triangles = mesh->num_triangles;
-       m->num_vertices = mesh->num_vertices;
-       m->texture = mesh->texture;
-       m->data_element3i  = (int *)p;memcpy(m->data_element3i , mesh->data_element3i , m->num_triangles * sizeof(int[3]));p = (unsigned char*)p + m->num_triangles * sizeof(int[3]);
-       m->data_vertex3f   = (float *)p;memcpy(m->data_vertex3f  , mesh->data_vertex3f  , m->num_vertices * sizeof(float[3]));p = (unsigned char*)p + m->num_vertices * sizeof(float[3]);
-       m->data_texcoord2f = (float *)p;memcpy(m->data_texcoord2f, mesh->data_texcoord2f, m->num_vertices * sizeof(float[2]));p = (unsigned char*)p + m->num_vertices * sizeof(float[2]);
-       m->data_color4f    = (float *)p;memcpy(m->data_color4f   , mesh->data_color4f   , m->num_vertices * sizeof(float[4]));p = (unsigned char*)p + m->num_vertices * sizeof(float[4]);
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
-{
-       int size;
-       void *p;
-       drawqueue_t *dq;
-       drawqueuemesh_t *m;
-       size = sizeof(*dq);
-       size += sizeof(drawqueuemesh_t);
-       size += sizeof(int[3]) * mesh->num_triangles;
-       size += sizeof(float[3]) * mesh->num_vertices;
-       size += sizeof(float[2]) * mesh->num_vertices;
-       size += sizeof(float[4]) * mesh->num_vertices;
-       if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize)
-               return;
-       dq = (void *)(r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = size;
-       dq->command = DRAWQUEUE_LINES;
-       dq->flags = flags;
-       dq->color = 0;
-       dq->x = 0;
-       dq->y = 0;
-       dq->scalex = 0;
-       dq->scaley = 0;
-       p = (void *)(dq + 1);
-       m = p;p = (unsigned char*)p + sizeof(drawqueuemesh_t);
-       m->num_triangles = mesh->num_triangles;
-       m->num_vertices = mesh->num_vertices;
-       m->texture = mesh->texture;
-       m->data_element3i  = p;memcpy(m->data_element3i , mesh->data_element3i , m->num_triangles * sizeof(int[3]));p = (unsigned char*)p + m->num_triangles * sizeof(int[3]);
-       m->data_vertex3f   = p;memcpy(m->data_vertex3f  , mesh->data_vertex3f  , m->num_vertices * sizeof(float[3]));p = (unsigned char*)p + m->num_vertices * sizeof(float[3]);
-       m->data_texcoord2f = p;memcpy(m->data_texcoord2f, mesh->data_texcoord2f, m->num_vertices * sizeof(float[2]));p = (unsigned char*)p + m->num_vertices * sizeof(float[2]);
-       m->data_color4f    = p;memcpy(m->data_color4f   , mesh->data_color4f   , m->num_vertices * sizeof(float[4]));p = (unsigned char*)p + m->num_vertices * sizeof(float[4]);
-       r_refdef.drawqueuesize += dq->size;
-}
-
-//LordHavoc: FIXME: this is nasty!
-void DrawQ_LineWidth (float width)
-{
-       drawqueue_t *dq;
-       static int linewidth = 1;
-       if(width == linewidth)
-               return;
-       linewidth = width;
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (void*) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_LINEWIDTH;
-       dq->x = width;
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
-//[515]: this is old, delete
-void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
-{
-       drawqueue_t *dq;
-       if(width > 0)
-               DrawQ_LineWidth(width);
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (void*) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_LINES;
-       dq->x = x1;
-       dq->y = y1;
-       dq->scalex = x2;
-       dq->scaley = y2;
-       dq->flags = flags;
-       dq->color =  ((unsigned int) (r * 255.0f) << 24) | ((unsigned int) (g * 255.0f) << 16) | ((unsigned int) (b * 255.0f) << 8) | ((unsigned int) (alpha * 255.0f));
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_SetClipArea(float x, float y, float width, float height)
-{
-       drawqueue_t * dq;
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (drawqueue_t *) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_SETCLIP;
-       dq->x = x;
-       dq->y = y;
-       dq->scalex = width;
-       dq->scaley = height;
-       dq->flags = 0;
-       dq->color = 0;
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
-void DrawQ_ResetClipArea(void)
-{
-       drawqueue_t *dq;
-       if(r_refdef.drawqueuesize + (int)sizeof(*dq) > r_refdef.maxdrawqueuesize)
-       {
-               Con_DPrint("DrawQueue full !\n");
-               return;
-       }
-       dq = (drawqueue_t *) (r_refdef.drawqueue + r_refdef.drawqueuesize);
-       dq->size = sizeof(*dq);
-       dq->command = DRAWQUEUE_RESETCLIP;
-       dq->x = 0;
-       dq->y = 0;
-       dq->scalex = 0;
-       dq->scaley = 0;
-       dq->flags = 0;
-       dq->color = 0;
-
-       r_refdef.drawqueuesize += dq->size;
-}
-
 /*
 ==================
 SCR_ScreenShot_f
@@ -1417,28 +1087,261 @@ void SHOWLMP_clear(void)
                showlmp[i].isactive = false;
 }
 
-void CL_SetupScreenSize(void)
+/*
+==============================================================================
+
+                                               SCREEN SHOTS
+
+==============================================================================
+*/
+
+qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect)
 {
-       float conwidth, conheight;
+       int     indices[3] = {0,1,2};
+       qboolean ret;
 
-       VID_UpdateGamma(false);
+       if (!r_render.integer)
+               return false;
 
-       conwidth = bound(320, vid_conwidth.value, 2048);
-       conheight = bound(200, vid_conheight.value, 1536);
-       if (vid_conwidth.value != conwidth)
-               Cvar_SetValue("vid_conwidth", conwidth);
-       if (vid_conheight.value != conheight)
-               Cvar_SetValue("vid_conheight", conheight);
+       qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
+       CHECKGLERROR
+
+       if (scr_screenshot_gamma.value != 1 && gammacorrect)
+       {
+               int i;
+               double igamma = 1.0 / scr_screenshot_gamma.value;
+               unsigned char ramp[256];
+               for (i = 0;i < 256;i++)
+                       ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0);
+               for (i = 0;i < width*height*3;i++)
+                       buffer1[i] = ramp[buffer1[i]];
+       }
 
-       vid_conwidth.integer = vid_conwidth.integer;
-       vid_conheight.integer = vid_conheight.integer;
+       Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices);
 
-       SCR_SetUpToDrawConsole();
+       if (jpeg)
+               ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2);
+       else
+               ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3);
+
+       return ret;
+}
+
+//=============================================================================
+
+void R_ClearScreen(void)
+{
+       if (r_render.integer)
+       {
+               // clear to black
+               if (fogenabled)
+                       qglClearColor(fogcolor[0],fogcolor[1],fogcolor[2],0);
+               else
+                       qglClearColor(0,0,0,0);
+               CHECKGLERROR
+               qglClearDepth(1);CHECKGLERROR
+               if (gl_stencil)
+               {
+                       // LordHavoc: we use a stencil centered around 128 instead of 0,
+                       // to avoid clamping interfering with strange shadow volume
+                       // drawing orders
+                       qglClearStencil(128);CHECKGLERROR
+               }
+               // clear the screen
+               GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0));
+               // set dithering mode
+               if (gl_dither.integer)
+               {
+                       qglEnable(GL_DITHER);CHECKGLERROR
+               }
+               else
+               {
+                       qglDisable(GL_DITHER);CHECKGLERROR
+               }
+       }
+}
+
+qboolean CL_VM_UpdateView (void);
+void SCR_DrawConsole (void);
+void R_Shadow_EditLights_DrawSelectedLightProperties(void);
+
+int r_stereo_side;
+
+void SCR_DrawScreen (void)
+{
+       R_Mesh_Start();
+
+       if (r_timereport_active)
+               R_TimeReport("setup");
+
+       if (cls.signon == SIGNONS)
+       {
+               float size;
+
+               size = scr_viewsize.value * (1.0 / 100.0);
+               size = min(size, 1);
+
+               if (r_stereo_sidebyside.integer)
+               {
+                       r_refdef.width = vid.width * size / 2.5;
+                       r_refdef.height = vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
+                       r_refdef.x = (vid.width - r_refdef.width * 2.5) * 0.5;
+                       r_refdef.y = (vid.height - r_refdef.height)/2;
+                       if (r_stereo_side)
+                               r_refdef.x += r_refdef.width * 1.5;
+               }
+               else
+               {
+                       r_refdef.width = vid.width * size;
+                       r_refdef.height = vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100);
+                       r_refdef.x = (vid.width - r_refdef.width)/2;
+                       r_refdef.y = (vid.height - r_refdef.height)/2;
+               }
+
+               // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
+               // LordHavoc: this is designed to produce widescreen fov values
+               // when the screen is wider than 4/3 width/height aspect, to do
+               // this it simply assumes the requested fov is the vertical fov
+               // for a 4x3 display, if the ratio is not 4x3 this makes the fov
+               // higher/lower according to the ratio
+               r_refdef.frustum_y = tan(scr_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+               r_refdef.frustum_x = r_refdef.frustum_y * (float)r_refdef.width / (float)r_refdef.height / vid_pixelheight.value;
+
+               r_refdef.frustum_x *= r_refdef.frustumscale_x;
+               r_refdef.frustum_y *= r_refdef.frustumscale_y;
+
+               if(!CL_VM_UpdateView())
+                       R_RenderView();
+               else
+                       SCR_DrawConsole();
+
+               if (scr_zoomwindow.integer)
+               {
+                       float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0;
+                       float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0;
+                       r_refdef.width = vid.width * sizex;
+                       r_refdef.height = vid.height * sizey;
+                       r_refdef.x = (vid.width - r_refdef.width)/2;
+                       r_refdef.y = 0;
+
+                       r_refdef.frustum_y = tan(scr_zoomwindow_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
+                       r_refdef.frustum_x = r_refdef.frustum_y * vid_pixelheight.value * (float)r_refdef.width / (float)r_refdef.height;
+
+                       r_refdef.frustum_x *= r_refdef.frustumscale_x;
+                       r_refdef.frustum_y *= r_refdef.frustumscale_y;
+
+                       if(!CL_VM_UpdateView())
+                               R_RenderView();
+               }
+       }
+
+       if (!r_stereo_sidebyside.integer)
+       {
+               r_refdef.width = vid.width;
+               r_refdef.height = vid.height;
+               r_refdef.x = 0;
+               r_refdef.y = 0;
+       }
+
+       // draw 2D stuff
+       DrawQ_Begin();
+
+       //FIXME: force menu if nothing else to look at?
+       //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
+
+       if (cls.signon == SIGNONS)
+       {
+               SCR_DrawNet ();
+               SCR_DrawTurtle ();
+               SCR_DrawPause ();
+               if (!r_letterbox.value)
+                       Sbar_Draw();
+               SHOWLMP_drawall();
+               SCR_CheckDrawCenterString();
+       }
+       MR_Draw();
+       CL_DrawVideo();
+       R_Shadow_EditLights_DrawSelectedLightProperties();
+
+       if(!csqc_loaded)
+               SCR_DrawConsole();
+
+       SCR_DrawBrand();
+
+       SCR_DrawDownload();
+
+       if (r_timereport_active)
+               R_TimeReport("2d");
+
+       if (cls.signon == SIGNONS)
+               R_TimeReport_Frame();
+
+       DrawQ_Finish();
+
+       R_DrawGamma();
+
+       R_Mesh_Finish();
+
+       if (r_timereport_active)
+               R_TimeReport("meshfinish");
+}
+
+void SCR_UpdateLoadingScreen (void)
+{
+       float x, y;
+       cachepic_t *pic;
+       rmeshstate_t m;
+       // don't do anything if not initialized yet
+       if (vid_hidden)
+               return;
+       r_showtrispass = 0;
+       VID_UpdateGamma(false);
+       qglViewport(0, 0, vid.width, vid.height);
+       //qglDisable(GL_SCISSOR_TEST);
+       //qglDepthMask(1);
+       qglColorMask(1,1,1,1);
+       //qglClearColor(0,0,0,0);
+       //qglClear(GL_COLOR_BUFFER_BIT);
+       //qglCullFace(GL_FRONT);
+       //qglDisable(GL_CULL_FACE);
+       //R_ClearScreen();
+       R_Textures_Frame();
+       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+       R_Mesh_Start();
+       R_Mesh_Matrix(&identitymatrix);
+       // draw the loading plaque
+       pic = Draw_CachePic("gfx/loading", false);
+       x = (vid_conwidth.integer - pic->width)/2;
+       y = (vid_conheight.integer - pic->height)/2;
+       GL_Color(1,1,1,1);
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthTest(false);
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = varray_vertex3f;
+       m.pointer_texcoord[0] = varray_texcoord2f[0];
+       m.tex[0] = R_GetTexture(pic->tex);
+       R_Mesh_State(&m);
+       varray_vertex3f[0] = varray_vertex3f[9] = x;
+       varray_vertex3f[1] = varray_vertex3f[4] = y;
+       varray_vertex3f[3] = varray_vertex3f[6] = x + pic->width;
+       varray_vertex3f[7] = varray_vertex3f[10] = y + pic->height;
+       varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0;
+       varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0;
+       varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1;
+       varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1;
+       R_Mesh_Draw(0, 4, 2, polygonelements);
+       R_Mesh_Finish();
+       // refresh
+       VID_Finish(false);
 }
 
-extern void R_Shadow_EditLights_DrawSelectedLightProperties(void);
 void CL_UpdateScreen(void)
 {
+       float conwidth, conheight;
+
+       if (vid_hidden)
+               return;
+
        if (!scr_initialized || !con_initialized || vid_hidden)
                return;                         // not initialized yet
 
@@ -1451,6 +1354,13 @@ void CL_UpdateScreen(void)
                        Cvar_Set ("r_ambient", "0");
        }
 
+       conwidth = bound(320, vid_conwidth.value, 2048);
+       conheight = bound(200, vid_conheight.value, 1536);
+       if (vid_conwidth.value != conwidth)
+               Cvar_SetValue("vid_conwidth", conwidth);
+       if (vid_conheight.value != conheight)
+               Cvar_SetValue("vid_conheight", conheight);
+
        // bound viewsize
        if (scr_viewsize.value < 30)
                Cvar_Set ("viewsize","30");
@@ -1463,6 +1373,16 @@ void CL_UpdateScreen(void)
        if (scr_fov.value > 170)
                Cvar_Set ("fov","170");
 
+       // validate r_textureunits cvar
+       if (r_textureunits.integer > gl_textureunits)
+               Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
+       if (r_textureunits.integer < 1)
+               Cvar_SetValueQuick(&r_textureunits, 1);
+
+       // validate gl_combine cvar
+       if (gl_combine.integer && !gl_combine_extension)
+               Cvar_SetValueQuick(&gl_combine, 0);
+
        // intermission is always full screen
        if (cl.intermission)
                sb_lines = 0;
@@ -1480,52 +1400,75 @@ void CL_UpdateScreen(void)
        r_refdef.colormask[1] = 1;
        r_refdef.colormask[2] = 1;
 
-       SCR_CaptureVideo();
-
        if (r_timereport_active)
                R_TimeReport("other");
 
-       CL_SetupScreenSize();
+       VID_UpdateGamma(false);
 
-       DrawQ_Clear();
+       SCR_SetUpToDrawConsole();
 
        if (r_timereport_active)
-               R_TimeReport("setup");
+               R_TimeReport("start");
 
-       //FIXME: force menu if nothing else to look at?
-       //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
+       r_showtrispass = 0;
 
-       if (cls.signon == SIGNONS)
-       {
-               SCR_DrawNet ();
-               SCR_DrawTurtle ();
-               SCR_DrawPause ();
-               if (!r_letterbox.value)
-                       Sbar_Draw();
-               SHOWLMP_drawall();
-               SCR_CheckDrawCenterString();
-       }
-       MR_Draw();
-       CL_DrawVideo();
-       if (cls.signon == SIGNONS)
+       CHECKGLERROR
+       qglViewport(0, 0, vid.width, vid.height);
+       qglDisable(GL_SCISSOR_TEST);
+       qglDepthMask(1);
+       qglColorMask(1,1,1,1);
+       qglClearColor(0,0,0,0);
+       qglClear(GL_COLOR_BUFFER_BIT);
+       CHECKGLERROR
+
+       if (r_timereport_active)
+               R_TimeReport("clear");
+
+       if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer)
        {
-               if (r_timereport_active)
-                       R_TimeReport("2d");
-               R_TimeReport_Frame();
-       }
-       R_Shadow_EditLights_DrawSelectedLightProperties();
+               matrix4x4_t originalmatrix = r_refdef.viewentitymatrix;
+               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1];
+               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[1][1];
+               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[2][1];
 
-       if(!csqc_loaded)
-               SCR_DrawConsole();
+               if (r_stereo_sidebyside.integer)
+                       r_stereo_side = 0;
 
-       SCR_DrawBrand();
+               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
+               {
+                       r_refdef.colormask[0] = 1;
+                       r_refdef.colormask[1] = 0;
+                       r_refdef.colormask[2] = 0;
+               }
 
-       SCR_DrawDownload();
+               SCR_DrawScreen();
 
-       if (r_timereport_active)
-               R_TimeReport("start");
+               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1];
+               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[1][1];
+               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[2][1];
+
+               if (r_stereo_sidebyside.integer)
+                       r_stereo_side = 1;
+
+               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
+               {
+                       r_refdef.colormask[0] = 0;
+                       r_refdef.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer;
+                       r_refdef.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer;
+               }
+
+               SCR_DrawScreen();
+
+               r_refdef.viewentitymatrix = originalmatrix;
+       }
+       else
+               SCR_DrawScreen();
+
+       SCR_CaptureVideo();
 
-       SCR_UpdateScreen();
+       VID_Finish(true);
+       if (r_timereport_active)
+               R_TimeReport("finish");
 }
 
 void CL_Screen_NewMap(void)
index 823003c..8cb32d4 100644 (file)
@@ -2,73 +2,6 @@
 #ifndef CL_SCREEN_H
 #define CL_SCREEN_H
 
-// drawqueue stuff for use by client to feed 2D art to renderer
-#define DRAWQUEUE_STRING 0
-#define DRAWQUEUE_MESH 1
-#define DRAWQUEUE_SETCLIP 2
-#define DRAWQUEUE_RESETCLIP 3
-#define DRAWQUEUE_LINEWIDTH 4
-#define DRAWQUEUE_LINES 5
-
-typedef struct drawqueue_s
-{
-       unsigned short size;
-       unsigned char command, flags;
-       unsigned int color;
-       float x, y, scalex, scaley;
-}
-drawqueue_t;
-
-// a triangle mesh... embedded in the drawqueue
-// each vertex is 4 floats (3 are used)
-// each texcoord is 4 floats (3 are used)
-// each color is 4 floats (4 are used)
-typedef struct drawqueuemesh_s
-{
-       rtexture_t *texture;
-       int num_triangles;
-       int num_vertices;
-       int *data_element3i;
-       float *data_vertex3f;
-       float *data_texcoord2f;
-       float *data_color4f;
-}
-drawqueuemesh_t;
-
-enum drawqueue_drawflag_e {
-DRAWFLAG_NORMAL,
-DRAWFLAG_ADDITIVE,
-DRAWFLAG_MODULATE,
-DRAWFLAG_2XMODULATE,
-DRAWFLAG_NUMFLAGS
-};
-
-// shared color tag printing constants
-#define STRING_COLOR_TAG                       '^'
-#define STRING_COLOR_DEFAULT           7
-#define STRING_COLOR_DEFAULT_STR       "^7"
-
-// clear the draw queue
-void DrawQ_Clear(void);
-// draw an image (or a filled rectangle if pic == NULL)
-void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags);
-// draw a text string
-void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags);
-// draw a text string that supports color tags (colorindex can either be NULL, -1 to make it choose the default color or valid index to start with)
-void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor );
-// draw a very fancy pic (per corner texcoord/color control), the order is tl, tr, bl, br
-void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
-// draw a triangle mesh
-void DrawQ_Mesh(drawqueuemesh_t *mesh, int flags);
-// set the clipping area
-void DrawQ_SetClipArea(float x, float y, float width, float height);
-// reset the clipping area
-void DrawQ_ResetClipArea(void);
-// draw a line
-void DrawQ_Line(float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags);
-// draw a line loop
-void DrawQ_LineLoop(drawqueuemesh_t *mesh, int flags);
-
 void SHOWLMP_decodehide(void);
 void SHOWLMP_decodeshow(void);
 void SHOWLMP_drawall(void);
index 17bb541..88b9e71 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1130,11 +1130,7 @@ typedef struct refdef_s
        // controls intensity of dynamic lights and lightmap layers
        unsigned short  lightstylevalue[256];   // 8.8 fraction of base light value
 
-       // 2D art drawing queue
-       // TODO: get rid of this
-       unsigned char *drawqueue;
-       int drawqueuesize;
-       int maxdrawqueuesize;
+       qboolean draw2dstage;
 }
 refdef_t;
 
diff --git a/draw.h b/draw.h
index 5fe0b8b..e185a69 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -45,7 +45,59 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
 // free the texture memory used by a pic
 void Draw_FreePic(const char *picname);
 
-void R_DrawQueue(void);
+// a triangle mesh..
+// each vertex is 3 floats
+// each texcoord is 2 floats
+// each color is 4 floats
+typedef struct drawqueuemesh_s
+{
+       rtexture_t *texture;
+       int num_triangles;
+       int num_vertices;
+       int *data_element3i;
+       float *data_vertex3f;
+       float *data_texcoord2f;
+       float *data_color4f;
+}
+drawqueuemesh_t;
+
+enum drawqueue_drawflag_e {
+DRAWFLAG_NORMAL,
+DRAWFLAG_ADDITIVE,
+DRAWFLAG_MODULATE,
+DRAWFLAG_2XMODULATE,
+DRAWFLAG_NUMFLAGS
+};
+
+// shared color tag printing constants
+#define STRING_COLOR_TAG                       '^'
+#define STRING_COLOR_DEFAULT           7
+#define STRING_COLOR_DEFAULT_STR       "^7"
+
+// sets r_defdef.draw2dstage and prepares for 2D rendering
+void DrawQ_Begin(void);
+// draw an image (or a filled rectangle if pic == NULL)
+void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags);
+// draw a text string
+void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags);
+// draw a text string that supports color tags (colorindex can either be NULL, -1 to make it choose the default color or valid index to start with)
+void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor );
+// draw a very fancy pic (per corner texcoord/color control), the order is tl, tr, bl, br
+void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
+// draw a triangle mesh
+void DrawQ_Mesh(drawqueuemesh_t *mesh, int flags);
+// set the clipping area
+void DrawQ_SetClipArea(float x, float y, float width, float height);
+// reset the clipping area
+void DrawQ_ResetClipArea(void);
+// draw a line
+void DrawQ_Line(float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags);
+// draw a line loop
+void DrawQ_LineLoop(drawqueuemesh_t *mesh, int flags);
+// resets r_refdef.draw2dstage
+void DrawQ_Finish(void);
+
+void R_DrawGamma(void);
 
 #endif
 
index 0b7121d..11d3ac0 100644 (file)
@@ -1,7 +1,5 @@
 
 #include "quakedef.h"
-#include "image.h"
-#include "jpeg.h"
 #include "cl_collision.h"
 
 cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1", "use glDrawRangeElements function if available instead of glDrawElements (for performance comparisons or bug testing)"};
@@ -9,11 +7,6 @@ cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0", "use glBe
 cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0", "use glBegin(GL_TRIANGLES);glTexCoord2f();glVertex3f();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
 cvar_t gl_paranoid = {0, "gl_paranoid", "0", "enables OpenGL error checking and other tests"};
 cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0", "prints all OpenGL error checks, useful to identify location of driver crashes"};
-cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation of eyes in the world (try negative values too)"};
-cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views (for those who can't afford glasses but can afford eye strain)"};
-cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"};
-cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"};
-cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"};
 
 cvar_t r_render = {0, "r_render", "1", "enables rendering calls (you want this on!)"};
 cvar_t r_waterwarp = {CVAR_SAVE, "r_waterwarp", "1", "warp view while underwater"};
@@ -139,18 +132,25 @@ for (y = 0;y < rows - 1;y++)
 }
 */
 
-int polygonelements[768];
+int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
+int quadelements[QUADELEMENTS_MAXQUADS*6];
 
+#if 0
 static void R_Mesh_CacheArray_Startup(void);
 static void R_Mesh_CacheArray_Shutdown(void);
+#endif
 void GL_Backend_AllocArrays(void)
 {
+#if 0
        R_Mesh_CacheArray_Startup();
+#endif
 }
 
 void GL_Backend_FreeArrays(void)
 {
+#if 0
        R_Mesh_CacheArray_Shutdown();
+#endif
 }
 
 static void gl_backend_start(void)
@@ -210,11 +210,6 @@ static void gl_backend_newmap(void)
 {
 }
 
-cvar_t scr_zoomwindow = {CVAR_SAVE, "scr_zoomwindow", "0", "displays a zoomed in overlay window"};
-cvar_t scr_zoomwindow_viewsizex = {CVAR_SAVE, "scr_zoomwindow_viewsizex", "20", "horizontal viewsize of zoom window"};
-cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", "vertical viewsize of zoom window"};
-cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"};
-
 void gl_backend_init(void)
 {
        int i;
@@ -225,14 +220,19 @@ void gl_backend_init(void)
                polygonelements[i * 3 + 1] = i + 1;
                polygonelements[i * 3 + 2] = i + 2;
        }
+       // elements for rendering a series of quads as triangles
+       for (i = 0;i < QUADELEMENTS_MAXQUADS;i++)
+       {
+               quadelements[i * 6 + 0] = i * 4;
+               quadelements[i * 6 + 1] = i * 4 + 1;
+               quadelements[i * 6 + 2] = i * 4 + 2;
+               quadelements[i * 6 + 3] = i * 4;
+               quadelements[i * 6 + 4] = i * 4 + 2;
+               quadelements[i * 6 + 5] = i * 4 + 3;
+       }
 
        Cvar_RegisterVariable(&r_render);
        Cvar_RegisterVariable(&r_waterwarp);
-       Cvar_RegisterVariable(&r_stereo_separation);
-       Cvar_RegisterVariable(&r_stereo_sidebyside);
-       Cvar_RegisterVariable(&r_stereo_redblue);
-       Cvar_RegisterVariable(&r_stereo_redcyan);
-       Cvar_RegisterVariable(&r_stereo_redgreen);
        Cvar_RegisterVariable(&gl_polyblend);
        Cvar_RegisterVariable(&gl_dither);
        Cvar_RegisterVariable(&gl_lockarrays);
@@ -246,11 +246,6 @@ void gl_backend_init(void)
        Cvar_RegisterVariable(&gl_mesh_testarrayelement);
        Cvar_RegisterVariable(&gl_mesh_testmanualfeeding);
 
-       Cvar_RegisterVariable(&scr_zoomwindow);
-       Cvar_RegisterVariable(&scr_zoomwindow_viewsizex);
-       Cvar_RegisterVariable(&scr_zoomwindow_viewsizey);
-       Cvar_RegisterVariable(&scr_zoomwindow_fov);
-
        R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap);
 }
 
@@ -1659,302 +1654,6 @@ void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, co
        CHECKGLERROR
 }
 
-/*
-==============================================================================
-
-                                               SCREEN SHOTS
-
-==============================================================================
-*/
-
-qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect)
-{
-       int     indices[3] = {0,1,2};
-       qboolean ret;
-
-       if (!r_render.integer)
-               return false;
-
-       qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
-       CHECKGLERROR
-
-       if (scr_screenshot_gamma.value != 1 && gammacorrect)
-       {
-               int i;
-               double igamma = 1.0 / scr_screenshot_gamma.value;
-               unsigned char ramp[256];
-               for (i = 0;i < 256;i++)
-                       ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0);
-               for (i = 0;i < width*height*3;i++)
-                       buffer1[i] = ramp[buffer1[i]];
-       }
-
-       Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices);
-
-       if (jpeg)
-               ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2);
-       else
-               ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3);
-
-       return ret;
-}
-
-//=============================================================================
-
-void R_ClearScreen(void)
-{
-       if (r_render.integer)
-       {
-               // clear to black
-               if (fogenabled)
-                       qglClearColor(fogcolor[0],fogcolor[1],fogcolor[2],0);
-               else
-                       qglClearColor(0,0,0,0);
-               CHECKGLERROR
-               qglClearDepth(1);CHECKGLERROR
-               if (gl_stencil)
-               {
-                       // LordHavoc: we use a stencil centered around 128 instead of 0,
-                       // to avoid clamping interfering with strange shadow volume
-                       // drawing orders
-                       qglClearStencil(128);CHECKGLERROR
-               }
-               // clear the screen
-               GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0));
-               // set dithering mode
-               if (gl_dither.integer)
-               {
-                       qglEnable(GL_DITHER);CHECKGLERROR
-               }
-               else
-               {
-                       qglDisable(GL_DITHER);CHECKGLERROR
-               }
-       }
-}
-
-qboolean CL_VM_UpdateView (void);
-void SCR_DrawConsole (void);
-
-int r_stereo_side;
-
-void SCR_DrawScreen (void)
-{
-       R_Mesh_Start();
-
-       if (r_timereport_active)
-               R_TimeReport("setup");
-
-       if (cls.signon == SIGNONS)
-       {
-               float size;
-
-               size = scr_viewsize.value * (1.0 / 100.0);
-               size = min(size, 1);
-
-               if (r_stereo_sidebyside.integer)
-               {
-                       r_refdef.width = vid.width * size / 2.5;
-                       r_refdef.height = vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100);
-                       r_refdef.x = (vid.width - r_refdef.width * 2.5) * 0.5;
-                       r_refdef.y = (vid.height - r_refdef.height)/2;
-                       if (r_stereo_side)
-                               r_refdef.x += r_refdef.width * 1.5;
-               }
-               else
-               {
-                       r_refdef.width = vid.width * size;
-                       r_refdef.height = vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100);
-                       r_refdef.x = (vid.width - r_refdef.width)/2;
-                       r_refdef.y = (vid.height - r_refdef.height)/2;
-               }
-
-               // LordHavoc: viewzoom (zoom in for sniper rifles, etc)
-               // LordHavoc: this is designed to produce widescreen fov values
-               // when the screen is wider than 4/3 width/height aspect, to do
-               // this it simply assumes the requested fov is the vertical fov
-               // for a 4x3 display, if the ratio is not 4x3 this makes the fov
-               // higher/lower according to the ratio
-               r_refdef.frustum_y = tan(scr_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
-               r_refdef.frustum_x = r_refdef.frustum_y * (float)r_refdef.width / (float)r_refdef.height / vid_pixelheight.value;
-
-               r_refdef.frustum_x *= r_refdef.frustumscale_x;
-               r_refdef.frustum_y *= r_refdef.frustumscale_y;
-
-               if(!CL_VM_UpdateView())
-                       R_RenderView();
-               else
-                       SCR_DrawConsole();
-
-               if (scr_zoomwindow.integer)
-               {
-                       float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0;
-                       float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0;
-                       r_refdef.width = vid.width * sizex;
-                       r_refdef.height = vid.height * sizey;
-                       r_refdef.x = (vid.width - r_refdef.width)/2;
-                       r_refdef.y = 0;
-
-                       r_refdef.frustum_y = tan(scr_zoomwindow_fov.value * cl.viewzoom * M_PI / 360.0) * (3.0/4.0);
-                       r_refdef.frustum_x = r_refdef.frustum_y * vid_pixelheight.value * (float)r_refdef.width / (float)r_refdef.height;
-
-                       r_refdef.frustum_x *= r_refdef.frustumscale_x;
-                       r_refdef.frustum_y *= r_refdef.frustumscale_y;
-
-                       if(!CL_VM_UpdateView())
-                               R_RenderView();
-               }
-       }
-
-       if (!r_stereo_sidebyside.integer)
-       {
-               r_refdef.width = vid.width;
-               r_refdef.height = vid.height;
-               r_refdef.x = 0;
-               r_refdef.y = 0;
-       }
-
-       // draw 2D stuff
-       R_DrawQueue();
-
-       R_Mesh_Finish();
-
-       if (r_timereport_active)
-               R_TimeReport("meshfinish");
-}
-
-void SCR_UpdateLoadingScreen (void)
-{
-       float x, y;
-       cachepic_t *pic;
-       rmeshstate_t m;
-       // don't do anything if not initialized yet
-       if (vid_hidden)
-               return;
-       r_showtrispass = 0;
-       VID_UpdateGamma(false);
-       qglViewport(0, 0, vid.width, vid.height);
-       //qglDisable(GL_SCISSOR_TEST);
-       //qglDepthMask(1);
-       qglColorMask(1,1,1,1);
-       //qglClearColor(0,0,0,0);
-       //qglClear(GL_COLOR_BUFFER_BIT);
-       //qglCullFace(GL_FRONT);
-       //qglDisable(GL_CULL_FACE);
-       //R_ClearScreen();
-       R_Textures_Frame();
-       GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
-       R_Mesh_Start();
-       R_Mesh_Matrix(&identitymatrix);
-       // draw the loading plaque
-       pic = Draw_CachePic("gfx/loading", false);
-       x = (vid_conwidth.integer - pic->width)/2;
-       y = (vid_conheight.integer - pic->height)/2;
-       GL_Color(1,1,1,1);
-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       GL_DepthTest(false);
-       memset(&m, 0, sizeof(m));
-       m.pointer_vertex = varray_vertex3f;
-       m.pointer_texcoord[0] = varray_texcoord2f[0];
-       m.tex[0] = R_GetTexture(pic->tex);
-       R_Mesh_State(&m);
-       varray_vertex3f[0] = varray_vertex3f[9] = x;
-       varray_vertex3f[1] = varray_vertex3f[4] = y;
-       varray_vertex3f[3] = varray_vertex3f[6] = x + pic->width;
-       varray_vertex3f[7] = varray_vertex3f[10] = y + pic->height;
-       varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0;
-       varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0;
-       varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1;
-       varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1;
-       GL_LockArrays(0, 4);
-       R_Mesh_Draw(0, 4, 2, polygonelements);
-       GL_LockArrays(0, 0);
-       R_Mesh_Finish();
-       // refresh
-       VID_Finish(false);
-}
-
-/*
-==================
-SCR_UpdateScreen
-
-This is called every frame, and can also be called explicitly to flush
-text to the screen.
-==================
-*/
-void SCR_UpdateScreen (void)
-{
-       if (vid_hidden)
-               return;
-
-       if (r_textureunits.integer > gl_textureunits)
-               Cvar_SetValueQuick(&r_textureunits, gl_textureunits);
-       if (r_textureunits.integer < 1)
-               Cvar_SetValueQuick(&r_textureunits, 1);
-
-       if (gl_combine.integer && !gl_combine_extension)
-               Cvar_SetValueQuick(&gl_combine, 0);
-
-       r_showtrispass = 0;
-
-       CHECKGLERROR
-       qglViewport(0, 0, vid.width, vid.height);
-       qglDisable(GL_SCISSOR_TEST);
-       qglDepthMask(1);
-       qglColorMask(1,1,1,1);
-       qglClearColor(0,0,0,0);
-       qglClear(GL_COLOR_BUFFER_BIT);
-       CHECKGLERROR
-
-       if (r_timereport_active)
-               R_TimeReport("clear");
-
-       if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer)
-       {
-               matrix4x4_t originalmatrix = r_refdef.viewentitymatrix;
-               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[0][1];
-               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[1][1];
-               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * -0.5f * r_refdef.viewentitymatrix.m[2][1];
-
-               if (r_stereo_sidebyside.integer)
-                       r_stereo_side = 0;
-
-               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
-               {
-                       r_refdef.colormask[0] = 1;
-                       r_refdef.colormask[1] = 0;
-                       r_refdef.colormask[2] = 0;
-               }
-
-               SCR_DrawScreen();
-
-               r_refdef.viewentitymatrix.m[0][3] = originalmatrix.m[0][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[0][1];
-               r_refdef.viewentitymatrix.m[1][3] = originalmatrix.m[1][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[1][1];
-               r_refdef.viewentitymatrix.m[2][3] = originalmatrix.m[2][3] + r_stereo_separation.value * 0.5f * r_refdef.viewentitymatrix.m[2][1];
-
-               if (r_stereo_sidebyside.integer)
-                       r_stereo_side = 1;
-
-               if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer)
-               {
-                       r_refdef.colormask[0] = 0;
-                       r_refdef.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer;
-                       r_refdef.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer;
-               }
-
-               SCR_DrawScreen();
-
-               r_refdef.viewentitymatrix = originalmatrix;
-       }
-       else
-               SCR_DrawScreen();
-
-       VID_Finish(true);
-       if (r_timereport_active)
-               R_TimeReport("finish");
-}
-
-
 //===========================================================================
 // dynamic vertex array buffer subsystem
 //===========================================================================
@@ -1970,6 +1669,7 @@ float varray_texcoord3f[4][65536*3];
 int earray_element3i[65536];
 float varray_vertex3f2[65536*3];
 
+#if 0
 //===========================================================================
 // vertex array caching subsystem
 //===========================================================================
@@ -2217,4 +1917,4 @@ int R_Mesh_CacheArray(rcachearrayrequest_t *r)
        // and tell the caller to fill the array
        return true;
 }
-
+#endif
index fa7961a..393d805 100644 (file)
@@ -5,7 +5,9 @@
 #define MAX_TEXTUREUNITS 16
 
 #define POLYGONELEMENTS_MAXPOINTS 258
-extern int polygonelements[768];
+extern int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
+#define QUADELEMENTS_MAXQUADS 128
+extern int quadelements[QUADELEMENTS_MAXQUADS*6];
 
 void GL_SetupView_Orientation_Identity(void);
 void GL_SetupView_Orientation_FromEntity(matrix4x4_t *matrix);
@@ -22,8 +24,8 @@ void GL_TransformToScreen(const vec4_t in, vec4_t out);
 void GL_LockArrays(int first, int count);
 void GL_ActiveTexture(unsigned int num);
 void GL_ClientActiveTexture(unsigned int num);
-void GL_Scissor(int x, int y, int width, int height); // AK for DRAWQUEUE_SETCLIP
-void GL_ScissorTest(int state);        // AK for DRAWQUEUE_(RE)SETCLIP
+void GL_Scissor(int x, int y, int width, int height);
+void GL_ScissorTest(int state);
 void GL_Clear(int mask);
 
 unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **vertexstrings_list, int fragmentstrings_count, const char **fragmentstrings_list);
@@ -106,6 +108,7 @@ void SCR_UpdateScreen(void);
 // invoke refresh of loading plaque (nothing else seen)
 void SCR_UpdateLoadingScreen(void);
 
+#if 0
 // public structure
 typedef struct rcachearrayrequest_s
 {
@@ -126,6 +129,7 @@ typedef struct rcachearrayrequest_s
 rcachearrayrequest_t;
 
 int R_Mesh_CacheArray(rcachearrayrequest_t *r);
+#endif
 
 extern float varray_vertex3f[65536*3];
 extern float varray_svector3f[65536*3];
index 79d5adc..e0130f4 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "cl_video.h"
 
+cvar_t r_textshadow = {0, "r_textshadow", "0" "draws a shadow on all text to improve readability"};
 
 static rtexture_t *char_texture;
 cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
@@ -486,44 +487,12 @@ static void gl_draw_newmap(void)
 
 void GL_Draw_Init (void)
 {
-       numcachepics = 0;
-       memset(cachepichash, 0, sizeof(cachepichash));
-
+       Cvar_RegisterVariable(&r_textshadow);
        R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
 }
 
-float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
-
-int quadelements[768];
-void R_DrawQueue(void)
+void DrawQ_Begin(void)
 {
-       int pos, num, chartexnum, texnum, batch;
-       float x, y, w, h, s, t, u, v, *av, *at, c[4];
-       cachepic_t *pic;
-       drawqueue_t *dq;
-       char *str;
-       int batchcount;
-       unsigned int color;
-       drawqueuemesh_t *mesh;
-       rmeshstate_t m;
-
-       if (!r_render.integer)
-               return;
-
-       if (!quadelements[1])
-       {
-               // elements for rendering a series of quads as triangles
-               for (batch = 0, pos = 0, num = 0;batch < 128;batch++, num += 4)
-               {
-                       quadelements[pos++] = num;
-                       quadelements[pos++] = num + 1;
-                       quadelements[pos++] = num + 2;
-                       quadelements[pos++] = num;
-                       quadelements[pos++] = num + 2;
-                       quadelements[pos++] = num + 3;
-               }
-       }
-
        r_view_width = bound(0, r_refdef.width, vid.width);
        r_view_height = bound(0, r_refdef.height, vid.height);
        r_view_depth = 1;
@@ -538,139 +507,436 @@ void R_DrawQueue(void)
        qglDepthFunc(GL_LEQUAL);
        R_Mesh_Matrix(&identitymatrix);
 
-       chartexnum = R_GetTexture(char_texture);
+       GL_DepthMask(true);
+       GL_DepthTest(false);
+       GL_Color(1,1,1,1);
 
-       memset(&m, 0, sizeof(m));
+       r_refdef.draw2dstage = true;
+}
 
-       pic = NULL;
-       texnum = 0;
-       color = 0;
-       GL_Color(1,1,1,1);
+void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_Pic: not in 2d rendering stage!\n");
+               return;
+       }
+       DrawQ_SuperPic(x,y,pic,width,height,0,0,red,green,blue,alpha,1,0,red,green,blue,alpha,0,1,red,green,blue,alpha,1,1,red,green,blue,alpha,flags);
+}
 
-       batch = false;
-       batchcount = 0;
-       for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
+void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float w, float h, float red, float green, float blue, float alpha, int flags)
+{
+       int i, num;
+       float *av, *at;
+       int batchcount;
+       rmeshstate_t m;
+
+       if (!r_refdef.draw2dstage)
        {
-               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)
-                       GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-               else if(dq->flags == DRAWFLAG_2XMODULATE)
-                       GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-               else
-                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
+               return;
+       }
 
-               GL_DepthMask(true);
-               GL_DepthTest(false);
+       if (!r_render.integer)
+               return;
+
+       if (alpha < (1.0f / 255.0f))
+               return;
+
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-               c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f);
-               c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f);
-               c[2] = (float) ((color >>  8) & 0xFF) * (1.0f / 255.0f);
-               c[3] = (float) ( color        & 0xFF) * (1.0f / 255.0f);
-               x = dq->x;
-               y = dq->y;
-               w = dq->scalex;
-               h = dq->scaley;
+       GL_Color(red, green, blue, alpha);
 
-               switch(dq->command)
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = varray_vertex3f;
+       m.pointer_color = NULL;
+       m.pointer_texcoord[0] = varray_texcoord2f[0];
+       m.tex[0] = R_GetTexture(char_texture);
+       R_Mesh_State(&m);
+
+       at = varray_texcoord2f[0];
+       av = varray_vertex3f;
+       batchcount = 0;
+
+       if (maxlen < 1)
+               maxlen = 9999;
+       for (i = 0;i < maxlen && x < vid_conwidth.integer && (num = string[i]);i++, x += w)
+       {
+               float s, t, u, v;
+               if (num == ' ')
+                       continue;
+               s = (num & 15)*0.0625f + (0.5f / 256.0f);
+               t = (num >> 4)*0.0625f + (0.5f / 256.0f);
+               u = 0.0625f - (1.0f / 256.0f);
+               v = 0.0625f - (1.0f / 256.0f);
+               at[ 0] = s  ;at[ 1] = t  ;
+               at[ 2] = s+u;at[ 3] = t  ;
+               at[ 4] = s+u;at[ 5] = t+v;
+               at[ 6] = s  ;at[ 7] = t+v;
+               av[ 0] = x  ;av[ 1] = y  ;av[ 2] = 10;
+               av[ 3] = x+w;av[ 4] = y  ;av[ 5] = 10;
+               av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
+               av[ 9] = x  ;av[10] = y+h;av[11] = 10;
+               at += 8;
+               av += 12;
+               batchcount++;
+               if (batchcount >= QUADELEMENTS_MAXQUADS)
                {
-               case DRAWQUEUE_STRING:
-                       GL_Color(c[0], c[1], c[2], c[3]);
-                       str = (char *)(dq + 1);
+                       GL_LockArrays(0, batchcount * 4);
+                       R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+                       GL_LockArrays(0, 0);
                        batchcount = 0;
-                       m.pointer_vertex = varray_vertex3f;
-                       m.pointer_color = NULL;
-                       m.pointer_texcoord[0] = varray_texcoord2f[0];
-                       m.tex[0] = chartexnum;
-                       R_Mesh_State(&m);
                        at = varray_texcoord2f[0];
                        av = varray_vertex3f;
-                       while ((num = *str++) && x < vid_conwidth.integer)
-                       {
-                               if (num != ' ')
-                               {
-                                       s = (num & 15)*0.0625f + (0.5f / 256.0f);
-                                       t = (num >> 4)*0.0625f + (0.5f / 256.0f);
-                                       u = 0.0625f - (1.0f / 256.0f);
-                                       v = 0.0625f - (1.0f / 256.0f);
-                                       at[ 0] = s  ;at[ 1] = t  ;
-                                       at[ 2] = s+u;at[ 3] = t  ;
-                                       at[ 4] = s+u;at[ 5] = t+v;
-                                       at[ 6] = s  ;at[ 7] = t+v;
-                                       av[ 0] = x  ;av[ 1] = y  ;av[ 2] = 10;
-                                       av[ 3] = x+w;av[ 4] = y  ;av[ 5] = 10;
-                                       av[ 6] = x+w;av[ 7] = y+h;av[ 8] = 10;
-                                       av[ 9] = x  ;av[10] = y+h;av[11] = 10;
-                                       at += 8;
-                                       av += 12;
-                                       batchcount++;
-                                       if (batchcount >= 128)
-                                       {
-                                               GL_LockArrays(0, batchcount * 4);
-                                               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
-                                               GL_LockArrays(0, 0);
-                                               batchcount = 0;
-                                               at = varray_texcoord2f[0];
-                                               av = varray_vertex3f;
-                                       }
-                               }
-                               x += w;
-                       }
-                       if (batchcount > 0)
-                       {
-                               GL_LockArrays(0, batchcount * 4);
-                               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
-                               GL_LockArrays(0, 0);
-                       }
-                       break;
-               case DRAWQUEUE_MESH:
-                       mesh = (drawqueuemesh_t *)(dq + 1);
-                       m.pointer_vertex = mesh->data_vertex3f;
-                       m.pointer_color = mesh->data_color4f;
-                       m.pointer_texcoord[0] = mesh->data_texcoord2f;
-                       m.tex[0] = R_GetTexture(mesh->texture);
-                       if (!m.tex[0])
-                               m.pointer_texcoord[0] = NULL;
-                       R_Mesh_State(&m);
-                       GL_LockArrays(0, mesh->num_vertices);
-                       R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
-                       GL_LockArrays(0, 0);
-                       break;
-               case DRAWQUEUE_SETCLIP:
-                       {
-                               // We have to convert the con coords into real coords
-                               int x , y, width, height;
-                               x = dq->x * ((float)vid.width / vid_conwidth.integer);
-                               // OGL uses top to bottom
-                               y = dq->y * ((float) vid.height / vid_conheight.integer);
-                               width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
-                               height = dq->scaley * ((float)vid.height / vid_conheight.integer);
+               }
+       }
+       if (batchcount > 0)
+       {
+               GL_LockArrays(0, batchcount * 4);
+               R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+               GL_LockArrays(0, 0);
+       }
+}
 
-                               GL_Scissor(x, y, width, height);
+void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex, float scaley, float red, float green, float blue, float alpha, int flags)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_String: not in 2d rendering stage!\n");
+               return;
+       }
 
-                               GL_ScissorTest(true);
+       if (r_textshadow.integer)
+               DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags);
+
+       DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags);
+}
+
+// color tag printing
+static vec4_t string_colors[] =
+{
+       // Quake3 colors
+       // LordHavoc: why on earth is cyan before magenta in Quake3?
+       // LordHavoc: note: Doom3 uses white for [0] and [7]
+       {0.0, 0.0, 0.0, 1.0}, // black
+       {1.0, 0.0, 0.0, 1.0}, // red
+       {0.0, 1.0, 0.0, 1.0}, // green
+       {1.0, 1.0, 0.0, 1.0}, // yellow
+       {0.0, 0.0, 1.0, 1.0}, // blue
+       {0.0, 1.0, 1.0, 1.0}, // cyan
+       {1.0, 0.0, 1.0, 1.0}, // magenta
+       {1.0, 1.0, 1.0, 1.0}, // white
+       // [515]'s BX_COLOREDTEXT extension
+       {1.0, 1.0, 1.0, 0.5}, // half transparent
+       {0.5, 0.5, 0.5, 1.0}  // half brightness
+       // Black's color table
+       //{1.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 0.0, 1.0},
+       //{0.0, 1.0, 0.0, 1.0},
+       //{0.0, 0.0, 1.0, 1.0},
+       //{1.0, 1.0, 0.0, 1.0},
+       //{0.0, 1.0, 1.0, 1.0},
+       //{1.0, 0.0, 1.0, 1.0},
+       //{0.1, 0.1, 0.1, 1.0}
+};
+
+#define STRING_COLORS_COUNT    (sizeof(string_colors) / sizeof(vec4_t))
+
+// color is read and changed in the end
+void DrawQ_ColoredString( float x, float y, const char *text, int maxlen, float scalex, float scaley, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor )
+{
+       vec_t *color;
+       int len;
+       int colorindex;
+       const char *start, *current;
+
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_ColoredString: not in 2d rendering stage!\n");
+               return;
+       }
+       if( !outcolor || *outcolor == -1 ) {
+               colorindex = STRING_COLOR_DEFAULT;
+       } else {
+               colorindex = *outcolor;
+       }
+       color = string_colors[colorindex];
+
+       if( maxlen < 1)
+               len = (int)strlen( text );
+       else
+               len = min( maxlen, (int) strlen( text ) );
+
+       start = current = text;
+       while( len > 0 ) {
+               // check for color control char
+               if( *current == STRING_COLOR_TAG ) {
+                       // get next char
+                       current++;
+                       len--;
+                       if( len == 0 ) {
+                               break;
                        }
-                       break;
-               case DRAWQUEUE_RESETCLIP:
-                       GL_ScissorTest(false);
-                       break;
-               case DRAWQUEUE_LINEWIDTH:
-                       qglLineWidth(x);
-                       break;
-               case DRAWQUEUE_LINES:
-                       mesh = (drawqueuemesh_t *)(dq + 1);
-                       GL_Color(c[0], c[1], c[2], c[3]);
-                       qglBegin(GL_LINE_LOOP);
-                       for (num = 0;num < mesh->num_vertices;num++)
-                               qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
-                       qglEnd();
-                       break;
+                       // display the tag char?
+                       if( *current == STRING_COLOR_TAG ) {
+                               // only display one of the two
+                               start = current;
+                               // get the next char
+                               current++;
+                               len--;
+                       } else if( '0' <= *current && *current <= '9' ) {
+                               colorindex = 0;
+                               do {
+                                       colorindex = colorindex * 10 + (*current - '0');
+                                       // only read as long as it makes a valid index
+                                       if( colorindex >= (int)STRING_COLORS_COUNT ) {
+                                               // undo the last operation
+                                               colorindex /= 10;
+                                               break;
+                                       }
+                                       current++;
+                                       len--;
+                               } while( len > 0 && '0' <= *current && *current <= '9' );
+                               // set the color
+                               color = string_colors[colorindex];
+                               // we jump over the color tag
+                               start = current;
+                       }
+               }
+               // go on and read normal text in until the next control char
+               while( len > 0 && *current != STRING_COLOR_TAG ) {
+                       current++;
+                       len--;
+               }
+               // display the text
+               if( start != current ) {
+                       // draw the string
+                       DrawQ_String( x, y, start, current - start, scalex, scaley, basered * color[0], basegreen * color[1], baseblue * color[2], basealpha * color[3], flags );
+                       // update x to be at the new start position
+                       x += (current - start) * scalex;
+                       // set start accordingly
+                       start = current;
                }
        }
 
+       // return the last colorindex
+       if( outcolor ) {
+               *outcolor = colorindex;
+       }
+}
+
+void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
+{
+       rmeshstate_t m;
+       float floats[36];
+
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_SuperPic: not in 2d rendering stage!\n");
+               return;
+       }
+
+       if (!r_render.integer)
+               return;
+
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = floats;
+       m.pointer_color = floats + 20;
+       if (pic)
+       {
+               if (width == 0)
+                       width = pic->width;
+               if (height == 0)
+                       height = pic->height;
+               m.tex[0] = R_GetTexture(pic->tex);
+               m.pointer_texcoord[0] = floats + 12;
+               floats[12] = s1;floats[13] = t1;
+               floats[14] = s2;floats[15] = t2;
+               floats[16] = s4;floats[17] = t4;
+               floats[18] = s3;floats[19] = t3;
+       }
+       R_Mesh_State(&m);
+
+       floats[2] = floats[5] = floats[8] = floats[11] = 0;
+       floats[0] = floats[9] = x;
+       floats[1] = floats[4] = y;
+       floats[3] = floats[6] = x + width;
+       floats[7] = floats[10] = y + height;
+       floats[20] = r1;floats[21] = g1;floats[22] = b1;floats[23] = a1;
+       floats[24] = r2;floats[25] = g2;floats[26] = b2;floats[27] = a2;
+       floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
+       floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
+
+       R_Mesh_Draw(0, 4, 2, polygonelements);
+}
+
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
+{
+       rmeshstate_t m;
+
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_Mesh: not in 2d rendering stage!\n");
+               return;
+       }
+
+       if (!r_render.integer)
+               return;
+
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = mesh->data_vertex3f;
+       m.pointer_color = mesh->data_color4f;
+       m.tex[0] = R_GetTexture(mesh->texture);
+       if (m.tex[0])
+               m.pointer_texcoord[0] = mesh->data_texcoord2f;
+       R_Mesh_State(&m);
+
+       GL_LockArrays(0, mesh->num_vertices);
+       R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
+{
+       int num;
+
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_LineLoop: not in 2d rendering stage!\n");
+               return;
+       }
+
+       if (!r_render.integer)
+               return;
+
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+       GL_Color(1,1,1,1);
+       qglBegin(GL_LINE_LOOP);
+       for (num = 0;num < mesh->num_vertices;num++)
+       {
+               if (mesh->data_color4f)
+                       GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
+               qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+       }
+       qglEnd();
+}
+
+//LordHavoc: FIXME: this is nasty!
+void DrawQ_LineWidth (float width)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_LineWidth: not in 2d rendering stage!\n");
+               return;
+       }
+       qglLineWidth(width);
+}
+
+//[515]: this is old, delete
+void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_Line: not in 2d rendering stage!\n");
+               return;
+       }
+
+       if (!r_render.integer)
+               return;
+
+       if(width > 0)
+               DrawQ_LineWidth(width);
+
+       if(flags == DRAWFLAG_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else if(flags == DRAWFLAG_MODULATE)
+               GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+       else if(flags == DRAWFLAG_2XMODULATE)
+               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+       GL_Color(r,g,b,alpha);
+       qglBegin(GL_LINES);
+       qglVertex2f(x1, y1);
+       qglVertex2f(x2, y2);
+       qglEnd();
+}
+
+void DrawQ_SetClipArea(float x, float y, float width, float height)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_SetClipArea: not in 2d rendering stage!\n");
+               return;
+       }
+
+       // We have to convert the con coords into real coords
+       // OGL uses top to bottom
+       GL_Scissor(x * ((float)vid.width / vid_conwidth.integer), y * ((float) vid.height / vid_conheight.integer), width * ((float)vid.width / vid_conwidth.integer), height * ((float)vid.height / vid_conheight.integer));
+
+       GL_ScissorTest(true);
+}
+
+void DrawQ_ResetClipArea(void)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("DrawQ_ResetClipArea: not in 2d rendering stage!\n");
+               return;
+       }
+       GL_ScissorTest(false);
+}
+
+void DrawQ_Finish(void)
+{
+       if (!r_refdef.draw2dstage)
+       {
+               Con_Printf("R_DrawQueue: not in 2d rendering stage!\n");
+               return;
+       }
+
+       r_refdef.draw2dstage = false;
+}
+
+static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+void R_DrawGamma(void)
+{
+       rmeshstate_t m;
+       float c[4];
        if (!vid_usinghwgamma)
        {
                // all the blends ignore depth
diff --git a/todo b/todo
index ab87795..4ba10a2 100644 (file)
--- a/todo
+++ b/todo
@@ -38,7 +38,6 @@
 -d (yummyluv) feature darkplaces protocol: add buttons 9-16 (yummyluv)
 -f (James D) bug darkplaces server: losing runes on episode completion, completing episode 1 then 2 then 3 causes it to forget 1, then 4 causes it to forget 2 and 3, making it impossible to open the boss gate (James D)
 -f (Wazat) bug darkplaces: client's slowmo detection (measuring packet times and comparing to game time changes) may be making the game unpleasant (Wazat)
-0 bug darkplaces renderer: r_glsl 1 mode has black grapple beam in nexuiz (SavageX)
 0 bug darkplaces client: GAME_NEHAHRA: make sure cutscenes and movies work, got a report of seeing a black screen (NightFright)
 0 bug darkplaces client: cl.sfx sounds aren't playing (romi)
 0 bug darkplaces client: cl_movement 0 shouldn't be doing an input replay (SavageX)
 0 bug darkplaces csqc: engine-based rocket entities have a trail but they don't glow if csqc is used
 0 bug darkplaces loader: make rtlight entity loader support q3map/q3map2 lights properly, they use a spawnflag for LINEAR mode, by default they use 1/(x*x) falloff (Carni, motorsep)
 0 bug darkplaces loader: occasional crash due to memory corruption when doing "deathmatch 1;map start" during demo loop (Willis)
+0 bug darkplaces renderer: glsl lighting path is not using GL_SRC_ALPHA, GL_ONE
 0 bug darkplaces renderer: modify r_showtris_polygonoffset to push back all filled geometry, not lines, because polygonoffset will not affect GL_LINES at all
 0 bug darkplaces renderer: monsters teleporting in really slow down rendering, perhaps the teleport light is casting huge shadows?  new information suggests it is the particles. (romi, lcatlnx)
+0 bug darkplaces renderer: r_glsl 1 mode has black grapple beam in nexuiz (SavageX)
 0 bug darkplaces renderer: r_wateralpha on maps that are not watervised shows sky, this is a known glquake bug but it is fixable in darkplaces at load time by marking opposite-content (water-empty, empty-water) leafs as visible in their pvs sets, this involves checking the portal flow...  (knghtbrd)
 0 bug darkplaces server: Blood Mage monsters are stuck in place apparently (steven a)
 0 bug darkplaces server: SV_PushMove is ignoring model type in its angles_x handling, where as the renderer checks only model type to determine angles_x handling (Urre)