qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create a list of texture chains. 

This moves the texture chains out of the world model and into a separate
list, allowing other brush models to registter their textures.
This commit is contained in:
Bill Currie 2011-12-15 15:07:01 +09:00
parent d6a668d517
commit 962451e2fe
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/r_local.h
View File

@ -190,7 +190,9 @@ extern int c_faceclip;
extern int r_polycount;
extern int r_wholepolycount;
extern model_t *cl_worldmodel;
extern model_t *cl_worldmodel;
extern texture_t **r_texture_chains;
extern int r_num_texture_chains;
extern int *pfrustum_indexes[4];

34
libs/video/renderer/gl/gl_rmisc.c
View File

@ -38,6 +38,11 @@ static __attribute__ ((used)) const char rcsid[] =
# include <strings.h>
#endif
#if defined(_WIN32) && defined(HAVE_MALLOC_H)
#include <malloc.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include "QF/cmd.h"
@ -61,6 +66,31 @@ static __attribute__ ((used)) const char rcsid[] =
int r_init = 0;
texture_t **r_texture_chains;
int r_num_texture_chains;
static int max_texture_chains;
static void
R_AddTexture (texture_t *tex)
{
int i;
if (r_num_texture_chains == max_texture_chains) {
max_texture_chains += 64;
r_texture_chains = realloc (r_texture_chains,
max_texture_chains * sizeof (texture_t *));
for (i = r_num_texture_chains; i < max_texture_chains; i++)
r_texture_chains[i] = 0;
}
r_texture_chains[r_num_texture_chains++] = tex;
tex->texturechain = NULL;
tex->texturechain_tail = &tex->texturechain;
}
static void
R_ClearTextures (void)
{
r_num_texture_chains = 0;
}
/*
R_Envmap_f
@ -182,6 +212,7 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
// identify sky texture
skytexturenum = -1;
mirrortexturenum = -1;
R_ClearTextures ();
for (i = 0; i < r_worldentity.model->numtextures; i++) {
tex = r_worldentity.model->textures[i];
if (!tex)
@ -192,8 +223,7 @@ R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
}
if (!strncmp (tex->name, "window02_1", 10))
mirrortexturenum = i;
tex->texturechain = NULL;
tex->texturechain_tail = &tex->texturechain;
R_AddTexture (tex);
}
tex = r_notexture_mip;
tex->texturechain = NULL;

4
libs/video/renderer/gl/gl_rsurf.c
View File

@ -361,8 +361,8 @@ clear_texture_chains (void)
int i;
texture_t *tex;
for (i = 0; i < r_worldentity.model->numtextures; i++) {
tex = r_worldentity.model->textures[i];
for (i = 0; i < r_num_texture_chains; i++) {
tex = r_texture_chains[i];
if (!tex)
continue;
tex->texturechain = NULL;