hifuu-club/illusion-arena-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Different proactive changes to prevent problems... or make them A LOT more visible.

Browse Source
This commit is contained in:
sago007
2016-11-27 11:24:18 +01:00
parent 6688bf3269
commit 217a26e3c6
3 changed files with 842 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
code/client/snd_codec_xmp.c
View File

@@ -80,12 +80,10 @@ S_XMP_CodecOpenStream
// FIXME: there's a memory leak here if you start the same song many many many many times. // FIXME: there's a memory leak here if you start the same song many many many many times.
snd_stream_t *S_XMP_CodecOpenStream(const char *filename) snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
{ {
snd_stream_t *rv;
// First let's close whatever song we had.... // First let's close whatever song we had....
// Open // Open
rv = S_CodecUtilOpen(filename, &xmp_codec); snd_stream_t *rv = S_CodecUtilOpen(filename, &xmp_codec);
if(!rv) if(!rv)
return NULL; return NULL;
@@ -93,7 +91,6 @@ snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
{ {
fileHandle_t file; fileHandle_t file;
void *buffer;
// Try to open the file // Try to open the file
FS_FOpenFileRead(filename, &file, qtrue); FS_FOpenFileRead(filename, &file, qtrue);
@@ -105,15 +102,14 @@ snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
// Allocate some memory // Allocate some memory
long thelength = FS_ReadFile(filename, buffer); long thelength = FS_ReadFile(filename, NULL);
buffer = Hunk_AllocateTempMemory(thelength); void *buffer = Hunk_AllocateTempMemory(thelength);
if(!buffer) if(!buffer)
{ {
FS_FCloseFile(file); FS_FCloseFile(file);
Com_Printf( S_COLOR_RED "ERROR: Out of memory reading \"%s\"\n", Com_Printf( S_COLOR_RED "ERROR: Out of memory reading \"%s\"\n", filename);
filename);
return NULL; return NULL;
} }
@@ -133,15 +129,13 @@ snd_stream_t *S_XMP_CodecOpenStream(const char *filename)
FS_FCloseFile(file); // unfortunately these do not help with the leak FS_FCloseFile(file); // unfortunately these do not help with the leak
if (itsloaded == 0) if (itsloaded == 0)
itsloaded = xmp_start_player(xmpsong, xmpspeed, 0); // TODO: do sample rate of the mixer. itsloaded = xmp_start_player(xmpsong, xmpspeed, 0); // TODO: do sample rate of the mixer.
if (itsloaded == 0){ if (itsloaded == 0){
// Com_Printf("XMP loaded our buffer of the file %s which is %i long \n", filename, thelength);
// Com_Printf("XMP loaded our buffer of the file %s which is %i long \n", filename, thelength); xmp_get_module_info(xmpsong, &mi);
xmp_get_module_info(xmpsong, &mi); // Com_Printf("Song Name: %s\n", mi.mod->name);
// Com_Printf("Song Name: %s\n", mi.mod->name); // Com_Printf("CODECLOAD %s\n", filename);
// Com_Printf("CODECLOAD %s\n", filename);
} }
} }
@@ -182,9 +176,6 @@ int S_XMP_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer)
// buffer handling // buffer handling
struct xmp_module_info mi; struct xmp_module_info mi;
struct xmp_frame_info fi; struct xmp_frame_info fi;
int bytesRead, bytesLeft, c;
char *bufPtr;
// check if input is valid // check if input is valid
if(!(stream && buffer)) if(!(stream && buffer))
@@ -197,9 +188,9 @@ int S_XMP_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer)
return 0; return 0;
} }
bytesRead = 0; int bytesRead = 0;
bytesLeft = bytes; int bytesLeft = bytes;
bufPtr = buffer; char* bufPtr = buffer;
// cycle until we have the requested or all available bytes read // cycle until we have the requested or all available bytes read
while(-1) while(-1)
@@ -207,26 +198,26 @@ int S_XMP_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer)
int yeah=xmp_play_buffer(xmpsong, buffer, bytesLeft, 0); int yeah=xmp_play_buffer(xmpsong, buffer, bytesLeft, 0);
if (yeah == 0){ // if we can play it... if (yeah == 0){ // if we can play it...
xmp_get_frame_info(xmpsong, &fi); xmp_get_frame_info(xmpsong, &fi);
c = fi.buffer; int c = fi.buffer_size;
// no more bytes are left // no more bytes are left
if(c <= 0) if(c <= 0)
{ {
break; break;
} }
bytesRead += c; bytesRead += c;
bytesLeft -= c; bytesLeft -= c;
bufPtr += c; bufPtr += c;
xmp_get_module_info(xmpsong, &mi); xmp_get_module_info(xmpsong, &mi);
// we have enough bytes // we have enough bytes
if(bytesLeft <= 0) if(bytesLeft <= 0)
{ {
break; break;
} }
} }
else // if we can't play it JUST STOP OK else // if we can't play it JUST STOP OK
{ {

204
code/renderer_oa/tr_bloom.c
View File

@@ -751,30 +751,33 @@ static void ID_INLINE R_Bloom_QuadTV( int width, int height, float texX, float t
static void R_Bloom_RestoreScreen_Postprocessed( void ) { static void R_Bloom_RestoreScreen_Postprocessed( void ) {
#ifdef GLSL_POSTPROCESSING #ifdef GLSL_POSTPROCESSING
glslProgram_t *program; glslProgram_t *program = NULL;
if (leifxmode) if (leifxmode) {
{ if (leifxmode == 1){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXDitherProgram); program=tr.programs[tr.leiFXDitherProgram];}
if (leifxmode == 1){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXDitherProgram); program=tr.programs[tr.leiFXDitherProgram];} if (leifxmode == 2){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXGammaProgram); program=tr.programs[tr.leiFXGammaProgram];}
if (leifxmode == 2){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXGammaProgram); program=tr.programs[tr.leiFXGammaProgram];} if (leifxmode == 3){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXFilterProgram); program=tr.programs[tr.leiFXFilterProgram];}
if (leifxmode == 3){ if (vertexShaders) R_GLSL_UseProgram(tr.leiFXFilterProgram); program=tr.programs[tr.leiFXFilterProgram];} if (leifxmode == 888){ if (vertexShaders) R_GLSL_UseProgram(tr.animeProgram); program=tr.programs[tr.animeProgram];}
if (leifxmode == 888){ if (vertexShaders) R_GLSL_UseProgram(tr.animeProgram); program=tr.programs[tr.animeProgram];} if (leifxmode == 999){ if (vertexShaders) R_GLSL_UseProgram(tr.animeFilmProgram); program=tr.programs[tr.animeFilmProgram];}
if (leifxmode == 999){ if (vertexShaders) R_GLSL_UseProgram(tr.animeFilmProgram); program=tr.programs[tr.animeFilmProgram];} if (leifxmode == 777){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurProgram); program=tr.programs[tr.motionBlurProgram];}
if (leifxmode == 777){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurProgram); program=tr.programs[tr.motionBlurProgram];} if (leifxmode == 778){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurProgram); program=tr.programs[tr.motionBlurProgram];}
if (leifxmode == 778){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurProgram); program=tr.programs[tr.motionBlurProgram];} if (leifxmode == 779){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurPostProgram); program=tr.programs[tr.motionBlurPostProgram];}
if (leifxmode == 779){ if (vertexShaders) R_GLSL_UseProgram(tr.motionBlurPostProgram); program=tr.programs[tr.motionBlurPostProgram];} if (leifxmode == 632){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCEncodeProgram); program=tr.programs[tr.NTSCEncodeProgram];}
if (leifxmode == 632){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCEncodeProgram); program=tr.programs[tr.NTSCEncodeProgram];} if (leifxmode == 633){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCDecodeProgram); program=tr.programs[tr.NTSCDecodeProgram];}
if (leifxmode == 633){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCDecodeProgram); program=tr.programs[tr.NTSCDecodeProgram];} if (leifxmode == 634){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCBleedProgram); program=tr.programs[tr.NTSCBleedProgram];}
if (leifxmode == 634){ if (vertexShaders) R_GLSL_UseProgram(tr.NTSCBleedProgram); program=tr.programs[tr.NTSCBleedProgram];} if (leifxmode == 666){ if (vertexShaders) R_GLSL_UseProgram(tr.BrightnessProgram); program=tr.programs[tr.BrightnessProgram];}
if (leifxmode == 666){ if (vertexShaders) R_GLSL_UseProgram(tr.BrightnessProgram); program=tr.programs[tr.BrightnessProgram];} if (leifxmode == 1236){ if (vertexShaders) R_GLSL_UseProgram(tr.CRTProgram); program=tr.programs[tr.CRTProgram];}
if (leifxmode == 1236){ if (vertexShaders) R_GLSL_UseProgram(tr.CRTProgram); program=tr.programs[tr.CRTProgram];} if (leifxmode == 1997){ if (vertexShaders) R_GLSL_UseProgram(tr.paletteProgram); program=tr.programs[tr.paletteProgram];}
if (leifxmode == 1997){ if (vertexShaders) R_GLSL_UseProgram(tr.paletteProgram); program=tr.programs[tr.paletteProgram];}
} }
else else {
{ if (vertexShaders) R_GLSL_UseProgram(tr.postprocessingProgram);
if (vertexShaders) R_GLSL_UseProgram(tr.postprocessingProgram); // Feed GLSL postprocess program
// Feed GLSL postprocess program program=tr.programs[tr.postprocessingProgram];
program=tr.programs[tr.postprocessingProgram]; }
if (!program) {
//If leifsmode has been set to something invalid we have to bail out or we will dereference a null pointer
Com_Printf( S_COLOR_YELLOW"WARNING: 'leifxmode' has an invalid value\n" );
return;
} }
if (program->u_ScreenSizeX > -1) R_GLSL_SetUniform_u_ScreenSizeX(program, glConfig.vidWidth); if (program->u_ScreenSizeX > -1) R_GLSL_SetUniform_u_ScreenSizeX(program, glConfig.vidWidth);
@@ -1133,11 +1136,13 @@ static void R_Postprocess_InitTextures( void )
// postproc.tvwork.height /= intdiv; // interlacey // postproc.tvwork.height /= intdiv; // interlacey
for (postproc.tveffect.width = 1;postproc.tveffect.width < postproc.tvwork.width;postproc.tveffect.width *= 2); for (postproc.tveffect.width = 1;postproc.tveffect.width < postproc.tvwork.width;postproc.tveffect.width *= 2) {}
if (intdiv > 1) if (intdiv > 1) {
for (postproc.tveffect.height = 1;(postproc.tveffect.height/2) < postproc.tvwork.height;postproc.tveffect.height *= 2); for (postproc.tveffect.height = 1;(postproc.tveffect.height/2) < postproc.tvwork.height;postproc.tveffect.height *= 2) {}
else }
for (postproc.tveffect.height = 1;postproc.tveffect.height < postproc.tvwork.height;postproc.tveffect.height *= 2); else {
for (postproc.tveffect.height = 1;postproc.tveffect.height < postproc.tvwork.height;postproc.tveffect.height *= 2) {}
}
postproc.tveffect.readW = postproc.tvwork.width / (float)postproc.tveffect.width; postproc.tveffect.readW = postproc.tvwork.width / (float)postproc.tveffect.width;
postproc.tveffect.readH = postproc.tvwork.height / (float)postproc.tveffect.height; postproc.tveffect.readH = postproc.tvwork.height / (float)postproc.tveffect.height;
@@ -1340,9 +1345,9 @@ void R_LeiFXPostprocessDitherScreen( void )
leifxmode = 1; // reduct and dither - 1 pass leifxmode = 1; // reduct and dither - 1 pass
R_Postprocess_BackupScreen(); R_Postprocess_BackupScreen();
R_Bloom_RestoreScreen_Postprocessed(); R_Bloom_RestoreScreen_Postprocessed();
} }
force32upload = 0; force32upload = 0;
#endif #endif
} }
@@ -1365,9 +1370,10 @@ void R_LeiFXPostprocessFilterScreen( void )
return; return;
} }
if ( !backEnd.projection2D ) if ( !backEnd.projection2D ) {
RB_SetGL2D(); RB_SetGL2D();
force32upload = 1; }
force32upload = 1;
// postprocess = 1; // postprocess = 1;
@@ -1381,8 +1387,8 @@ void R_LeiFXPostprocessFilterScreen( void )
*/ // Gamma disabled because r_alternateBrightness 2 makes it redundant now. */ // Gamma disabled because r_alternateBrightness 2 makes it redundant now.
if (r_leifx->integer > 3){ if (r_leifx->integer > 3){
leifxmode = 3; // filter - 4 pass leifxmode = 3; // filter - 4 pass
// The stupidest hack in america // The stupidest hack in america
R_LeiFX_Stupid_Hack(); R_LeiFX_Stupid_Hack();
leifxpass = 0; leifxpass = 0;
R_Postprocess_BackupScreen(); R_Postprocess_BackupScreen();
R_Bloom_RestoreScreen_Postprocessed(); R_Bloom_RestoreScreen_Postprocessed();
@@ -1395,10 +1401,10 @@ void R_LeiFXPostprocessFilterScreen( void )
leifxpass = 3; leifxpass = 3;
R_Postprocess_BackupScreen(); R_Postprocess_BackupScreen();
R_Bloom_RestoreScreen_Postprocessed(); R_Bloom_RestoreScreen_Postprocessed();
} }
backEnd.doneleifx = qtrue; backEnd.doneleifx = qtrue;
force32upload = 0; force32upload = 0;
#endif #endif
} }
@@ -1432,9 +1438,10 @@ void R_NTSCScreen( void )
return; return;
} }
if ( !backEnd.projection2D ) if ( !backEnd.projection2D ) {
RB_SetGL2D(); RB_SetGL2D();
force32upload = 1; }
force32upload = 1;
int ntsc_bleed = 0; int ntsc_bleed = 0;
int ntsc_encode = 0; int ntsc_encode = 0;
@@ -1545,7 +1552,7 @@ void R_BrightItUp (int dst, int src, float intensity)
void R_BrightScreen( void ) void R_BrightScreen( void )
{ {
int mode; // 0 = none; 1 = blend; 2 = shader int mode = 0; // 0 = none; 1 = blend; 2 = shader
if( !r_alternateBrightness->integer) if( !r_alternateBrightness->integer)
return; return;
if ( backEnd.doneAltBrightness) if ( backEnd.doneAltBrightness)
@@ -1557,10 +1564,12 @@ void R_BrightScreen( void )
if (r_alternateBrightness->integer == 2) if (r_alternateBrightness->integer == 2)
{ {
// Automatically determine from capabilities // Automatically determine from capabilities
if ( vertexShaders ) if ( vertexShaders ) {
mode = 2; mode = 2;
else }
mode = 1; else {
mode = 1;
}
} }
// the modern pixel shader way // the modern pixel shader way
@@ -1595,14 +1604,12 @@ void R_BrightScreen( void )
else if (mode == 1) else if (mode == 1)
#endif #endif
{ {
int eh, ah; int eh, ah;
if ((r_overBrightBits->integer)) if ((r_overBrightBits->integer)) {
{
ah = r_overBrightBits->integer; ah = r_overBrightBits->integer;
if (ah < 1) ah = 1; if (ah > 2) ah = 2; // clamp so it never looks stupid if (ah < 1) { ah = 1; }
if (ah > 2) { ah = 2; } // clamp so it never looks stupid
// Blend method // Blend method
// do a loop for every overbright bit enabled // do a loop for every overbright bit enabled
@@ -1611,8 +1618,7 @@ void R_BrightScreen( void )
R_BrightItUp(GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_ONE, 1.0f); R_BrightItUp(GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_ONE, 1.0f);
backEnd.doneAltBrightness = qtrue; backEnd.doneAltBrightness = qtrue;
} }
} }
} }
@@ -1638,7 +1644,6 @@ void R_AltBrightnessInit( void ) {
void R_FilmScreen( void ) void R_FilmScreen( void )
{ {
vec3_t tone, toneinv, tonecont; vec3_t tone, toneinv, tonecont;
vec3_t tonework;
if( !r_film->integer ) if( !r_film->integer )
return; return;
@@ -1648,83 +1653,78 @@ void R_FilmScreen( void )
RB_SetGL2D(); RB_SetGL2D();
backEnd.doneFilm = qtrue; backEnd.doneFilm = qtrue;
// set up our colors, this is our default // set up our colors, this is our default
tone[0] = 0.8f; tone[0] = 0.8f;
tone[1] = 0.9f; tone[1] = 0.9f;
tone[2] = 1.0f; tone[2] = 1.0f;
//VectorCopy( backEnd.currentEntity->ambientLight, tone ); //VectorCopy( backEnd.currentEntity->ambientLight, tone );
if (backEnd.currentEntity){ if (backEnd.currentEntity){
if (backEnd.currentEntity->ambientLight[0] > 0.001f && backEnd.currentEntity->ambientLight[1] > 0.001f && backEnd.currentEntity->ambientLight[2] > 0.001f){ if (backEnd.currentEntity->ambientLight[0] > 0.001f && backEnd.currentEntity->ambientLight[1] > 0.001f && backEnd.currentEntity->ambientLight[2] > 0.001f){
tone[0] = backEnd.currentEntity->ambientLight[0]; tone[0] = backEnd.currentEntity->ambientLight[0];
tone[1] = backEnd.currentEntity->ambientLight[1]; tone[1] = backEnd.currentEntity->ambientLight[1];
tone[2] = backEnd.currentEntity->ambientLight[2]; tone[2] = backEnd.currentEntity->ambientLight[2];
}
} }
}
// VectorNormalize(tone); // VectorNormalize(tone);
tone[0] *= 0.3 + 0.7; tone[0] *= 0.3 + 0.7;
tone[1] *= 0.3 + 0.7; tone[1] *= 0.3 + 0.7;
tone[2] *= 0.3 + 0.7; tone[2] *= 0.3 + 0.7;
// tone[0] = 1.6f; // tone[0] = 1.6f;
// tone[1] = 1.2f; // tone[1] = 1.2f;
// tone[2] = 0.7f; // tone[2] = 0.7f;
// TODO: Get overexposure to flares raising this faking "HDR" // TODO: Get overexposure to flares raising this faking "HDR"
tonecont[0] = 0.0f; tonecont[0] = 0.0f;
tonecont[1] = 0.0f; tonecont[1] = 0.0f;
tonecont[2] = 0.0f; tonecont[2] = 0.0f;
// inverted
toneinv[0] = tone[0] * -1 + 1 + tonecont[0]; // inverted
toneinv[1] = tone[1] * -1 + 1 + tonecont[1];
toneinv[2] = tone[2] * -1 + 1 + tonecont[2];
// darken vignette. toneinv[0] = tone[0] * -1 + 1 + tonecont[0];
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO);GL_Bind( tr.dlightImage ); GL_Cull( CT_TWO_SIDED ); toneinv[1] = tone[1] * -1 + 1 + tonecont[1];
qglColor4f( 0.941177, 0.952941, 0.968628, 1.0f ); toneinv[2] = tone[2] * -1 + 1 + tonecont[2];
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0.35f, 0.35f, 0.2f, 0.2f );
// darken vignette.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO);GL_Bind( tr.dlightImage ); GL_Cull( CT_TWO_SIDED );
qglColor4f( 0.941177, 0.952941, 0.968628, 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0.35f, 0.35f, 0.2f, 0.2f );
// brighten. // brighten.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE);GL_Bind( tr.dlightImage ); GL_Cull( CT_TWO_SIDED ); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE);GL_Bind( tr.dlightImage ); GL_Cull( CT_TWO_SIDED );
//qglColor4f( 0.941177, 0.952941, 0.968628, 1.0f ); //qglColor4f( 0.941177, 0.952941, 0.968628, 1.0f );
qglColor4f( (0.9f + (tone[0] * 0.5)), (0.9f + (tone[1] * 0.5)), (0.9f + (tone[2] * 0.5)), 1.0f ); qglColor4f( (0.9f + (tone[0] * 0.5)), (0.9f + (tone[1] * 0.5)), (0.9f + (tone[2] * 0.5)), 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0.25f, 0.25f, 0.48f, 0.48f ); R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0.25f, 0.25f, 0.48f, 0.48f );
// invert. // invert.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE_MINUS_DST_COLOR | GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED ); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE_MINUS_DST_COLOR | GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED );
// qglColor4f(0.85098, 0.85098, 0.815686, 1.0f ); // qglColor4f(0.85098, 0.85098, 0.815686, 1.0f );
qglColor4f( (0.8f + (toneinv[0] * 0.5)), (0.8f + (toneinv[1] * 0.5)), (0.8f + (toneinv[2] * 0.5)), 1.0f ); qglColor4f( (0.8f + (toneinv[0] * 0.5)), (0.8f + (toneinv[1] * 0.5)), (0.8f + (toneinv[2] * 0.5)), 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 ); R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 );
// brighten. // brighten.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED ); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED );
qglColor4f( 0.615686, 0.615686, 0.615686, 1.0f ); qglColor4f( 0.615686, 0.615686, 0.615686, 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 ); R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 );
// invoort. // invoort.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE_MINUS_DST_COLOR | GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED ); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE_MINUS_DST_COLOR | GLS_DSTBLEND_ONE_MINUS_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED );
qglColor4f(1.0f, 1.0f, 1.0f , 1.0f ); qglColor4f(1.0f, 1.0f, 1.0f , 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 ); R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 );
// brighten. // brighten.
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED ); GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_SRC_COLOR);GL_Bind( tr.whiteImage ); GL_Cull( CT_TWO_SIDED );
// qglColor4f( 0.866667, 0.847059, 0.776471, 1.0f ); // qglColor4f( 0.866667, 0.847059, 0.776471, 1.0f );
qglColor4f( (0.73f + (toneinv[0] * 0.4)), (0.73f + (toneinv[1] * 0.4)), (0.73f + (toneinv[2] * 0.4)), 1.0f ); qglColor4f( (0.73f + (toneinv[0] * 0.4)), (0.73f + (toneinv[1] * 0.4)), (0.73f + (toneinv[2] * 0.4)), 1.0f );
R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 ); R_Brighter_Quad( glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1, 1 );
} }

1424
code/renderer_oa/tr_model_mdo.c
View File

File diff suppressed because it is too large Load Diff