summaryrefslogtreecommitdiff
path: root/source/gl_draw.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/gl_draw.c')
-rw-r--r--source/gl_draw.c291
1 files changed, 51 insertions, 240 deletions
diff --git a/source/gl_draw.c b/source/gl_draw.c
index 8cb1bdf..b9376df 100644
--- a/source/gl_draw.c
+++ b/source/gl_draw.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
drawStatic_t draw;
-void Draw_SetColor( int flags, const color_t color ) {
+void R_SetColor( int flags, const color_t color ) {
draw.flags &= ~DRAW_COLOR_MASK;
if( flags == DRAW_COLOR_CLEAR ) {
@@ -45,7 +45,7 @@ void Draw_SetColor( int flags, const color_t color ) {
draw.flags |= flags;
}
-void Draw_SetClipRect( int flags, const clipRect_t *clip ) {
+void R_SetClipRect( int flags, const clipRect_t *clip ) {
clipRect_t rc;
float scale;
@@ -106,7 +106,7 @@ void Draw_SetClipRect( int flags, const clipRect_t *clip ) {
draw.flags = ( draw.flags & ~DRAW_CLIP_MASK ) | flags;
}
-void Draw_SetScale( float *scale ) {
+void R_SetScale( float *scale ) {
float f = scale ? *scale : 1;
if( draw.scale == f ) {
@@ -123,10 +123,9 @@ void Draw_SetScale( float *scale ) {
draw.scale = f;
}
-qboolean Draw_GetPicSize( int *w, int *h, qhandle_t hPic ) {
- image_t *image;
+qboolean R_GetPicSize( int *w, int *h, qhandle_t pic ) {
+ image_t *image = IMG_ForHandle( pic );
- image = R_ImageForHandle( hPic );
if( w ) {
*w = image->width;
}
@@ -136,130 +135,49 @@ qboolean Draw_GetPicSize( int *w, int *h, qhandle_t hPic ) {
return image->flags & if_transparent;
}
-qhandle_t GL_RegisterFont( const char *name ) {
- image_t *image;
- char fullname[MAX_QPATH];
-
- if( name[0] != '/' && name[0] != '\\' ) {
- Q_concat( fullname, sizeof( fullname ), "pics/", name, NULL );
- COM_DefaultExtension( fullname, ".pcx", sizeof( fullname ) );
- image = R_FindImage( fullname, it_charset );
- } else {
- image = R_FindImage( name + 1, it_charset );
- }
-
- if( !image ) {
- return 0;
- }
-
- return ( image - r_images );
-}
-
-void Draw_StretchPicST( int x, int y, int w, int h, float s1, float t1,
- float s2, float t2, qhandle_t hPic )
+void R_DrawStretchPicST( int x, int y, int w, int h, float s1, float t1,
+ float s2, float t2, qhandle_t pic )
{
/* TODO: scrap support */
- GL_StretchPic( x, y, w, h, s1, t1, s2, t2, draw.color,
- R_ImageForHandle( hPic ) );
+ GL_StretchPic( x, y, w, h, s1, t1, s2, t2, draw.color, IMG_ForHandle( pic ) );
}
-void Draw_StretchPic( int x, int y, int w, int h, qhandle_t hPic ) {
- image_t *image;
+void R_DrawStretchPic( int x, int y, int w, int h, qhandle_t pic ) {
+ image_t *image = IMG_ForHandle( pic );
- image = R_ImageForHandle( hPic );
GL_StretchPic( x, y, w, h, image->sl, image->tl, image->sh, image->th,
draw.color, image );
}
-void Draw_Pic( int x, int y, qhandle_t hPic ) {
- image_t *image;
+void R_DrawPic( int x, int y, qhandle_t pic ) {
+ image_t *image = IMG_ForHandle( pic );
- image = R_ImageForHandle( hPic );
GL_StretchPic( x, y, image->width, image->height,
- image->sl, image->tl, image->sh, image->th,
- draw.color, image );
+ image->sl, image->tl, image->sh, image->th, draw.color, image );
}
-#define DOSTRETCH do { \
- tbyte = src[u >> 16]; \
- *dst++ = gl_static.palette[tbyte]; \
- u += ustep; \
- } while( 0 )
+#define DIV64 ( 1.0f / 64.0f )
-void Draw_StretchRaw( int x, int y, int w, int h, int cols,
- int rows, const byte *data )
-{
- uint32_t resampled[256*256];
- int width, height;
- const byte *src;
- byte tbyte;
- uint32_t *dst;
- int u, v, ustep, vstep;
-
- vstep = rows * 0x10000 / 256;
- ustep = cols * 0x10000 / 256;
-
- dst = resampled;
- v = 0;
- height = 256;
- do {
- src = &data[( v >> 16 ) * cols];
-
- u = 0;
- width = 256/8;
- do {
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- DOSTRETCH;
- } while( --width );
-
- v += vstep;
- } while( --height );
-
- qglBindTexture( GL_TEXTURE_2D, 0 );
- qglTexImage2D( GL_TEXTURE_2D, 0, gl_tex_solid_format, 256, 256, 0,
- GL_RGBA, GL_UNSIGNED_BYTE, resampled );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
- qglBegin( GL_QUADS );
- qglTexCoord2f( 0, 0 ); qglVertex2f( x, y );
- qglTexCoord2f( 1, 0 ); qglVertex2f( x + w, y );
- qglTexCoord2f( 1, 1 ); qglVertex2f( x + w, y + h );
- qglTexCoord2f( 0, 1 ); qglVertex2f( x, y + h );
- qglEnd();
-}
-
-#define DIV64 ( 1.0f / 64.0f )
-
-void Draw_TileClear( int x, int y, int w, int h, qhandle_t hPic ) {
- image_t *image;
+void R_TileClear( int x, int y, int w, int h, qhandle_t pic ) {
+ image_t *image = IMG_ForHandle( pic );
- if( !( image = R_ImageForHandle( hPic ) ) ) {
- GL_StretchPic( x, y, w, h, 0, 0, 1, 1, colorBlack, r_whiteimage );
- return;
- }
- GL_StretchPic( x, y, w, h, x * DIV64, y * DIV64, ( x + w ) * DIV64, ( y + h ) * DIV64, colorWhite, image );
+ GL_StretchPic( x, y, w, h, x * DIV64, y * DIV64,
+ ( x + w ) * DIV64, ( y + h ) * DIV64, colorWhite, image );
}
-void Draw_Fill( int x, int y, int w, int h, int c ) {
+void R_DrawFill( int x, int y, int w, int h, int c ) {
GL_StretchPic( x, y, w, h, 0, 0, 1, 1, ( byte * )&d_8to24table[c & 255],
- r_whiteimage );
+ r_whiteimage );
}
-void Draw_FillEx( int x, int y, int w, int h, const color_t color ) {
+void R_DrawFillEx( int x, int y, int w, int h, const color_t color ) {
GL_StretchPic( x, y, w, h, 0, 0, 1, 1, color, r_whiteimage );
}
-void Draw_FadeScreen( void ) {
+void R_FadeScreen( void ) {
}
-void Draw_Char( int x, int y, int flags, int ch, qhandle_t hFont ) {
+void R_DrawChar( int x, int y, int flags, int ch, qhandle_t font ) {
float s, t;
ch &= 255;
@@ -267,11 +185,11 @@ void Draw_Char( int x, int y, int flags, int ch, qhandle_t hFont ) {
t = ( ch >> 4 ) * 0.0625f;
GL_StretchPic( x, y, 8, 8, s, t, s + 0.0625f, t + 0.0625f,
- draw.color, R_ImageForHandle( hFont ) );
+ draw.color, IMG_ForHandle( font ) );
}
-int Draw_String( int x, int y, int flags, size_t maxChars,
- const char *string, qhandle_t hFont )
+int R_DrawString( int x, int y, int flags, size_t maxChars,
+ const char *string, qhandle_t font )
{
byte c;
float s, t;
@@ -279,7 +197,7 @@ int Draw_String( int x, int y, int flags, size_t maxChars,
color_t colors[2];
int mask, altmask = 0;
- image = R_ImageForHandle( hFont );
+ image = IMG_ForHandle( font );
if( flags & UI_ALTCOLOR ) {
altmask |= 128;
@@ -336,9 +254,9 @@ void Draw_Stringf( int x, int y, const char *fmt, ... ) {
if( !r_charset ) {
qhandle_t tmp;
- tmp = GL_RegisterFont( "conchars" );
+ tmp = R_RegisterFont( "conchars" );
if(!tmp) return;
- r_charset = R_ImageForHandle( tmp );
+ r_charset = IMG_ForHandle( tmp );
}
string = buffer;
@@ -348,146 +266,39 @@ void Draw_Stringf( int x, int y, const char *fmt, ... ) {
s = ( c & 15 ) * 0.0625f;
t = ( c >> 4 ) * 0.0625f;
-#if 0
- glBegin( GL_QUADS );
- glTexCoord2f( s, t );
- glVertex2i( x, y );
- glTexCoord2f( s + 0.0625f, t );
- glVertex2i( x + 8, y );
- glTexCoord2f( s + 0.0625f, t + 0.0625f );
- glVertex2i( x + 8, y + 16 );
- glTexCoord2f( s, t + 0.0625f );
- glVertex2i( x, y + 16 );
- glEnd();
-#endif
- GL_StretchPic( x, y, 8, 16, s, t, s + 0.0625f, t + 0.0625f,
- colorWhite, r_charset );
+ GL_StretchPic( x, y, 8, 8, s, t, s + 0.0625f, t + 0.0625f,
+ colorWhite, r_charset );
x += 8;
}
-
}
-#if 0
-
-void Draw_FPS( int x, int y ) {
- int time;
- static int realtime;
- static int frameTimes[4] = { 1 };
- static int current;
- int fps;
-
- time = sys.Milliseconds();
- frameTimes[current & 3] = time - realtime;
- current++;
- realtime = time;
-
- fps = 4000 / ( frameTimes[0] + frameTimes[1] +
- frameTimes[2] + frameTimes[3] );
- Draw_Stringf( x, y, "FPS: %i", fps );
-}
-
-#else
-
-#define FPS_APERTURE 9
-
-int QDECL SortCmp( const void *v1, const void *v2 ) {
- int i1 = *( int * )v1;
- int i2 = *( int * )v2;
-
- if( i1 < i2 ) {
- return -1;
- }
- if( i1 > i2 ) {
- return 1;
- }
- return 0;
-}
-
-void Draw_FPS( int x, int y ) {
- int time;
- static int realtime;
- static int frameTimes[FPS_APERTURE];
- static int current;
- int buffer[FPS_APERTURE];
- int fps, i;
-
- time = sys.Milliseconds();
- frameTimes[current % FPS_APERTURE] = time - realtime;
- current++;
- realtime = time;
-
- for( i = 0; i < FPS_APERTURE; i++ ) {
- buffer[i] = frameTimes[i];
- }
-
- qsort( buffer, FPS_APERTURE, sizeof( buffer[0] ), SortCmp );
- if( buffer[4] ) {
- fps = 1000 / buffer[4];
- Draw_Stringf( x, y, "FPS: %i", fps );
- }
-}
-#endif
-
void Draw_Stats( void ) {
- int x, y;
- //const char *orderStr[2] = { "unordered", "inorder" };
- //const char *enableStr[2] = { "disabled", "enabled" };
- //const char *algStr[2] = { "mergesort", "quicksort" };
- statCounters_t st = c;
-
-#if 0
- GL_Flush2D();
- // GL_StretchPic( 0, 0, gl_config.vidWidth, gl_config.vidHeight, -0.5f, -0.5f, 1.5f, 1.5f,
- GL_StretchPic( 0, 0, gl_config.vidWidth, gl_config.vidHeight, 0, 0, 1, 1,
- colorWhite, r_beamtexture );
- // qglBlendFunc( GL_ONE, GL_ONE );
- //
-#endif
+ int x = 10, y = 10;
- y = 16;
- x = 16;
-
- Draw_FPS( gl_config.vidWidth - 80, y );
-// qglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
- //GL_Flush2D();
-
- Draw_Stringf( x, y, "Nodes visible : %i", st.nodesVisible ); y += 16;
- Draw_Stringf( x, y, "Nodes culled : %i", st.nodesCulled ); y += 16;
- //Draw_String( x, y, "Nodes drawn : %i", c_nodesDrawn ); y += 16;
- //Draw_String( x, y, "Faces marked : %i", c_facesMarked ); y += 16;
- Draw_Stringf( x, y, "Faces drawn : %i", st.facesDrawn ); y += 16;
- if( st.facesCulled ) {
- Draw_Stringf( x, y, "Faces culled : %i", st.facesCulled ); y += 16;
+ Draw_Stringf( x, y, "Nodes visible : %i", c.nodesVisible ); y += 10;
+ Draw_Stringf( x, y, "Nodes culled : %i", c.nodesCulled ); y += 10;
+ Draw_Stringf( x, y, "Faces drawn : %i", c.facesDrawn ); y += 10;
+ if( c.facesCulled ) {
+ Draw_Stringf( x, y, "Faces culled : %i", c.facesCulled ); y += 10;
}
- if( st.boxesCulled ) {
- Draw_Stringf( x, y, "Boxes culled : %i", st.boxesCulled ); y += 16;
+ if( c.boxesCulled ) {
+ Draw_Stringf( x, y, "Boxes culled : %i", c.boxesCulled ); y += 10;
}
- if( st.spheresCulled ) {
- Draw_Stringf( x, y, "Spheres culled : %i", st.spheresCulled ); y += 16;
+ if( c.spheresCulled ) {
+ Draw_Stringf( x, y, "Spheres culled : %i", c.spheresCulled ); y += 10;
}
- if( st.rotatedBoxesCulled ) {
- Draw_Stringf( x, y, "RtBoxes culled : %i", st.rotatedBoxesCulled ); y += 16;
+ if( c.rotatedBoxesCulled ) {
+ Draw_Stringf( x, y, "RtBoxes culled : %i", c.rotatedBoxesCulled ); y += 10;
}
- Draw_Stringf( x, y, "Tris drawn : %i", st.trisDrawn ); y += 16;
- Draw_Stringf( x, y, "Tex switches : %i", st.texSwitches ); y += 16;
- if( st.batchesDrawn ) {
- Draw_Stringf( x, y, "Batches drawn: %i", st.batchesDrawn ); y += 16;
- Draw_Stringf( x, y, "Faces / batch: %i", st.facesDrawn / st.batchesDrawn );
- y += 16;
- Draw_Stringf( x, y, "Tris / batch : %i", st.trisDrawn / st.batchesDrawn );
- y += 16;
+ Draw_Stringf( x, y, "Tris drawn : %i", c.trisDrawn ); y += 10;
+ Draw_Stringf( x, y, "Tex switches : %i", c.texSwitches ); y += 10;
+ if( c.batchesDrawn ) {
+ Draw_Stringf( x, y, "Batches drawn: %i", c.batchesDrawn ); y += 10;
+ Draw_Stringf( x, y, "Faces / batch: %i", c.facesDrawn / c.batchesDrawn );
+ y += 10;
+ Draw_Stringf( x, y, "Tris / batch : %i", c.trisDrawn / c.batchesDrawn );
+ y += 10;
}
-
- y += 16;
- /*
- Draw_String( x, y, "Drawing order: %s", orderStr[r_drawOrder] ); y += 16;
- Draw_String( x, y, "Depth test : %s", enableStr[r_depthTest] ); y += 16;
- Draw_String( x, y, "Faces culling: %s", enableStr[r_cullFace] ); y += 16;
- Draw_String( x, y, "Faces sorting: %s", enableStr[enableSort] ); y += 16;
- Draw_String( x, y, "Algorithm : %s", algStr[doMergeSort] ); y += 16;
- */
-
- y += 16;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 05:52:45 +0000