qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Grievres' water HOM and mtex FB only rendering FB texture fix

Browse source
This commit is contained in:
Chris Ison 2004-02-21 09:04:52 +00:00
parent f1c9a8d24b
commit ca6112767c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/video/renderer/gl/gl_rmain.c
View file

@ -278,7 +278,7 @@ R_DrawEntitiesOnList (void)
qfglHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE); qfglHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_DONT_CARE);
if (gl_mtex_active) { // FIXME: Ugly, but faster than cleaning up in every if (gl_mtex_active) { // FIXME: Ugly, but faster than cleaning up in every
// R_DrawAliasModel()! // R_DrawAliasModel()!
qfglColor4ubv (color_white); // qfglColor4ubv (color_white);
qglActiveTexture (gl_mtex_enum + 1); qglActiveTexture (gl_mtex_enum + 1);
qfglEnable (GL_TEXTURE_2D); qfglEnable (GL_TEXTURE_2D);
if (gl_combine_capable && gl_doublebright->int_val) { if (gl_combine_capable && gl_doublebright->int_val) {
@ -326,7 +326,7 @@ R_DrawViewModel (void)
qfglColor3ubv (color_white); qfglColor3ubv (color_white);
if (gl_mtex_active) { // FIXME: Ugly, but faster than cleaning up in every if (gl_mtex_active) { // FIXME: Ugly, but faster than cleaning up in every
// R_DrawAliasModel()! // R_DrawAliasModel()!
qfglColor4ubv (color_white); // qfglColor4ubv (color_white);
qglActiveTexture (gl_mtex_enum + 1); qglActiveTexture (gl_mtex_enum + 1);
qfglEnable (GL_TEXTURE_2D); qfglEnable (GL_TEXTURE_2D);
if (gl_combine_capable && gl_doublebright->int_val) { if (gl_combine_capable && gl_doublebright->int_val) {

4
libs/video/targets/vid_common_gl.c
View file

@ -424,9 +424,9 @@ GL_Init_Common (void)
GL_Common_Init_Cvars (); GL_Common_Init_Cvars ();
CheckVertexArraySize (); CheckVertexArraySize ();
if (gl_mtex_active) { if (gl_mtex_capable) {
// Fullbrights // Fullbrights
if (gl_mtex_fullbright) { if (gl_mtex_tmus >= 3) {
qglActiveTexture (gl_mtex_enum + 2); qglActiveTexture (gl_mtex_enum + 2);
qfglEnable (GL_TEXTURE_2D); qfglEnable (GL_TEXTURE_2D);
qfglTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); qfglTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);