- Model fog fix

- Suppressing redundant sound warnings to developer print
- Preliminary DDS texture loading
- Dropping renderergl1 and renderergl2 as they're unsupported, redundant, stale code with none of the new improvements, and we don't use modularized renderers. Still having these files in the tree implies we use them and that can bring confusion.

Author: leilei-

Makefile

@@ -258,7 +258,7 @@ ifeq ($(WINFOUR),1)
   BASE_CFLAGS += -DUSE_INTERNAL_JPEG
   SDL_VERSION=1
   USE_CURL=0
-  CLIENTBIN=oa95
+ # CLIENTBIN=oa95
 endif
 
 #############################################################################
@@ -1175,7 +1175,7 @@ endif
 ifeq ($(NO_STRIP),1)
   STRIP_FLAG =
 else
-  STRIP_FLAG = -s
+  STRIP_FLAG = -s 
 endif
 
 BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
@@ -1288,7 +1288,7 @@ endef
 #############################################################################
 
 default: release
-all: debug release
+all: debug release 
 
 debug:
 	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
@@ -1778,6 +1778,7 @@ Q3ROAOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \
@@ -1852,6 +1853,7 @@ Q3RSOFTOBJ = \
   $(B)/renderer_oa/tr_image_jpg.o \
   $(B)/renderer_oa/tr_image_bmp.o \
   $(B)/renderer_oa/tr_image_tga.o \
+  $(B)/renderer_oa/tr_image_dds.o \
   $(B)/renderer_oa/tr_image_pcx.o \
   $(B)/renderer_oa/tr_init.o \
   $(B)/renderer_oa/tr_light.o \

code/client/snd_dma.c

@@ -267,17 +267,17 @@ static sfx_t *S_FindName( const char *name ) {
 	}
 
 	if (!name[0]) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
 		return NULL;
 	}
 
 	if (strlen(name) >= MAX_QPATH) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
 		return NULL;
 	}
 
 	if (name[0] == '*') {
-		Com_Printf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: Tried to load player sound directly: %s\n", name );
 		return NULL;
 	}
 
@@ -371,7 +371,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
 
 	if ( sfx->soundData ) {
 		if ( sfx->defaultSound ) {
-			Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+			Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 			return 0;
 		}
 		return sfx - s_knownSfx;
@@ -383,7 +383,7 @@ sfxHandle_t	S_Base_RegisterSound( const char *name, qboolean compressed ) {
   S_memoryLoad(sfx);
 
 	if ( sfx->defaultSound ) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );
 		return 0;
 	}
 
@@ -1428,7 +1428,7 @@ static void S_OpenBackgroundStream( const char *filename ) {
 	// Open stream
 	s_backgroundStream = S_CodecOpenStream(filename);
 	if(!s_backgroundStream) {
-		Com_Printf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
+		Com_DPrintf( S_COLOR_YELLOW "WARNING: couldn't open music file %s\n", filename );
 		return;
 	}
 

code/renderer_oa/tr_extensions.c

@@ -112,6 +112,12 @@ GLvoid (APIENTRYP qglGetVertexAttribPointervARB) (GLuint index, GLenum pname, GL
 GLvoid (APIENTRYP qglColorTableEXT)( GLint, GLint, GLint, GLint, GLint, const GLvoid *);
 GLvoid (APIENTRYP qglColorTableSGI)( GLint, GLint, GLint, GLint, GLint, const GLvoid *);
 
+// leilei - DDS/DXT
+
+GLvoid (APIENTRYP qglCompressedTexImage2DARB) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLvoid (APIENTRYP qglColorTableEXT)( GLint, GLint, GLint, GLint, GLint, const GLvoid *);
+GLvoid (APIENTRYP qglColorTableSGI)( GLint, GLint, GLint, GLint, GLint, const GLvoid *);
+
 /*
 typedef enum {
 	GLHW_GENERIC,			// where everthing works the way it should
@@ -272,6 +278,26 @@ void GLimp_InitExtraExtensions()
 	{
 		ri.Printf( PRINT_ALL, "...GL_EXT_paletted_texture not found\n" );
 	}
+	// leilei  - DDS/DXT
+	textureCompressionSupport = qfalse;
+	if ( GLimp_HaveExtension( "GL_ARB_texture_compression" ) )
+	{
+		if ( r_loadDDS->integer ) {
+			qglCompressedTexImage2DARB = (GLvoid (APIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) SDL_GL_GetProcAddress("glCompressedTexImage2DARB");
+			{
+				ri.Printf( PRINT_ALL, "...using GL_ARB_texture_compression\n");
+				textureCompressionSupport = qtrue;
+			}
+		}
+		else
+		{
+			ri.Printf( PRINT_ALL, "...ignoring GL_ARB_texture_compression\n" );
+		}
+	}
+	else
+	{
+		ri.Printf( PRINT_ALL, "...GL_ARB_texture_compression not found\n" );
+	}
 
 #ifdef _WIN32
 	// leilei - 3dfx gamma

code/renderer_oa/tr_image.c

@@ -531,8 +531,8 @@ void R_ImageList_f( void ) {
 			sizeSuffix = "Gb";
 		}
 
-		//ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName);
-		ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s %f %f\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName, image->loadTime, image->procTime);
+		ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName);
+		//ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s %f %f\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName, image->loadTime, image->procTime);
 
 		estTotalSize += estSize;
 		estTotalTimeLoaded += image->loadTime + image->procTime;
@@ -2131,6 +2131,10 @@ Finds or loads the given image.
 Returns NULL if it fails, not a default image.
 ==============
 */
+#ifdef BROKEN_DDS
+// DDS/DXT
+image_t        *R_LoadDDSImage(const char *name, int bits,  filterType_t filterType, wrapType_t wrapType);
+#endif
 image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 {
 	image_t	*image;
@@ -2140,7 +2144,9 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 	long	hash;
 	float oldtime;
 	float loadtime;
-
+#ifdef BROKEN_DDS
+	char  ddsName[1024];
+#endif
 	if (!name) {
 		return NULL;
 	}
@@ -2162,6 +2168,31 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 			return image;
 		}
 	}
+#ifdef BROKEN_DDS
+	// leilei - DDS - do it here, so we can have a hardware compressed texture instead. The normal means of texture loading expects pixels to be returned which we won't do.
+	if(textureCompressionSupport && r_loadDDS->integer)
+	{
+		int bits;	// no bits
+		int whatclamp;
+		Q_strncpyz(ddsName, name, sizeof(ddsName));
+		COM_StripExtension(ddsName, ddsName, sizeof(ddsName));
+		Q_strcat(ddsName, sizeof(ddsName), ".dds");
+
+	//	if (glWrapClampMode == GL_CLAMP_TO_EDGE)
+	//	whatclamp = WT_CLAMP;
+	//	else
+	//	whatclamp = WT_REPEAT;
+		// try to load a customized .dds texture
+		
+		image = R_LoadDDSImage(ddsName, bits, 0, whatclamp);
+		if(image != NULL)
+		{
+		//	ri.Printf(PRINT_ALL, "found custom .dds '%s'\n", ddsName);
+			return image;
+		}
+	}
+
+#endif
 
 	// leilei - Detail texture hack
 	//	    to kill artifacts of shimmer of pattern of terrible
@@ -2953,3 +2984,44 @@ void	R_SkinList_f( void ) {
 	ri.Printf (PRINT_ALL, "------------------\n");
 }
 
+#ifdef BROKEN_DDS
+// leilei - for DDS loading, which relies on this function...
+/*
+================
+R_AllocImage
+================
+*/
+image_t        *R_AllocImage(const char *name, qboolean linkIntoHashTable)
+{
+	image_t        *image;
+	long            hash;
+	char            buffer[1024];
+
+//  if(strlen(name) >= MAX_QPATH)
+	if(strlen(name) >= 1024)
+	{
+		ri.Error(ERR_DROP, "R_AllocImage: \"%s\" image name is too long\n", name);
+		return NULL;
+	}
+
+	image = ri.Hunk_Alloc(sizeof(image_t), h_low);
+	Com_Memset(image, 0, sizeof(image_t));
+
+
+	qglGenTextures(1, &image->texnum);
+
+	//Com_AddToGrowList(&tr.images, image);
+
+	Q_strncpyz(image->imgName, name, sizeof(image->imgName));
+
+	if(linkIntoHashTable)
+	{
+		Q_strncpyz(buffer, name, sizeof(buffer));
+		hash = generateHashValue(buffer);
+		image->next = hashTable[hash];
+		hashTable[hash] = image;
+	}
+
+	return image;
+}
+#endif

code/renderer_oa/tr_init.c

@@ -29,6 +29,7 @@ int         maxAnisotropy = 0;
 float       displayAspect = 0.0f;
 qboolean    vertexShaders = qfalse;
 qboolean	postprocess = qfalse;
+qboolean    textureCompressionSupport = qfalse;		// leilei - compressed textures
 qboolean    palettedTextureSupport = qfalse;		// leilei - paletted textures
 
 char 		depthimage;
@@ -105,6 +106,7 @@ cvar_t	*r_ext_texture_env_add;
 cvar_t	*r_ext_texture_filter_anisotropic;
 cvar_t	*r_ext_max_anisotropy;
 cvar_t	*r_ext_vertex_shader;
+cvar_t	*r_loadDDS;			// leilei - loading DDS textures
 cvar_t	*r_ext_paletted_texture;	// leilei - Paletted Texture
 cvar_t	*r_ext_gamma_control;		// leilei - 3dfx gamma control
 cvar_t	*r_postprocess;
@@ -1134,6 +1136,7 @@ void R_Register( void )
 	r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic",
 	                                   "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_max_anisotropy = ri.Cvar_Get( "r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH );
+	r_loadDDS = ri.Cvar_Get( "r_loadDDS", "1", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - compressed texture support
 	r_ext_paletted_texture = ri.Cvar_Get( "r_ext_paletted_texture", "0", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - paletted texture support
 	r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - 3dfx gamma support
 

code/renderer_oa/tr_local.h

@@ -1,3 +1,4 @@
+
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
@@ -49,6 +50,7 @@ typedef unsigned int glIndex_t;
 #define SHADERNUM_BITS	14
 #define MAX_SHADERS		(1<<SHADERNUM_BITS)
 
+extern qboolean    textureCompressionSupport;	// leilei - compressed texture
 extern qboolean    palettedTextureSupport;	// leilei - paletted texture
 
 typedef struct dlight_s {
@@ -1442,6 +1444,7 @@ extern	cvar_t	*r_lensReflection1;
 extern	cvar_t	*r_lensReflection2;
 extern	cvar_t	*r_lensReflectionBrightness;
 
+extern cvar_t	*r_loadDDS;				// leilei - Compressed Texture
 extern cvar_t	*r_ext_paletted_texture;		// leilei - Paletted Texture
 extern cvar_t	*r_ext_gamma_control;			// leilei - 3dfx gamma control
 extern	cvar_t	*r_specMode;		
@@ -2171,7 +2174,7 @@ void R_LoadJPG( const char *name, byte **pic, int *width, int *height );
 void R_LoadPCX( const char *name, byte **pic, int *width, int *height );
 void R_LoadPNG( const char *name, byte **pic, int *width, int *height );
 void R_LoadTGA( const char *name, byte **pic, int *width, int *height );
-
+//void R_LoadDDS( const char *name, byte **pic, int *width, int *height );
 /*
 =============================================================
 =============================================================

code/renderer_oa/tr_shader.c

@@ -2988,7 +2988,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ri.Printf( PRINT_WARNING, "WARNING: missing parameters for rgbMod in shader '%s'\n", shader.name );
 				continue;
 			}
-			if ( !Q_stricmp( token, "glow" ) )
+			else if ( !Q_stricmp( token, "glow" ) )
 			{
 				// TODO: Parse "entity" and "vertex" for their colors, for railguns and maps
 				token = COM_ParseExt( text, qfalse );
@@ -3008,7 +3008,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 				stage->rgbMod = CMOD_GLOW;
 			}
-			if ( !Q_stricmp( token, "uvcol" ) )
+			else if ( !Q_stricmp( token, "uvcol" ) )
 			{
 				// Parse color
 				token = COM_ParseExt( text, qfalse );
@@ -3028,22 +3028,22 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 				stage->rgbMod = CMOD_UVCOL;
 			}
-			if ( !Q_stricmp( token, "normtoalpha" ) )
+			else if ( !Q_stricmp( token, "normtoalpha" ) )
 			{
 				// normalize colors, but average color prior is alpha.
 				stage->rgbMod = CMOD_NORMALIZETOALPHA;
 			}
-			if ( !Q_stricmp( token, "normtoalphafast" ) )
+			else if ( !Q_stricmp( token, "normtoalphafast" ) )
 			{
 				// normalize and use the first vert's color on whole surface, but average color prior is alpha.
 				stage->rgbMod = CMOD_NORMALIZETOALPHAFAST;
 			}
-			if ( !Q_stricmp( token, "lighting" ) )
+			else if ( !Q_stricmp( token, "lighting" ) )
 			{
 				// modulate a standard diffuse light on top of existing vertex colors
 				stage->rgbMod = CMOD_LIGHTING;
 			}
-			if ( !Q_stricmp( token, "opaque" ) )
+			else if ( !Q_stricmp( token, "opaque" ) )
 			{
 				// modulate a standard diffuse light on top of existing vertex colors
 				stage->rgbMod = CMOD_OPAQUE;

code/renderercommon/tr_common.h

@@ -47,6 +47,26 @@ typedef enum
 	IMGFLAG_GENNORMALMAP   = 0x0100,
 } imgFlags_t;
 
+// DDS stuff
+
+
+typedef enum
+{
+    FT_DEFAULT,
+    FT_LINEAR,
+    FT_NEAREST
+} filterType_t;
+
+typedef enum
+{
+    WT_REPEAT,
+    WT_CLAMP,					// don't repeat the texture for texture coords outside [0, 1]
+    WT_EDGE_CLAMP,
+    WT_ZERO_CLAMP,				// guarantee 0,0,0,255 edge for projected textures
+    WT_ALPHA_ZERO_CLAMP			// guarante 0 alpha edge for projected textures
+} wrapType_t;
+
+
 typedef struct image_s {
 	char		imgName[MAX_QPATH];		// game path, including extension
 	int			width, height;				// source image
@@ -67,6 +87,11 @@ typedef struct image_s {
 
 	float				loadTime;	// leilei - time taken loading image
 	float				procTime;	// leilei - time taken processing image/uploading to vram
+
+	// DXT/DDS stuff
+	GLenum          ddsType;
+   	filterType_t	filterType; 	
+   	wrapType_t	wrapType;
 } image_t;
 
 // any change in the LIGHTMAP_* defines here MUST be reflected in