qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the backtile for glsl.

Browse source 
Since the backtile is loaded into a scrap and used as a subtexture, we
can't use GL's texture wrapping, thus do the wrapping ourselves. There are
some minor issues with the wrong part of the scrap being drawn: need to
investigate where the bug is (vrect, make_quad, etc).
This commit is contained in:
Bill Currie 2012-07-09 15:11:03 +09:00
parent 99e050e828
commit 5014825b39
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libs/video/renderer/glsl/glsl_draw.c
View file

@ -109,7 +109,7 @@ static qpic_t *conchars;
static int conback_texture; static int conback_texture;
static qpic_t *crosshair_pic; static qpic_t *crosshair_pic;
static qpic_t *white_pic; static qpic_t *white_pic;
//FIXME static qpic_t *backtile_pic; static qpic_t *backtile_pic;
static hashtab_t *pic_cache; static hashtab_t *pic_cache;
static cvar_t *glsl_conback_texnum; static cvar_t *glsl_conback_texnum;
@ -417,7 +417,7 @@ glsl_Draw_Init (void)
memset (white_block, 0xfe, sizeof (white_block)); memset (white_block, 0xfe, sizeof (white_block));
white_pic = pic_data ("white_block", 8, 8, white_block); white_pic = pic_data ("white_block", 8, 8, white_block);
//FIXME backtile_pic = glsl_Draw_PicFromWad ("backtile"); backtile_pic = glsl_Draw_PicFromWad ("backtile");
//FIXME gl = (glpic_t *) backtile_pic->data; //FIXME gl = (glpic_t *) backtile_pic->data;
//FIXME qfeglBindTexture (GL_TEXTURE_2D, gl->texnum); //FIXME qfeglBindTexture (GL_TEXTURE_2D, gl->texnum);
//FIXME qfeglTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); //FIXME qfeglTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@ -654,8 +654,36 @@ glsl_Draw_ConsoleBackground (int lines, byte alpha)
void void
glsl_Draw_TileClear (int x, int y, int w, int h) glsl_Draw_TileClear (int x, int y, int w, int h)
{ {
//FIXME static quat_t color = { 1, 1, 1, 1 }; static quat_t color[2] = {{ 1, 1, 1, 1 }, {0.5,0.5,0.5,1}};
//FIXME draw_pic (x, y, w, h, backtile_pic, 0, 0, w, h, color); vrect_t *tile_rect = VRect_New (x, y, w, h);
vrect_t *sub = VRect_New (0, 0, 0, 0); // filled in later;
glpic_t *gl = (glpic_t *) backtile_pic->data;
subpic_t *sp = gl->subpic;
int sub_sx, sub_sy, sub_ex, sub_ey;
int i, j;
sub_sx = x / sp->width;
sub_sy = y / sp->height;
sub_ex = (x + w + sp->width - 1) / sp->width;
sub_ey = (y + h + sp->height - 1) / sp->height;
for (j = sub_sy; j < sub_ey; j++) {
for (i = sub_sx; i < sub_ex; i++) {
vrect_t *t = sub;
sub->x = i * sp->width;
sub->y = j * sp->height;
sub->width = sp->width;
sub->height = sp->height;
sub = VRect_Intersect (sub, tile_rect);
VRect_Delete (t);
draw_pic (sub->x, sub->y, sub->width, sub->height, backtile_pic,
sub->x % sub->width, sub->y % sub->height,
sub->width, sub->height, color[(i + j)&1]);
}
}
VRect_Delete (sub);
VRect_Delete (tile_rect);
flush_2d ();
} }
void void