FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

06 Apr 2015

This commit is contained in:
g-cont 2015-04-06 00:00:00 +03:00 committed by Alibek Omarov
parent 171038bec5
commit b636db4082
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/gl_backend.c
View File

@ -377,32 +377,30 @@ void GL_FrontFace( GLenum front )
void GL_SetRenderMode( int mode ) void GL_SetRenderMode( int mode )
{ {
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
switch( mode ) switch( mode )
{ {
case kRenderNormal: case kRenderNormal:
default: default:
pglDisable( GL_BLEND ); pglDisable( GL_BLEND );
pglDisable( GL_ALPHA_TEST ); pglDisable( GL_ALPHA_TEST );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
break; break;
case kRenderTransColor: case kRenderTransColor:
case kRenderTransTexture: case kRenderTransTexture:
pglEnable( GL_BLEND ); pglEnable( GL_BLEND );
pglDisable( GL_ALPHA_TEST ); pglDisable( GL_ALPHA_TEST );
pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break; break;
case kRenderTransAlpha: case kRenderTransAlpha:
pglDisable( GL_BLEND ); pglDisable( GL_BLEND );
pglEnable( GL_ALPHA_TEST ); pglEnable( GL_ALPHA_TEST );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break; break;
case kRenderGlow: case kRenderGlow:
case kRenderTransAdd: case kRenderTransAdd:
pglEnable( GL_BLEND ); pglEnable( GL_BLEND );
pglDisable( GL_ALPHA_TEST ); pglDisable( GL_ALPHA_TEST );
pglBlendFunc( GL_SRC_ALPHA, GL_ONE ); pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break; break;
} }
} }

4
engine/client/gl_image.c
View File

@ -722,7 +722,7 @@ static GLenum GL_TextureFormat( gltexture_t *tex, int *samples )
case 1: format = GL_LUMINANCE8; break; case 1: format = GL_LUMINANCE8; break;
case 2: format = GL_LUMINANCE8_ALPHA8; break; case 2: format = GL_LUMINANCE8_ALPHA8; break;
case 3: case 3:
if( gl_luminance_textures->integer ) if( gl_luminance_textures->integer && !( tex->flags & TF_UNCOMPRESSED ))
{ {
switch( bits ) switch( bits )
{ {
@ -744,7 +744,7 @@ static GLenum GL_TextureFormat( gltexture_t *tex, int *samples )
break; break;
case 4: case 4:
default: default:
if( gl_luminance_textures->integer ) if( gl_luminance_textures->integer && !( tex->flags & TF_UNCOMPRESSED ))
{ {
switch( bits ) switch( bits )
{ {

2
engine/client/gl_vidnt.c
View File

@ -693,7 +693,7 @@ qboolean GL_CreateContext( void )
if(!( pwglMakeCurrent( glw_state.hDC, glw_state.hGLRC ))) if(!( pwglMakeCurrent( glw_state.hDC, glw_state.hGLRC )))
return GL_DeleteContext(); return GL_DeleteContext();
if( host.developer <= 1 ) if( !Sys_CheckParm( "-gldebug" ) || host.developer < 1 ) // debug bit the kills perfomance
return true; return true;
pwglCreateContextAttribsARB = GL_GetProcAddress( "wglCreateContextAttribsARB" ); pwglCreateContextAttribsARB = GL_GetProcAddress( "wglCreateContextAttribsARB" );

5
engine/common/keys.c
View File

@ -551,11 +551,16 @@ void Key_Event( int key, qboolean down )
// escape is always handled special // escape is always handled special
if( key == K_ESCAPE && down ) if( key == K_ESCAPE && down )
{ {
kb = keys[key].binding;
switch( cls.key_dest ) switch( cls.key_dest )
{ {
case key_game: case key_game:
if( host.mouse_visible && cls.state != ca_cinematic ) if( host.mouse_visible && cls.state != ca_cinematic )
{
clgame.dllFuncs.pfnKey_Event( down, key, keys[key].binding );
return; // handled in client.dll return; // handled in client.dll
}
break; break;
case key_message: case key_message:
Key_Message( key ); Key_Message( key );