Some changes. QC execution has been tweeked a little. It needs further work still.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@925 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-03-28 00:11:59 +00:00
parent 0b3fc5c57f
commit d7bb31a516
66 changed files with 2345 additions and 2036 deletions

View file

@ -188,7 +188,8 @@ typedef struct shadercache_s {
} shadercache_t;
static shadercache_t *shader_hash[HASH_SIZE];
//static char shaderbuf[MAX_QPATH * 256];
static char shaderbuf[MAX_QPATH * 256];
int shaderbuflen;
shader_t r_shaders[MAX_SHADERS];
@ -896,21 +897,26 @@ static shaderkey_t shaderpasskeys[] =
int Shader_InitCallback (char *name, int size, void *param)
{
Shader_MakeCache(name+8);
name+=8; //skip the scripts/ part
strcpy(shaderbuf+shaderbuflen, name);
Shader_MakeCache(shaderbuf+shaderbuflen);
shaderbuflen += strlen(name)+1;
return true;
}
qboolean Shader_Init (void)
{
shaderbuflen = 0;
Con_Printf ( "Initializing Shaders:\n" );
COM_EnumerateFiles("scripts/*.shader", Shader_InitCallback, NULL);
/*
char *dirptr;
int i, dirlen, numdirs;
Con_Printf ( "Initializing Shaders:\n" );
numdirs = FS_GetFileList ( "scripts", "shader", shaderbuf, sizeof(shaderbuf) );
if ( !numdirs ) {
Con_Printf ("Could not find any shaders!");
@ -1699,13 +1705,13 @@ void Shader_DefaultBSP(char *shortname, shader_t *s)
pass->rgbgen = RGB_GEN_IDENTITY;
pass->numMergedPasses = 2;
if ( qglMTexCoord2fSGIS )
/* if ( qglMTexCoord2fSGIS )
{
pass->numMergedPasses = 2;
pass->flush = R_RenderMeshMultitextured;
}
else
{
*/ {
pass->numMergedPasses = 1;
pass->flush = R_RenderMeshGeneric;
}