Sun stuff

- r_drawSun is now default 1 (was 0), because...
- sunShader key - allows sky shaders to explicitly define a shader to use for the sun. In addition to that, a flare type number and a size multiplier number can follow for a little more customization. Partially inspired by RTCW's sunshader key, which only dealt with the image (and never finished their lens flare reflections)
- Suns with a portal on screen won't cancel out the sun or its flare
- If no sun flare is specified, don't draw a sun flare at all. should be one less unnecessary depth read
- r_drawSun 2 is the old 'always show sun' behavior
- sun shader now correctly orientated
- drawing the sun uses a quadstamp
- some 'low end video' alternative shader loading that current does not work. May revert
- ifdefing out shademethod LOD for fixing later

Author: leilei-

code/renderer_oa/tr_bsp.c

@@ -1878,6 +1878,9 @@ void RE_LoadWorldMap( const char *name ) {
 	tr.sunDirection[0] = 0.45f;
 	tr.sunDirection[1] = 0.3f;
 	tr.sunDirection[2] = 0.9f;
+	
+	// leilei - deactivate sun and flare if it ain't there
+	tr.sunOn = 0; tr.sunFlare = 0; tr.sunShaderCustom = 0;
 
 	VectorNormalize( tr.sunDirection );
 
@@ -1929,6 +1932,12 @@ void RE_LoadWorldMap( const char *name ) {
 	R_LoadEntities( &header->lumps[LUMP_ENTITIES] );
 	R_LoadLightGrid( &header->lumps[LUMP_LIGHTGRID] );
 
+	// leilei - load our specific custom sun here
+	if (tr.sunShaderCustom)
+	tr.sunShader = R_FindShader( tr.sunShaderCustom, LIGHTMAP_NONE, qtrue );
+	else
+	tr.sunShader = R_FindShader( "sun", LIGHTMAP_NONE, qtrue );
+	
 	s_worldData.dataSize = (byte *)ri.Hunk_Alloc(0, h_low) - startMarker;
 
 	// only set tr.world now that we know the entire level has loaded properly

code/renderer_oa/tr_flares.c

@@ -1330,11 +1330,31 @@ void RB_DrawSunFlare( void )
 		return;
 	}
 
+	// leilei - don't draw the flare if we ain't got the sun
+	if ( !r_drawSun->integer ) {
+		return;
+	}
+
+	// don't draw the flare if we don't define the sun
+	if ( r_drawSun->integer == 1 && (!tr.sunOn) ) {
+		return;
+	}
+
 	if ( backEnd.doneSunFlare)	// leilei - only do sun once
 		return;
 
+	if (backEnd.viewParms.isPortal) // leilei - do sun only not in the portal (keeps sun from disappearing when portal is onscreen)
+		return;
+
 	fetype = r_flareSun->integer;
 
+	// if we specified a flare type for sunshader in the sky, then we use it.
+	if (tr.sunOn && (r_drawSun->integer == 1)) {
+		fetype = tr.sunFlare;
+	}
+	// but, if we don't want the sunflare (type is 0 - either on the r_drawSun 2 override or the shader) then we just forget it
+	if (fetype == 0) return;
+
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
 	qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);
 

code/renderer_oa/tr_init.c

@@ -222,6 +222,9 @@ cvar_t	*r_suggestiveThemes;		// leilei - mature content control
 
 cvar_t	*r_textureDither;	// leilei - Dithered texture
 
+cvar_t	*r_lerpbias;		// Leilei - lerping bias
+
+cvar_t	*r_lowEndVideo;		// leilei - load .low shaders
 // leilei - fallback shader hack
 
 
@@ -1196,7 +1199,7 @@ void R_Register( void )
 	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
 	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
 	r_inGameVideo = ri.Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE );
-	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
+	r_drawSun = ri.Cvar_Get( "r_drawSun", "1", CVAR_ARCHIVE ); // leilei - default 1 for allowing sky shaders to define a sun.
 	r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE );
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
@@ -1307,12 +1310,16 @@ void R_Register( void )
 	r_particles = ri.Cvar_Get( "r_particles", "0" , CVAR_ARCHIVE | CVAR_LATCH);
 	r_leidebugeye = ri.Cvar_Get( "r_leidebugeye", "0" , CVAR_CHEAT);
 
+	r_lerpbias = ri.Cvar_Get( "r_lerpbias", "-2" , CVAR_ARCHIVE);
+
 	r_iconmip = ri.Cvar_Get ("r_iconmip", "0", CVAR_ARCHIVE | CVAR_LATCH );		// leilei - icon mip
 	r_iconBits = ri.Cvar_Get ("r_iconBits", "0", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - icon bits
 
 	r_lightmapBits = ri.Cvar_Get ("r_lightmapBits", "0", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - lightmap color bits
 	r_lightmapColorNorm = ri.Cvar_Get ("r_lightmapColorNorm", "1", CVAR_ARCHIVE | CVAR_LATCH ); // leilei - lightmap color normalization
 
+	r_lowEndVideo = ri.Cvar_Get( "r_lowEndVideo", "0", CVAR_ARCHIVE | CVAR_LATCH );
+
 	r_textureDither = ri.Cvar_Get ("r_textureDither", "0", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - dithered textures
 
 	// make sure all the commands added here are also

code/renderer_oa/tr_local.h

@@ -1152,6 +1152,7 @@ typedef struct {
 	shader_t				*flareShader;
 	shader_t				*flareShaderAtlas;	// leilei - lens reflections
 	shader_t				*sunShader;
+	char					*sunShaderCustom; 	// leilei - sunShader override
 
 	shader_t				*coneShader;		// leilei - flashblends
 
@@ -1193,6 +1194,8 @@ typedef struct {
 
 	vec3_t					sunLight;			// from the sky shader for this level
 	vec3_t					sunDirection;
+	int					sunFlare;			// leilei - sun flare type
+	float					sunOn;				// leilei - allow the sun to be drawn, if a sunShader is specified by a sky shader.  This is a float so we can multiply the size of the sun in the shader
 
 	frontEndCounters_t		pc;
 	int						frontEndMsec;		// not in pc due to clearing issue
@@ -1255,7 +1258,7 @@ extern glstate_t	glState;		// outside of TR since it shouldn't be cleared during
 extern qboolean  vertexShaders;
 extern qboolean  postprocess;
 extern int	 leifxmode;	// leilei - leifx
-extern char		 depthimage;
+extern char	 depthimage;
 
 //
 // cvars
@@ -1396,6 +1399,8 @@ extern cvar_t	*r_particles;	// Leilei - particles!
 extern	cvar_t	*r_iconmip;	// leilei - icon mip - picmip for 2d icons
 extern	cvar_t	*r_iconBits;	// leilei - icon color depth for 2d icons
 
+extern cvar_t	*r_lerpbias;	// Leilei - lerping bias
+
 extern	cvar_t	*r_lightmapBits;	// leilei - lightmap color depth
 extern	cvar_t	*r_lightmapColorNorm;	// leilei - lightmap color normalize
 
@@ -1406,6 +1411,8 @@ extern  cvar_t	*r_textureDither;		// leilei - apply dithering for lower texture
 
 extern cvar_t	*r_skytess;		// leilei - adjusts the subdivisions of the sky (max 8, min 1)
 
+extern  cvar_t	*r_lowEndVideo;		// leilei - load .low shaders
+
 //====================================================================
 
 void R_SwapBuffers( int );
@@ -1567,12 +1574,12 @@ typedef struct shaderCommands_s
 
 	shader_t	*shader;
 	float		shaderTime;
-	int			fogNum;
+	int		fogNum;
 
-	int			dlightBits;	// or together of all vertexDlightBits
+	int		dlightBits;	// or together of all vertexDlightBits
 
-	int			numIndexes;
-	int			numVertexes;
+	int		numIndexes;
+	int		numVertexes;
 
 	// info extracted from current shader
 	int			numPasses;

code/renderer_oa/tr_shade_calc.c

@@ -1818,6 +1818,7 @@ void RB_CalcDiffuseColor( unsigned char *colors )
 	{
 		RB_CalcMaterials( colors, 0xFFFFFF, 0x808080, 0x808080, 0x000000, 128, 255 );
 	}
+#if BROKEN // leilei: FIXME this does not work as intended 
 	else if ((r_shadeMethod->integer > 150) && (r_shadeMethod->integer < 667)) 			// values in a certain range is an adaptive LOD selection of -1, 0 and 3
 	{
 		float projectedRadius, fsh, shadescale, radius;
@@ -1838,6 +1839,7 @@ void RB_CalcDiffuseColor( unsigned char *colors )
 				RB_CalcDiffuseColor_flat( colors );
 
 	}
+#endif	// BROKEN
 	else							// standard idtech3 shading
 	{
 		RB_CalcDiffuseColor_scalar( colors );

code/renderer_oa/tr_shader.c

@@ -3604,6 +3604,38 @@ static qboolean ParseShader( char **text )
 			SkipRestOfLine( text );
 			continue;
 		}
+
+		// leilei - Parse a shader for the sun, and a type of flare for the number after it.
+		// Inspired by ET's sunShader (my own implementation)
+		else if ( !Q_stricmp( token, "sunShader" ) ) {
+			// load a sun shader to override our default shader
+			token = COM_ParseExt( text, qfalse );
+
+			tr.sunShaderCustom = CopyString(token); // leilei - copy the shader's name so we can load it properly elsewhere (doing it here would make a broken sun)
+			tr.sunOn = 1;	// activate sun to be rendered for r_drawSun 1.		
+
+			// the next one is the flare type.
+			token = COM_ParseExt( text, qfalse );
+			if ( !token[0] ) 
+			{
+				tr.sunFlare = 0;	// dont flare if we dont specify
+				continue;
+			}
+			tr.sunFlare = atoi( token );
+
+			// the next one is a size multiplier.
+			token = COM_ParseExt( text, qfalse );
+			if ( !token[0] ) 
+			{
+				tr.sunOn = 1;		// sun is always normal size if we don't specify
+				continue;
+			}
+			if (atof( token )>1)
+			tr.sunOn = atof( token );
+
+			continue;
+			}
+
 		// sun parms
 		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
 			float	a, b;
@@ -5346,18 +5378,41 @@ a single large text block that can be scanned for shader names
 =====================
 */
 #define	MAX_SHADER_FILES	4096
+
+static int Shader_AddFileToList( char *name, char *list[0x1000], int nfiles ) {
+	int		i;
+
+	if ( nfiles == 0x1000 - 1 ) {
+		return nfiles;
+	}
+	for ( i = 0 ; i < nfiles ; i++ ) {
+		if ( !Q_stricmp( name, list[i] ) ) {
+			return nfiles;		// allready in list
+		}
+	}
+	list[nfiles] = CopyString( name );
+	nfiles++;
+
+	return nfiles;
+}
+
+
 static void ScanAndLoadShaderFiles( void )
 {
 	char **shaderFiles;
+
 	char *buffers[MAX_SHADER_FILES];
 	char *p;
 	int numShaderFiles;
-	int i;
+	int i, j;
 	char *oldp, *token, *hashMem, *textEnd;
 	int shaderTextHashTableSizes[MAX_SHADERTEXT_HASH], hash, size;
 	char shaderName[MAX_QPATH];
 	int shaderLine;
 
+	char **lowShaderFiles;
+	int  numLowShaderFiles;
+
 	long sum = 0, summand;
 	// scan for shader files
 	shaderFiles = ri.FS_ListFiles( "scripts", ".shader", &numShaderFiles );
@@ -5368,10 +5423,6 @@ static void ScanAndLoadShaderFiles( void )
 		return;
 	}
 
-	if ( numShaderFiles > MAX_SHADER_FILES ) {
-		numShaderFiles = MAX_SHADER_FILES;
-	}
-
 	// load and parse shader files
 	for ( i = 0; i < numShaderFiles; i++ )
 	{
@@ -5383,7 +5434,7 @@ static void ScanAndLoadShaderFiles( void )
 
 		if ( !buffers[i] )
 			ri.Error( ERR_DROP, "Couldn't load %s", filename );
-		
+
 		// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
 		p = buffers[i];
 		COM_BeginParseSession(filename);
@@ -5427,8 +5478,35 @@ static void ScanAndLoadShaderFiles( void )
 			sum += summand;		
 	}
 
+	// leilei - low end video
+	if (r_lowEndVideo->integer)
+	{
+
+
+		lowShaderFiles = ri.FS_ListFiles( "scripts", ".low", &numLowShaderFiles );
+	//	shaderFiles += lowShaderFiles;
+	//	numShaderFiles += numLowShaderFiles;
+	
+		// leilei - append in low shader files
+		if (numLowShaderFiles)
+		for ( i = 0; i < numLowShaderFiles; i++ )
+		{
+			ri.Printf( PRINT_WARNING, "USING LOW END SHADER: %s\n", lowShaderFiles[i]);
+		//	Shader_AddFileToList (lowShaderFiles[i], shaderFiles, numShaderFiles);
+		//	shaderFiles[numShaderFiles+1] = lowShaderFiles[i];CopyString( lowShaderFiles[i] );
+		//	numShaderFiles++;
+	//		shaderFiles[numShaderFiles+1] = lowShaderFiles[i];
+	
+		}
+	}
+
+
+	if ( numShaderFiles > MAX_SHADER_FILES ) {
+		numShaderFiles = MAX_SHADER_FILES;
+	}
+
 	// build single large buffer
-	s_shaderText = ri.Hunk_Alloc( sum + numShaderFiles*2, h_low );
+	s_shaderText = ri.Hunk_Alloc( sum + (numShaderFiles*2) + (numLowShaderFiles*2), h_low );
 	s_shaderText[ 0 ] = '\0';
 	textEnd = s_shaderText;
 
@@ -5576,9 +5654,6 @@ static void CreateExternalShaders( void ) {
 		}
 	}
 
-
-	tr.sunShader = R_FindShader( "sun", LIGHTMAP_NONE, qtrue );
-
 //	leilei - placeholder shaders
 	tr.placeholderTextureShader = R_FindShader( "placeholder_texture", LIGHTMAP_NONE, qtrue );
 	tr.placeholderModelShader = R_FindShader( "placeholder_model", LIGHTMAP_NONE, qtrue );