Merge remote-tracking branch 'lilium-arena/master'

Author: zturtleman

code/renderergl2/tr_backend.c

@@ -1809,7 +1809,16 @@ const void *RB_PostProcess(const void *data)
 			// Use an intermediate FBO because it can't blit to the same FBO directly
 			// and can't read from an MSAA dstFbo later.
 			RB_ToneMap(srcFbo, srcBox, tr.screenScratchFbo, srcBox, autoExposure);
-			FBO_FastBlit(tr.screenScratchFbo, srcBox, srcFbo, srcBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+			if (r_anaglyphMode->integer)
+			{
+				// glBlitFramebuffer() in FBO_FastBlit() doesn't respect glColorMask()
+				FBO_Blit(tr.screenScratchFbo, srcBox, NULL, srcFbo, srcBox, NULL, NULL, 0);
+			}
+			else
+			{
+				FBO_FastBlit(tr.screenScratchFbo, srcBox, srcFbo, srcBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			}
 		}
 		else if (r_cameraExposure->value != 0.0f)
 		{

code/renderergl2/tr_bsp.c

@@ -143,6 +143,19 @@ static	void R_ColorShiftLightingBytes( int inSize, byte in[4], byte out[4] ) {
 		b = b * 255 / max;
 	}
 
+	if(r_greyscale->integer)
+	{
+		int scale = LUMA(r, g, b);
+		r = g = b = scale;
+	}
+	else if(r_greyscale->value)
+	{
+		float scale = LUMA(r, g, b);
+		r = LERP(r, scale, r_greyscale->value);
+		g = LERP(g, scale, r_greyscale->value);
+		b = LERP(b, scale, r_greyscale->value);
+	}
+
 	out[0] = r;
 	out[1] = g;
 	out[2] = b;
@@ -180,6 +193,19 @@ static void R_ColorShiftLightingFloats(float in[4], float out[4])
 		b = b / max;
 	}
 
+	if(r_greyscale->integer)
+	{
+		scale = LUMA(r, g, b);
+		r = g = b = scale;
+	}
+	else if(r_greyscale->value)
+	{
+		scale = LUMA(r, g, b);
+		r = LERP(r, scale, r_greyscale->value);
+		g = LERP(g, scale, r_greyscale->value);
+		b = LERP(b, scale, r_greyscale->value);
+	}
+
 	out[0] = r;
 	out[1] = g;
 	out[2] = b;

code/renderergl2/tr_scene.c

@@ -467,6 +467,23 @@ void RE_AddDynamicLightToScene( const vec3_t org, float radius, float intensity,
 	} else {
 		dl->dlshader = NULL;
 	}
+
+	if(r_greyscale->integer)
+	{
+		float scale;
+
+		scale = LUMA(dl->color[0], dl->color[1], dl->color[2]);
+		dl->color[0] = dl->color[1] = dl->color[2] = scale;
+	}
+	else if(r_greyscale->value)
+	{
+		float scale;
+
+		scale = LUMA(dl->color[0], dl->color[1], dl->color[2]);
+		dl->color[0] = LERP(dl->color[0], scale, r_greyscale->value);
+		dl->color[1] = LERP(dl->color[1], scale, r_greyscale->value);
+		dl->color[2] = LERP(dl->color[2], scale, r_greyscale->value);
+	}
 }
 
 /*

code/renderergl2/tr_shade.c

@@ -758,20 +758,27 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t
 			break;
 	}
 
-	// FIXME: find some way to implement this.
-#if 0
-	// if in greyscale rendering mode turn all color values into greyscale.
-	if(r_greyscale->integer)
+	if (pStage->rgbGen == CGEN_CONST || pStage->rgbGen == CGEN_FOG
+	  || pStage->rgbGen == CGEN_ENTITY || pStage->rgbGen == CGEN_ONE_MINUS_ENTITY)
 	{
-		int scale;
-		
-		for(i = 0; i < tess.numVertexes; i++)
+		// if in greyscale rendering mode turn all color values into greyscale.
+		if(r_greyscale->integer)
 		{
-			scale = (tess.svars.colors[i][0] + tess.svars.colors[i][1] + tess.svars.colors[i][2]) / 3;
-			tess.svars.colors[i][0] = tess.svars.colors[i][1] = tess.svars.colors[i][2] = scale;
+			float scale;
+
+			scale = LUMA(baseColor[0], baseColor[1], baseColor[2]);
+			baseColor[0] = baseColor[1] = baseColor[2] = scale;
+		}
+		else if(r_greyscale->value)
+		{
+			float scale;
+
+			scale = LUMA(baseColor[0], baseColor[1], baseColor[2]);
+			baseColor[0] = LERP(baseColor[0], scale, r_greyscale->value);
+			baseColor[1] = LERP(baseColor[1], scale, r_greyscale->value);
+			baseColor[2] = LERP(baseColor[2], scale, r_greyscale->value);
 		}
 	}
-#endif
 }
 
 
@@ -2008,6 +2015,36 @@ void RB_StageIteratorGeneric( void )
 
 	if (tess.useInternalVao)
 	{
+		if (vertexAttribs & ATTR_COLOR)
+		{
+			// if in greyscale rendering mode turn all color values into greyscale.
+			if(r_greyscale->integer)
+			{
+				uint16_t *color = tess.color[0];
+				int i;
+				int scale;
+				for(i = 0; i < tess.numVertexes; i++, color += 4)
+				{
+					scale = LUMA(color[0], color[1], color[2]);
+					color[0] = color[1] = color[2] = scale;
+				}
+			}
+			else if(r_greyscale->value)
+			{
+				uint16_t *color = tess.color[0];
+				int i;
+				float scale;
+
+				for(i = 0; i < tess.numVertexes; i++, color += 4)
+				{
+					scale = LUMA(color[0], color[1], color[2]);
+					color[0] = LERP(color[0], scale, r_greyscale->value);
+					color[1] = LERP(color[1], scale, r_greyscale->value);
+					color[2] = LERP(color[2], scale, r_greyscale->value);
+				}
+			}
+		}
+
 		RB_UpdateTessVao(vertexAttribs);
 	}
 	else

code/server/sv_main.c

@@ -1190,12 +1190,6 @@ void SV_Frame( int msec ) {
 		Cbuf_AddText( va( "map %s\n", Cvar_VariableString( "mapname" ) ) );
 		return;
 	}
-	// this can happen considerably earlier when lots of clients play and the map doesn't change
-	if ( svs.nextSnapshotEntities >= 0x7FFFFFFE - svs.numSnapshotEntities ) {
-		SV_Shutdown( "Restarting server due to numSnapshotEntities wrapping" );
-		Cbuf_AddText( va( "map %s\n", Cvar_VariableString( "mapname" ) ) );
-		return;
-	}
 
 	if( sv.restartTime && sv.time >= sv.restartTime ) {
 		Cbuf_AddText( "map_restart\n" );

code/server/sv_snapshot.c

@@ -594,14 +594,15 @@ currently doesn't.
 */
 static void SV_BuildClientSnapshot( client_t *client ) {
 	vec3_t						org;
-	clientSnapshot_t			*frame;
+	clientSnapshot_t			*frame, *oldframe;
 	snapshotEntityNumbers_t		entityNumbers;
-	int							i;
+	int							i, j;
 	int							psIndex;
 	sharedEntityState_t			*state;
 	svEntity_t					*svEnt;
 	int							playerNum;
 	sharedPlayerState_t			*ps;
+	int							offset;
 
 	// bump the counter used to prevent double adding
 	sv.snapshotCounter++;
@@ -686,14 +687,36 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 		}
 	}
 
+	// avoid wrapping snapshot entities index to negative while keeping the same modulo value
+	// and lower existing first_entity for detecting rolling off the buffer
+	if ( svs.nextSnapshotEntities >= 0x7FFFFFFE - entityNumbers.numSnapshotEntities ) {
+		Com_DPrintf( "Updating snapshot entities to avoid numSnapshotEntities wrapping.\n" );
+
+		offset = ( ( svs.nextSnapshotEntities / svs.numSnapshotEntities ) - 2 ) * svs.numSnapshotEntities;
+
+		for ( i = 0; i < sv_maxclients->integer; i++ ) {
+			oldframe = svs.clients[i].frames;
+
+			for ( j = 0; j < PACKET_BACKUP; j++, oldframe++ ) {
+				if ( oldframe->first_entity <= svs.nextSnapshotEntities - svs.numSnapshotEntities ) {
+					oldframe->first_entity %= svs.numSnapshotEntities;
+				} else {
+					oldframe->first_entity -= offset;
+				}
+			}
+		}
+
+		svs.nextSnapshotEntities -= offset;
+	}
+
 	// copy the entity states out
 	frame->num_entities = 0;
 	frame->first_entity = svs.nextSnapshotEntities;
 	for ( i = 0 ; i < entityNumbers.numSnapshotEntities ; i++ ) {
 		state = SV_GameEntityStateNum( entityNumbers.snapshotEntities[i] );
 		DA_SetElement( &svs.snapshotEntities, svs.nextSnapshotEntities % svs.numSnapshotEntities, state );
 		svs.nextSnapshotEntities++;
-		// this should never hit, map should always be restarted first in SV_Frame
+		// this should never hit
 		if ( svs.nextSnapshotEntities >= 0x7FFFFFFE ) {
 			Com_Error(ERR_FATAL, "svs.nextSnapshotEntities wrapped");
 		}