Q3TA: Added snd_ignorecueloops cvar to ignore auto-looping sounds.
Q3TA: Fixed script parsing, so the menus are not so broken. Q3TA: added the UI_CIN_* and CG_CIN_* builtins for 2d cinematic playbacks. Q3TA: backspace should work for gamecode text entry now. Q3TA: map_restart now directly restarts without needing loading screens. Fixed multiple envmap generation bugs. Fixed envmaps getting flushed with r_keepimages 0. Console image previews can now display cubemaps (although their orientation is probably a little off). Made a 'remapshader' csqc builtin. Depending on the r_remapshader console command was stupid. Fixed packet command to create a udp socket, if needed. sv_public can now be set to a non-numeric name for custom names (instead of needing to poke sv_port too). Support extended data on the end of miptex entries in bsps. Requires a qbsp (like vanilla) that doesn't rewrite the miptex entries. Updated imgtool to generate/read our new extended miptex data. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5644 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
2b01dbea52
commit
062cdf6b21
53 changed files with 2231 additions and 972 deletions
|
@ -50,6 +50,7 @@ void QDECL SCR_Fov_Callback (struct cvar_s *var, char *oldvalue);
|
|||
void QDECL Image_TextureMode_Callback (struct cvar_s *var, char *oldvalue);
|
||||
void QDECL R_SkyBox_Changed (struct cvar_s *var, char *oldvalue)
|
||||
{
|
||||
R_SetSky(var->string);
|
||||
// Shader_NeedReload(false);
|
||||
}
|
||||
void R_ForceSky_f(void)
|
||||
|
@ -211,7 +212,7 @@ cvar_t r_menutint = CVARF ("r_menutint", "0.68 0.4 0.13",
|
|||
CVAR_RENDERERCALLBACK);
|
||||
cvar_t r_netgraph = CVARD ("r_netgraph", "0", "Displays a graph of packet latency. A value of 2 will give additional info about what sort of data is being received from the server.");
|
||||
extern cvar_t r_lerpmuzzlehack;
|
||||
extern cvar_t mod_h2holey_bugged;
|
||||
extern cvar_t mod_h2holey_bugged, mod_halftexel;
|
||||
cvar_t r_nolerp = CVARF ("r_nolerp", "0", CVAR_ARCHIVE);
|
||||
cvar_t r_noframegrouplerp = CVARF ("r_noframegrouplerp", "0", CVAR_ARCHIVE);
|
||||
cvar_t r_nolightdir = CVARF ("r_nolightdir", "0", CVAR_ARCHIVE);
|
||||
|
@ -561,6 +562,7 @@ void GLRenderer_Init(void)
|
|||
#endif
|
||||
#ifdef MD1MODELS
|
||||
Cvar_Register (&mod_h2holey_bugged, GLRENDEREROPTIONS);
|
||||
Cvar_Register (&mod_halftexel, GLRENDEREROPTIONS);
|
||||
#endif
|
||||
Cvar_Register (&r_lerpmuzzlehack, GLRENDEREROPTIONS);
|
||||
Cvar_Register (&r_noframegrouplerp, GLRENDEREROPTIONS);
|
||||
|
@ -642,7 +644,9 @@ void R_InitTextures (void)
|
|||
// create a simple checkerboard texture for the default
|
||||
r_notexture_mip = (texture_t*)r_notexture_mip_mem;
|
||||
|
||||
r_notexture_mip->width = r_notexture_mip->height = 16;
|
||||
r_notexture_mip->vwidth = r_notexture_mip->vheight = 16;
|
||||
r_notexture_mip->srcwidth = r_notexture_mip->srcheight = 16;
|
||||
r_notexture_mip->srcfmt = TF_SOLID8;
|
||||
|
||||
for (m=0 ; m<1 ; m++)
|
||||
{
|
||||
|
@ -777,17 +781,6 @@ void Renderer_Init(void)
|
|||
Cmd_AddCommand("r_remapshader", Shader_RemapShader_f);
|
||||
Cmd_AddCommand("r_showshader", Shader_ShowShader_f);
|
||||
|
||||
#if defined(D3DQUAKE)
|
||||
GLD3DRenderer_Init();
|
||||
#endif
|
||||
#if defined(GLQUAKE)
|
||||
GLRenderer_Init();
|
||||
#endif
|
||||
|
||||
#if defined(GLQUAKE) || defined(VKQUAKE)
|
||||
R_BloomRegister();
|
||||
#endif
|
||||
|
||||
#ifdef SWQUAKE
|
||||
{
|
||||
extern cvar_t sw_interlace;
|
||||
|
@ -869,6 +862,8 @@ void Renderer_Init(void)
|
|||
|
||||
Cvar_Register(&r_keepimages, GRAPHICALNICETIES);
|
||||
Cvar_Register(&r_ignoremapprefixes, GRAPHICALNICETIES);
|
||||
Cvar_ForceCallback(&r_keepimages);
|
||||
Cvar_ForceCallback(&r_ignoremapprefixes);
|
||||
#ifdef IMAGEFMT_TGA
|
||||
Cvar_Register(&r_dodgytgafiles, "Hacky bug workarounds");
|
||||
#endif
|
||||
|
@ -1067,6 +1062,18 @@ void Renderer_Init(void)
|
|||
Cmd_AddCommand ("listskyboxes", R_ListSkyBoxes_f);
|
||||
Cmd_AddCommand ("listconfigs", R_ListConfigs_f);
|
||||
|
||||
|
||||
#if defined(D3DQUAKE)
|
||||
GLD3DRenderer_Init();
|
||||
#endif
|
||||
#if defined(GLQUAKE)
|
||||
GLRenderer_Init();
|
||||
#endif
|
||||
|
||||
#if defined(GLQUAKE) || defined(VKQUAKE)
|
||||
R_BloomRegister();
|
||||
#endif
|
||||
|
||||
P_InitParticleSystem();
|
||||
R_InitTextures();
|
||||
}
|
||||
|
@ -3198,7 +3205,7 @@ void R_InitParticleTexture (void)
|
|||
}
|
||||
}
|
||||
|
||||
TEXASSIGN(particletexture, R_LoadTexture32("dotparticle", 8, 8, data, IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP));
|
||||
TEXASSIGN(particletexture, R_LoadTexture32("dotparticle", 8, 8, data, IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP|IF_NOPURGE));
|
||||
|
||||
|
||||
//
|
||||
|
@ -3222,7 +3229,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*32+x][3] = 255;
|
||||
}
|
||||
}
|
||||
particlecqtexture = Image_GetTexture("classicparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP, data, NULL, 32, 32, TF_RGBA32);
|
||||
particlecqtexture = Image_GetTexture("classicparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP|IF_NOPURGE, data, NULL, 32, 32, TF_RGBA32);
|
||||
|
||||
//draw a square in the top left. still a triangle.
|
||||
for (x=0 ; x<16 ; x++)
|
||||
|
@ -3232,7 +3239,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*32+x][3] = 255;
|
||||
}
|
||||
}
|
||||
Image_GetTexture("classicparticle_square", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP, data, NULL, 32, 32, TF_RGBA32);
|
||||
Image_GetTexture("classicparticle_square", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_CLAMP|IF_NOPURGE, data, NULL, 32, 32, TF_RGBA32);
|
||||
|
||||
|
||||
for (x=0 ; x<16 ; x++)
|
||||
|
@ -3245,7 +3252,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*16+x][3] = exptexture[x][y]*255/9.0;
|
||||
}
|
||||
}
|
||||
explosiontexture = Image_GetTexture("fte_fuzzyparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP, data, NULL, 16, 16, TF_RGBA32);
|
||||
explosiontexture = Image_GetTexture("fte_fuzzyparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE, data, NULL, 16, 16, TF_RGBA32);
|
||||
|
||||
for (x=0 ; x<16 ; x++)
|
||||
{
|
||||
|
@ -3257,7 +3264,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*16+x][3] = exptexture[x][y]*255/9.0;
|
||||
}
|
||||
}
|
||||
Image_GetTexture("fte_bloodparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP, data, NULL, 16, 16, TF_RGBA32);
|
||||
Image_GetTexture("fte_bloodparticle", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE, data, NULL, 16, 16, TF_RGBA32);
|
||||
|
||||
for (x=0 ; x<16 ; x++)
|
||||
{
|
||||
|
@ -3269,7 +3276,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*16+x][3] = 255;
|
||||
}
|
||||
}
|
||||
Image_GetTexture("fte_blooddecal", "particles", IF_NOMIPMAP|IF_NOPICMIP, data, NULL, 16, 16, TF_RGBA32);
|
||||
Image_GetTexture("fte_blooddecal", "particles", IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE, data, NULL, 16, 16, TF_RGBA32);
|
||||
|
||||
memset(data, 255, sizeof(data));
|
||||
for (y = 0;y < PARTICLETEXTURESIZE;y++)
|
||||
|
@ -3283,7 +3290,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*PARTICLETEXTURESIZE+x][3] = (qbyte) d;
|
||||
}
|
||||
}
|
||||
balltexture = R_LoadTexture32("balltexture", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP);
|
||||
balltexture = R_LoadTexture32("balltexture", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE);
|
||||
|
||||
memset(data, 255, sizeof(data));
|
||||
for (y = 0;y < PARTICLETEXTURESIZE;y++)
|
||||
|
@ -3296,7 +3303,7 @@ void R_InitParticleTexture (void)
|
|||
data[y*PARTICLETEXTURESIZE+x][3] = (qbyte) d;
|
||||
}
|
||||
}
|
||||
beamtexture = R_LoadTexture32("beamparticle", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP);
|
||||
beamtexture = R_LoadTexture32("beamparticle", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE);
|
||||
|
||||
for (y = 0;y < PARTICLETEXTURESIZE;y++)
|
||||
{
|
||||
|
@ -3314,6 +3321,6 @@ void R_InitParticleTexture (void)
|
|||
data[y*PARTICLETEXTURESIZE+x][3] = (qbyte) d/2;
|
||||
}
|
||||
}
|
||||
ptritexture = R_LoadTexture32("ptritexture", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP);
|
||||
ptritexture = R_LoadTexture32("ptritexture", PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, data, IF_NOMIPMAP|IF_NOPICMIP|IF_NOPURGE);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue