X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=0ab9c19d7920551f53f81998164008b92526dea3;hb=7101ee8792b04808dbe15d80a06bdad5c281db20;hp=378bf682e38f0e3660aa550c8ca931b980256729;hpb=59d5ffaf49cffaec27871bfe53c9472d1f3d4259;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 378bf682..0ab9c19d 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -335,7 +335,7 @@ cachepic_t *Draw_CachePic (char *path) if (pic->tex == NULL) { Con_Printf("Draw_CachePic: failed to load %s\n", path); - pic->tex = r_notexture; + pic->tex = r_texture_notexture; } pic->width = R_TextureWidth(pic->tex); @@ -477,8 +477,8 @@ void R_DrawQueue(void) r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width); r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height); r_view_z = 0; - r_view_fov_x = bound(1, r_refdef.fov_x, 170); - r_view_fov_y = bound(1, r_refdef.fov_y, 170); + r_view_fov_x = bound(0.1, r_refdef.fov_x, 170); + r_view_fov_y = bound(0.1, r_refdef.fov_y, 170); r_view_matrix = r_refdef.viewentitymatrix; GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); @@ -502,7 +502,7 @@ void R_DrawQueue(void) { dq = (drawqueue_t *)(r_refdef.drawqueue + pos); color = dq->color; - + if(dq->flags == DRAWFLAG_ADDITIVE) GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); else if(dq->flags == DRAWFLAG_MODULATE) @@ -559,7 +559,7 @@ void R_DrawQueue(void) if (batchcount >= 128) { GL_LockArrays(0, batchcount * 4); - R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); + R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements); GL_LockArrays(0, 0); batchcount = 0; at = varray_texcoord2f[0]; @@ -571,7 +571,7 @@ void R_DrawQueue(void) if (batchcount > 0) { GL_LockArrays(0, batchcount * 4); - R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); + R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements); GL_LockArrays(0, 0); } break; @@ -585,7 +585,7 @@ void R_DrawQueue(void) m.pointer_texcoord[0] = NULL; R_Mesh_State(&m); GL_LockArrays(0, mesh->num_vertices); - R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i); + R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i); GL_LockArrays(0, 0); break; case DRAWQUEUE_SETCLIP: @@ -593,7 +593,7 @@ void R_DrawQueue(void) // We have to convert the con coords into real coords int x , y, width, height; x = dq->x * ((float)vid.realwidth / vid.conwidth); - // OGL uses top to bottom + // OGL uses top to bottom y = dq->y * ((float) vid.realheight / vid.conheight); width = dq->scalex * ((float)vid.realwidth / vid.conwidth); height = dq->scaley * ((float)vid.realheight / vid.conheight); @@ -605,7 +605,7 @@ void R_DrawQueue(void) break; case DRAWQUEUE_RESETCLIP: GL_ScissorTest(false); - break; + break; } } @@ -631,7 +631,7 @@ void R_DrawQueue(void) while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f) { GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1); - R_Mesh_Draw(3, 1, polygonelements); + R_Mesh_Draw(0, 3, 1, polygonelements); VectorScale(c, 0.5, c); } } @@ -647,7 +647,7 @@ void R_DrawQueue(void) { GL_BlendFunc(GL_ONE, GL_ONE); GL_Color(c[0], c[1], c[2], 1); - R_Mesh_Draw(3, 1, polygonelements); + R_Mesh_Draw(0, 3, 1, polygonelements); } } }