qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use the miptex_t after converting to texture_t.

Browse source
This commit is contained in:
Bill Currie 2012-01-07 17:08:07 +09:00
parent 29a0dc0b68
commit 204c1aba03
6 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/model.h
View file

@ -431,7 +431,7 @@ void Mod_TouchModel (const char *name);
mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model); mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model);
byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model); byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
model_t *Mod_FindName (const char *name); model_t *Mod_FindName (const char *name);
void Mod_ProcessTexture(miptex_t *mt, texture_t *tx); void Mod_ProcessTexture(texture_t *tx);
void Mod_LoadExternalSkins (model_t * mod); void Mod_LoadExternalSkins (model_t * mod);
void Mod_LoadExternalTextures (model_t * mod); void Mod_LoadExternalTextures (model_t * mod);
void Mod_LoadLighting (bsp_t *bsp); void Mod_LoadLighting (bsp_t *bsp);

6
libs/models/brush/gl_model_brush.c
View file

@ -56,15 +56,15 @@ static __attribute__ ((used)) const char rcsid[] =
void void
Mod_ProcessTexture (miptex_t *mt, texture_t *tx) Mod_ProcessTexture (texture_t *tx)
{ {
char name[32]; char name[32];
snprintf (name, sizeof (name), "fb_%s", mt->name); snprintf (name, sizeof (name), "fb_%s", tx->name);
tx->gl_fb_texturenum = tx->gl_fb_texturenum =
Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name); Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name);
tx->gl_texturenum = tx->gl_texturenum =
GL_LoadTexture (mt->name, tx->width, tx->height, (byte *) (tx + 1), GL_LoadTexture (tx->name, tx->width, tx->height, (byte *) (tx + 1),
true, false, 1); true, false, 1);
} }

2
libs/models/brush/glsl_model_brush.c
View file

@ -57,7 +57,7 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
#include "compat.h" #include "compat.h"
void void
Mod_ProcessTexture (miptex_t *mt, texture_t *tx) Mod_ProcessTexture (texture_t *tx)
{ {
} }

3
libs/models/brush/model_brush.c
View file

@ -194,7 +194,6 @@ Mod_LoadTextures (bsp_t *bsp)
memcpy (tx->name, mt->name, sizeof (tx->name)); memcpy (tx->name, mt->name, sizeof (tx->name));
mod_unique_miptex_name (loadmodel->textures, tx, i); mod_unique_miptex_name (loadmodel->textures, tx, i);
memcpy (mt->name, tx->name, sizeof (tx->name));//FIXME ext tex
tx->width = mt->width; tx->width = mt->width;
tx->height = mt->height; tx->height = mt->height;
for (j = 0; j < MIPLEVELS; j++) for (j = 0; j < MIPLEVELS; j++)
@ -206,7 +205,7 @@ Mod_LoadTextures (bsp_t *bsp)
if (!strncmp (mt->name, "sky", 3)) if (!strncmp (mt->name, "sky", 3))
loadmodel->skytexture = tx; loadmodel->skytexture = tx;
else { else {
Mod_ProcessTexture (mt, tx); Mod_ProcessTexture (tx);
} }
} }

2
libs/models/brush/sw_model_brush.c
View file

@ -50,7 +50,7 @@ Mod_SubdivideSurface (msurface_t *fa)
} }
void void
Mod_ProcessTexture (miptex_t *mt, texture_t *tx) Mod_ProcessTexture (texture_t *tx)
{ {
} }

2
libs/models/null_model.c
View file

@ -56,7 +56,7 @@ R_InitSky (struct texture_s *mt)
} }
void void
Mod_ProcessTexture (miptex_t *mx, texture_t *tx) Mod_ProcessTexture (texture_t *tx)
{ {
} }