#include "quakedef.h"
+// note: model_shared.c sets up r_notexture, and r_surf_notexture
+
qbyte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
-cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
+//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
cvar_t halflifebsp = {0, "halflifebsp", "0"};
cvar_t r_novis = {0, "r_novis", "0"};
cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
-cvar_t r_vertexsurfacesthreshold = {CVAR_SAVE, "r_vertexsurfacesthreshold", "0"};
+cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
+cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
+
+#define NUM_DETAILTEXTURES 1
+static rtexture_t *detailtextures[NUM_DETAILTEXTURES];
+static rtexturepool_t *detailtexturepool;
/*
===============
*/
void Mod_BrushInit (void)
{
- Cvar_RegisterVariable(&r_subdivide_size);
+// Cvar_RegisterVariable(&r_subdivide_size);
Cvar_RegisterVariable(&halflifebsp);
Cvar_RegisterVariable(&r_novis);
Cvar_RegisterVariable(&r_miplightmaps);
Cvar_RegisterVariable(&r_lightmaprgba);
- Cvar_RegisterVariable(&r_vertexsurfacesthreshold);
+ Cvar_RegisterVariable(&r_nosurftextures);
+ Cvar_RegisterVariable(&r_sortsurfaces);
memset(mod_novis, 0xff, sizeof(mod_novis));
}
-void Mod_Brush_SERAddEntity(void)
+void Mod_BrushStartup (void)
{
- R_Clip_AddBox(currentrenderentity->mins, currentrenderentity->maxs, R_Entity_Callback, currentrenderentity, NULL);
+ int i, x, y, light;
+ float vc[3], vx[3], vy[3], vn[3], lightdir[3];
+#define DETAILRESOLUTION 256
+ qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
+ detailtexturepool = R_AllocTexturePool();
+ lightdir[0] = 0.5;
+ lightdir[1] = 1;
+ lightdir[2] = -0.25;
+ VectorNormalize(lightdir);
+ for (i = 0;i < NUM_DETAILTEXTURES;i++)
+ {
+ fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
+ for (y = 0;y < DETAILRESOLUTION;y++)
+ {
+ for (x = 0;x < DETAILRESOLUTION;x++)
+ {
+ vc[0] = x;
+ vc[1] = y;
+ vc[2] = noise[y][x] * (1.0f / 32.0f);
+ vx[0] = x + 1;
+ vx[1] = y;
+ vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
+ vy[0] = x;
+ vy[1] = y + 1;
+ vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
+ VectorSubtract(vx, vc, vx);
+ VectorSubtract(vy, vc, vy);
+ CrossProduct(vx, vy, vn);
+ VectorNormalize(vn);
+ light = 128 - DotProduct(vn, lightdir) * 128;
+ light = bound(0, light, 255);
+ data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
+ data[y][x][3] = 255;
+ }
+ }
+ detailtextures[i] = R_LoadTexture(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE);
+ }
+}
+
+void Mod_BrushShutdown (void)
+{
+ int i;
+ for (i = 0;i < NUM_DETAILTEXTURES;i++)
+ R_FreeTexture(detailtextures[i]);
+ R_FreeTexturePool(&detailtexturepool);
}
/*
Mod_PointInLeaf
===============
*/
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
+mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
{
- mnode_t *node;
+ mnode_t *node;
+
+ if (model == NULL)
+ return NULL;
Mod_CheckLoaded(model);
-// if (!model || !model->nodes)
-// Sys_Error ("Mod_PointInLeaf: bad model");
// LordHavoc: modified to start at first clip node,
// in other words: first node of the (sub)model
return (mleaf_t *)node;
}
+int Mod_PointContents (const vec3_t p, model_t *model)
+{
+ mnode_t *node;
+
+ if (model == NULL)
+ return CONTENTS_EMPTY;
+
+ Mod_CheckLoaded(model);
+
+ // LordHavoc: modified to start at first clip node,
+ // in other words: first node of the (sub)model
+ node = model->nodes + model->hulls[0].firstclipnode;
+ while (node->contents == 0)
+ node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist];
+
+ return ((mleaf_t *)node)->contents;
+}
+
void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod)
{
- if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
- pos[0]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
- pos[0]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+ if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+ pos[0]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+ pos[0]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
pos[0]-=1;
- pos[1]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
- pos[1]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+ pos[1]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+ pos[1]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
pos[1]-=1;
- pos[2]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
- pos[2]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+ pos[2]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+ pos[2]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
pos[2]-=1;
}
-/*
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
-{
- mnode_t *node;
- float d;
- mplane_t *plane;
-
- if (!model || !model->nodes)
- Sys_Error ("Mod_PointInLeaf: bad model");
-
- node = model->nodes;
- while (1)
- {
- if (node->contents < 0)
- return (mleaf_t *)node;
- plane = node->plane;
- d = DotProduct (p,plane->normal) - plane->dist;
- if (d > 0)
- node = node->children[0];
- else
- node = node->children[1];
- }
-
- return NULL; // never reached
-}
-*/
/*
===================
row = (model->numleafs+7)>>3;
out = decompressed;
- /*
- if (!in)
- { // no vis info, so make all visible
- while (row)
- {
- *out++ = 0xff;
- row--;
- }
- return decompressed;
- }
- */
-
do
{
if (*in)
return Mod_DecompressVis (leaf->compressed_vis, model);
}
-void Mod_SetupNoTexture(void)
-{
- int x, y;
- qbyte pix[16][16][4];
-
- for (y = 0;y < 16;y++)
- {
- for (x = 0;x < 16;x++)
- {
- if ((y < 8) ^ (x < 8))
- {
- pix[y][x][0] = 128;
- pix[y][x][1] = 128;
- pix[y][x][2] = 128;
- pix[y][x][3] = 255;
- }
- else
- {
- pix[y][x][0] = 64;
- pix[y][x][1] = 64;
- pix[y][x][2] = 64;
- pix[y][x][3] = 255;
- }
- }
- }
-
- memset(&loadmodel->notexture, 0, sizeof(texture_t));
- strcpy(loadmodel->notexture.name, "notexture");
- loadmodel->notexture.width = 16;
- loadmodel->notexture.height = 16;
- loadmodel->notexture.flags = 0;
- loadmodel->notexture.texture = R_LoadTexture(loadmodel->texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP);
-}
-
/*
=================
Mod_LoadTextures
*/
static void Mod_LoadTextures (lump_t *l)
{
- int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs;
- miptex_t *dmiptex;
- texture_t *tx, *tx2, *anims[10], *altanims[10];
- dmiptexlump_t *m;
- qbyte *data, *mtdata, *data2;
- char name[256];
+ int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
+ miptex_t *dmiptex;
+ texture_t *tx, *tx2, *anims[10], *altanims[10];
+ dmiptexlump_t *m;
+ qbyte *data, *mtdata, *data2;
+ char name[256];
- Mod_SetupNoTexture();
+ loadmodel->textures = NULL;
if (!l->filelen)
- {
- loadmodel->textures = NULL;
return;
- }
m = (dmiptexlump_t *)(mod_base + l->fileofs);
m->nummiptex = LittleLong (m->nummiptex);
- loadmodel->numtextures = m->nummiptex;
- loadmodel->textures = Mem_Alloc(loadmodel->mempool, m->nummiptex * sizeof(*loadmodel->textures));
+ // add two slots for notexture walls and notexture liquids
+ loadmodel->numtextures = m->nummiptex + 2;
+ loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(texture_t));
+
+ // fill out all slots with notexture
+ for (i = 0, tx = loadmodel->textures;i < loadmodel->numtextures;i++, tx++)
+ {
+ tx->width = 16;
+ tx->height = 16;
+ tx->texture = r_notexture;
+ tx->shader = &Cshader_wall_lightmap;
+ if (i == loadmodel->numtextures - 1)
+ {
+ tx->flags = SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+ tx->shader = &Cshader_water;
+ }
+ }
// just to work around bounds checking when debugging with it (array index out of bounds error thing)
dofs = m->dataofs;
+ // LordHavoc: mostly rewritten map texture loader
for (i = 0;i < m->nummiptex;i++)
{
dofs[i] = LittleLong(dofs[i]);
- if (dofs[i] == -1)
+ if (dofs[i] == -1 || r_nosurftextures.integer)
continue;
dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
+
+ // make sure name is no more than 15 characters
+ for (j = 0;dmiptex->name[j] && j < 15;j++)
+ name[j] = dmiptex->name[j];
+ name[j] = 0;
+
mtwidth = LittleLong (dmiptex->width);
mtheight = LittleLong (dmiptex->height);
mtdata = NULL;
{
// texture included
if (j < 40 || j + mtwidth * mtheight > l->filelen)
- Host_Error ("Texture %s is corrupt or incomplete\n", dmiptex->name);
+ {
+ Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
+ continue;
+ }
mtdata = (qbyte *)dmiptex + j;
}
if ((mtwidth & 15) || (mtheight & 15))
- Host_Error ("Texture %s is not 16 aligned", dmiptex->name);
- // LordHavoc: rewriting the map texture loader for GLQuake
- tx = Mem_Alloc(loadmodel->mempool, sizeof(texture_t));
- memset(tx, 0, sizeof(texture_t));
- tx->anim_total = 0;
- tx->alternate_anims = NULL;
- loadmodel->textures[i] = tx;
-
- // LordHavoc: force all names to lowercase and make sure they are terminated while copying
- for (j = 0;dmiptex->name[j] && j < 15;j++)
- {
- if (dmiptex->name[j] >= 'A' && dmiptex->name[j] <= 'Z')
- tx->name[j] = dmiptex->name[j] + ('a' - 'A');
- else
- tx->name[j] = dmiptex->name[j];
- }
- for (;j < 16;j++)
- tx->name[j] = 0;
+ Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
+
+ // LordHavoc: force all names to lowercase
+ for (j = 0;name[j];j++)
+ if (name[j] >= 'A' && name[j] <= 'Z')
+ name[j] += 'a' - 'A';
+
+ tx = loadmodel->textures + i;
+ strcpy(tx->name, name);
+ tx->width = mtwidth;
+ tx->height = mtheight;
if (!tx->name[0])
{
- Con_Printf("warning: unnamed texture in %s\n", loadmodel->name);
sprintf(tx->name, "unnamed%i", i);
+ Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
}
- tx->width = mtwidth;
- tx->height = mtheight;
- tx->texture = NULL;
- tx->glowtexture = NULL;
- tx->fogtexture = NULL;
-
- if (!loadmodel->ishlbsp && !strncmp(tx->name,"sky",3) && mtwidth == 256 && mtheight == 128) // LordHavoc: HL sky textures are entirely unrelated
+ // LordHavoc: HL sky textures are entirely different than quake
+ if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
{
- data = loadimagepixels(tx->name, false, 0, 0);
- if (data)
+ if (loadmodel->isworldmodel)
{
- if (image_width == 256 && image_height == 128)
+ data = loadimagepixels(tx->name, false, 0, 0);
+ if (data)
{
- if (loadmodel->isworldmodel)
- R_InitSky (data, 4);
- Mem_Free(data);
- }
- else
- {
- Mem_Free(data);
- Host_Error("Mod_LoadTextures: replacement sky image must be 256x128 pixels\n");
+ if (image_width == 256 && image_height == 128)
+ {
+ R_InitSky (data, 4);
+ Mem_Free(data);
+ }
+ else
+ {
+ Mem_Free(data);
+ Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
+ if (mtdata != NULL)
+ R_InitSky (mtdata, 1);
+ }
}
+ else if (mtdata != NULL)
+ R_InitSky (mtdata, 1);
}
- else if (loadmodel->isworldmodel)
- R_InitSky (mtdata, 1);
}
else if ((tx->texture = loadtextureimagewithmask(loadmodel->texturepool, tx->name, 0, 0, false, true, true)))
{
{
tx->width = 16;
tx->height = 16;
- tx->texture = loadmodel->notexture.texture;
+ tx->texture = r_notexture;
}
}
else
{
tx->width = 16;
tx->height = 16;
- tx->texture = loadmodel->notexture.texture;
+ tx->texture = r_notexture;
}
}
}
if (tx->name[0] == '*')
{
- tx->flags |= (SURF_DRAWTURB | SURF_LIGHTBOTHSIDES);
+ tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
// LordHavoc: some turbulent textures should be fullbright and solid
if (!strncmp(tx->name,"*lava",5)
|| !strncmp(tx->name,"*teleport",9)
|| !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
- tx->flags |= (SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID);
+ tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+ tx->shader = &Cshader_water;
}
else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
- tx->flags |= (SURF_DRAWSKY | SURF_CLIPSOLID);
+ {
+ tx->flags |= SURF_DRAWSKY;
+ tx->shader = &Cshader_sky;
+ }
else
{
tx->flags |= SURF_LIGHTMAP;
- if (!R_TextureHasAlpha(tx->texture))
- tx->flags |= SURF_CLIPSOLID;
+ tx->shader = &Cshader_wall_lightmap;
}
+
+ tx->detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
}
-//
-// sequence the animations
-//
+ // sequence the animations
for (i = 0;i < m->nummiptex;i++)
{
- tx = loadmodel->textures[i];
- if (!tx || tx->name[0] != '+')
+ tx = loadmodel->textures + i;
+ if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
continue;
- if (tx->anim_total)
+ if (tx->anim_total[0] || tx->anim_total[1])
continue; // already sequenced
// find the number of frames in the animation
memset (anims, 0, sizeof(anims));
memset (altanims, 0, sizeof(altanims));
- max = altmax = 0;
for (j = i;j < m->nummiptex;j++)
{
- tx2 = loadmodel->textures[j];
+ tx2 = loadmodel->textures + j;
if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
continue;
else if (num >= 'a' && num <= 'j')
altanims[num - 'a'] = tx2;
else
- Host_Error ("Bad animating texture %s", tx->name);
+ Con_Printf ("Bad animating texture %s\n", tx->name);
}
+ max = altmax = 0;
for (j = 0;j < 10;j++)
{
- if (anims[j] != NULL)
+ if (anims[j])
max = j + 1;
- if (altanims[j] != NULL)
+ if (altanims[j])
altmax = j + 1;
}
+ //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
- // link them all together
+ incomplete = false;
for (j = 0;j < max;j++)
{
- tx2 = anims[j];
- if (!tx2)
- Host_Error ("Missing frame %i of %s", j, tx->name);
- tx2->anim_total = max;
- tx2->alternate_anims = altanims[0]; // NULL if there is no alternate
+ if (!anims[j])
+ {
+ Con_Printf ("Missing frame %i of %s\n", j, tx->name);
+ incomplete = true;
+ }
+ }
+ for (j = 0;j < altmax;j++)
+ {
+ if (!altanims[j])
+ {
+ Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
+ incomplete = true;
+ }
+ }
+ if (incomplete)
+ continue;
+
+ if (altmax < 1)
+ {
+ // if there is no alternate animation, duplicate the primary
+ // animation into the alternate
+ altmax = max;
for (k = 0;k < 10;k++)
- tx2->anim_frames[k] = anims[k];
+ altanims[k] = anims[k];
}
- for (j = 0;j < altmax;j++)
+ // link together the primary animation
+ for (j = 0;j < max;j++)
{
- tx2 = altanims[j];
- if (!tx2)
- Host_Error ("Missing frame %i of %s", j, tx->name);
- tx2->anim_total = altmax;
- tx2->alternate_anims = anims[0]; // NULL if there is no alternate
+ tx2 = anims[j];
+ tx2->animated = true;
+ tx2->anim_total[0] = max;
+ tx2->anim_total[1] = altmax;
for (k = 0;k < 10;k++)
- tx2->anim_frames[k] = altanims[k];
+ {
+ tx2->anim_frames[0][k] = anims[k];
+ tx2->anim_frames[1][k] = altanims[k];
+ }
+ }
+
+ // if there really is an alternate anim...
+ if (anims[0] != altanims[0])
+ {
+ // link together the alternate animation
+ for (j = 0;j < altmax;j++)
+ {
+ tx2 = altanims[j];
+ tx2->animated = true;
+ // the primary/alternate are reversed here
+ tx2->anim_total[0] = altmax;
+ tx2->anim_total[1] = max;
+ for (k = 0;k < 10;k++)
+ {
+ tx2->anim_frames[0][k] = altanims[k];
+ tx2->anim_frames[1][k] = anims[k];
+ }
+ }
}
}
}
}
}
+void Mod_LoadLightList(void)
+{
+ int a, n, numlights;
+ char lightsfilename[1024], *s, *t, *lightsstring;
+ mlight_t *e;
+
+ strcpy(lightsfilename, loadmodel->name);
+ COM_StripExtension(lightsfilename, lightsfilename);
+ strcat(lightsfilename, ".lights");
+ s = lightsstring = (char *) COM_LoadFile (lightsfilename, false);
+ if (s)
+ {
+ numlights = 0;
+ while (*s)
+ {
+ while (*s && *s != '\n')
+ s++;
+ if (!*s)
+ {
+ Mem_Free(lightsstring);
+ Host_Error("lights file must end with a newline\n");
+ }
+ s++;
+ numlights++;
+ }
+ loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
+ s = lightsstring;
+ n = 0;
+ while (*s && n < numlights)
+ {
+ t = s;
+ while (*s && *s != '\n')
+ s++;
+ if (!*s)
+ {
+ Mem_Free(lightsstring);
+ Host_Error("misparsed lights file!\n");
+ }
+ e = loadmodel->lights + n;
+ *s = 0;
+ a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
+ *s = '\n';
+ if (a != 14)
+ {
+ Mem_Free(lightsstring);
+ Host_Error("invalid lights file, found %d parameters on line %i, should be 14 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone distancebias style)\n", a, n + 1);
+ }
+ s++;
+ n++;
+ }
+ if (*s)
+ {
+ Mem_Free(lightsstring);
+ Host_Error("misparsed lights file!\n");
+ }
+ loadmodel->numlights = numlights;
+ Mem_Free(lightsstring);
+ }
+}
+
+void Mod_ProcessLightList(void)
+{
+ int i, j, k, *mark;
+ mlight_t *e;
+ msurface_t *surf;
+ float dist;
+ mleaf_t *l;
+ qbyte *pvs;
+ for (i = 0, e = loadmodel->lights;i < loadmodel->numlights;i++, e++)
+ {
+ e->cullradius2 = DotProduct(e->light, e->light) * (1.0f / (8192.0f * 8192.0f)) / (e->falloff * e->falloff) + 4096.0f;
+ if (e->cullradius2 > 4096.0f * 4096.0f)
+ e->cullradius2 = 4096.0f * 4096.0f;
+ e->cullradius = sqrt(e->cullradius2);
+ l = Mod_PointInLeaf(e->origin, loadmodel);
+ if (l->compressed_vis)
+ pvs = Mod_DecompressVis (l->compressed_vis, loadmodel);
+ else
+ pvs = mod_novis;
+ for (j = 0, l = loadmodel->leafs + 1;j < loadmodel->numleafs - 1;j++)
+ {
+ if (pvs[j >> 3] & (1 << (j & 7)))
+ {
+ for (k = 0, mark = l->firstmarksurface;k < l->nummarksurfaces;k++, mark++)
+ {
+ surf = loadmodel->surfaces + *mark;
+ dist = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+ if (surf->flags & SURF_PLANEBACK)
+ dist = -dist;
+ if (dist > 0 && dist < e->cullradius)
+ loadmodel->surfacevisframes[j] = i - 1000000;
+ }
+ }
+ }
+ e->numsurfaces = 0;
+ for (j = 0;j < loadmodel->nummodelsurfaces;j++)
+ if (loadmodel->surfacevisframes[j] == i - 1000000)
+ e->numsurfaces++;
+ e->surfaces = NULL;
+ if (e->numsurfaces > 0)
+ {
+ e->surfaces = Mem_Alloc(loadmodel->mempool, sizeof(msurface_t *) * e->numsurfaces);
+ e->numsurfaces = 0;
+ for (j = 0;j < loadmodel->nummodelsurfaces;j++)
+ if (loadmodel->surfacevisframes[j] == i - 1000000)
+ e->surfaces[e->numsurfaces++] = loadmodel->surfaces + loadmodel->firstmodelsurface + j;
+ }
+ }
+}
+
/*
=================
*/
static void Mod_LoadVisibility (lump_t *l)
{
+ loadmodel->visdata = NULL;
if (!l->filelen)
- {
- loadmodel->visdata = NULL;
return;
- }
loadmodel->visdata = Mem_Alloc(loadmodel->mempool, l->filelen);
memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen);
}
// used only for HalfLife maps
-void Mod_ParseWadsFromEntityLump(char *data)
+void Mod_ParseWadsFromEntityLump(const char *data)
{
char key[128], value[4096];
char wadname[128];
int i, j, k;
if (!data)
return;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
if (com_token[0] != '{')
return; // error
while (1)
{
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
strcpy(key, com_token);
while (key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
- data = COM_Parse(data);
- if (!data)
+ if (!COM_ParseToken(&data))
return; // error
strcpy(value, com_token);
if (!strcmp("wad", key)) // for HalfLife maps
*/
static void Mod_LoadEntities (lump_t *l)
{
+ loadmodel->entities = NULL;
if (!l->filelen)
- {
- loadmodel->entities = NULL;
return;
- }
loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
if (loadmodel->ishlbsp)
{
texinfo_t *in;
mtexinfo_t *out;
- int i, j, k, count;
- int miptex;
+ int i, j, k, count, miptex;
in = (void *)(mod_base + l->fileofs);
if (l->filelen % sizeof(*in))
miptex = LittleLong (in->miptex);
out->flags = LittleLong (in->flags);
- if (!loadmodel->textures)
- out->texture = &loadmodel->notexture;
+ out->texture = NULL;
+ if (loadmodel->textures)
+ {
+ if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
+ Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
+ else
+ out->texture = loadmodel->textures + miptex;
+ }
+ if (out->flags & TEX_SPECIAL)
+ {
+ // if texture chosen is NULL or the shader needs a lightmap,
+ // force to notexture water shader
+ if (out->texture == NULL || out->texture->shader->flags & SHADERFLAGS_NEEDLIGHTMAP)
+ out->texture = loadmodel->textures + (loadmodel->numtextures - 1);
+ }
else
{
- if (miptex < 0)
- Host_Error ("miptex < 0");
- if (miptex >= loadmodel->numtextures)
- Host_Error ("miptex >= loadmodel->numtextures");
- out->texture = loadmodel->textures[miptex];
+ // if texture chosen is NULL, force to notexture
+ if (out->texture == NULL)
+ out->texture = loadmodel->textures + (loadmodel->numtextures - 2);
}
- if (!out->texture)
- out->texture = &loadmodel->notexture;
}
}
}
}
+#if 0
#define MAX_SUBDIVPOLYTRIANGLES 4096
#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
*/
void Mod_GenerateWarpMesh (msurface_t *surf)
{
- int i, j;
- surfvertex_t *v;
- surfmesh_t *mesh;
+ int i, j;
+ surfvertex_t *v;
+ surfmesh_t *mesh;
subdivpolytriangles = 0;
subdivpolyverts = 0;
SubdividePolygon (surf->poly_numverts, surf->poly_verts);
+ if (subdivpolytriangles < 1)
+ Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
- mesh = &surf->mesh;
+ surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
mesh->numverts = subdivpolyverts;
mesh->numtriangles = subdivpolytriangles;
- if (mesh->numtriangles < 1)
- Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
- mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
- mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
+ mesh->vertex = (surfvertex_t *)(mesh + 1);
+ mesh->index = (int *)(mesh->vertex + mesh->numverts);
memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
for (i = 0;i < mesh->numtriangles;i++)
- {
for (j = 0;j < 3;j++)
- {
mesh->index[i*3+j] = subdivpolyindex[i][j];
- //if (mesh->index[i] < 0 || mesh->index[i] >= mesh->numverts)
- // Host_Error("Mod_GenerateWarpMesh: invalid index generated\n");
- }
- }
for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
{
v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]);
}
}
+#endif
-void Mod_GenerateVertexLitMesh (msurface_t *surf)
+void Mod_GenerateWallMesh (msurface_t *surf, int vertexonly)
{
- int i, is, it, *index, smax, tmax;
- float *in, s, t;
- surfvertex_t *out;
- surfmesh_t *mesh;
+ int i, iu, iv, *index, *n, smax, tmax;
+ float *in, s, t, u, v, ubase, vbase, uscale, vscale, normal[3];
+ surfmesh_t *mesh;
- //surf->flags |= SURF_LIGHTMAP;
smax = surf->extents[0] >> 4;
tmax = surf->extents[1] >> 4;
- surf->lightmaptexturestride = 0;
- surf->lightmaptexture = NULL;
-
- mesh = &surf->mesh;
- mesh->numverts = surf->poly_numverts;
- mesh->numtriangles = surf->poly_numverts - 2;
- mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
- mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
- memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
-
- index = mesh->index;
- for (i = 0;i < mesh->numtriangles;i++)
- {
- *index++ = 0;
- *index++ = i + 1;
- *index++ = i + 2;
- }
-
- for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
- {
- VectorCopy (in, out->v);
-
- s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
- t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-
- out->st[0] = s / surf->texinfo->texture->width;
- out->st[1] = t / surf->texinfo->texture->height;
-
- s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
- t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
- // lightmap coordinates
- out->uv[0] = 0;
- out->uv[1] = 0;
- // LordHavoc: calc lightmap data offset for vertex lighting to use
- is = (int) s;
- it = (int) t;
- is = bound(0, is, smax);
- it = bound(0, it, tmax);
- out->lightmapoffset = ((it * (smax+1) + is) * 3);
- }
-}
-
-void Mod_GenerateLightmappedMesh (msurface_t *surf)
-{
- int i, is, it, *index, smax, tmax;
- float *in, s, t, xbase, ybase, xscale, yscale;
- surfvertex_t *out;
- surfmesh_t *mesh;
-
- surf->flags |= SURF_LIGHTMAP;
- smax = surf->extents[0] >> 4;
- tmax = surf->extents[1] >> 4;
- if (r_miplightmaps.integer)
+ if (vertexonly)
{
- surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
- surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL, NULL, 0);
+ surf->lightmaptexturestride = 0;
+ surf->lightmaptexture = NULL;
+ uscale = 0;
+ vscale = 0;
+ ubase = 0;
+ vbase = 0;
}
else
{
- surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
- surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE, NULL, NULL, 0);
+ surf->flags |= SURF_LIGHTMAP;
+ if (r_miplightmaps.integer)
+ {
+ surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
+ surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE);
+ }
+ else
+ {
+ surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
+ surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
+ }
+ R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
+ uscale = (uscale - ubase) * 16.0 / ((surf->extents[0] & ~15) + 16);
+ vscale = (vscale - vbase) * 16.0 / ((surf->extents[1] & ~15) + 16);
}
-// surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
-// surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_PRECACHE);
- R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale);
- xscale = (xscale - xbase) * 16.0 / ((surf->extents[0] & ~15) + 16);
- yscale = (yscale - ybase) * 16.0 / ((surf->extents[1] & ~15) + 16);
- mesh = &surf->mesh;
+ surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[6]) + surf->poly_numverts * (4 + 2 + 2 + 2 + 1 + 3) * sizeof(float));
mesh->numverts = surf->poly_numverts;
mesh->numtriangles = surf->poly_numverts - 2;
- mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
- mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
- memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+ mesh->verts = (float *)(mesh + 1);
+ mesh->st = mesh->verts + mesh->numverts * 4;
+ mesh->uv = mesh->st + mesh->numverts * 2;
+ mesh->ab = mesh->uv + mesh->numverts * 2;
+ mesh->lightmapoffsets = (int *)(mesh->ab + mesh->numverts * 2);
+ mesh->index = mesh->lightmapoffsets + mesh->numverts;
+ mesh->triangleneighbors = mesh->index + mesh->numtriangles * 3;
+ mesh->normals = (float *)(mesh->triangleneighbors + mesh->numtriangles * 3);
index = mesh->index;
+ n = mesh->triangleneighbors;
for (i = 0;i < mesh->numtriangles;i++)
{
*index++ = 0;
*index++ = i + 1;
*index++ = i + 2;
+ *n++ = i - 1;
+ *n++ = -1;
+ *n++ = i + 1;
}
- for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+ VectorCopy(surf->plane->normal, normal);
+ if (surf->flags & SURF_PLANEBACK)
+ VectorNegate(normal, normal);
+ for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
{
- VectorCopy (in, out->v);
-
- s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
- t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-
- out->st[0] = s / surf->texinfo->texture->width;
- out->st[1] = t / surf->texinfo->texture->height;
-
- s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
- t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
- // lightmap coordinates
- out->uv[0] = s * xscale + xbase;
- out->uv[1] = t * yscale + ybase;
-
+ s = DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
+ t = DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+ u = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
+ v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
// LordHavoc: calc lightmap data offset for vertex lighting to use
- is = (int) s;
- it = (int) t;
- is = bound(0, is, smax);
- it = bound(0, it, tmax);
- out->lightmapoffset = ((it * (smax+1) + is) * 3);
+ iu = (int) u;
+ iv = (int) v;
+ iu = bound(0, iu, smax);
+ iv = bound(0, iv, tmax);
+ u = u * uscale + ubase;
+ v = v * vscale + vbase;
+
+ mesh->verts[i * 4 + 0] = in[0];
+ mesh->verts[i * 4 + 1] = in[1];
+ mesh->verts[i * 4 + 2] = in[2];
+ mesh->st[i * 2 + 0] = s / surf->texinfo->texture->width;
+ mesh->st[i * 2 + 1] = t / surf->texinfo->texture->height;
+ mesh->uv[i * 2 + 0] = u;
+ mesh->uv[i * 2 + 1] = v;
+ mesh->ab[i * 2 + 0] = s * (1.0f / 16.0f);
+ mesh->ab[i * 2 + 1] = t * (1.0f / 16.0f);
+ mesh->lightmapoffsets[i] = ((iv * (smax+1) + iu) * 3);
+ mesh->normals[i * 3 + 0] = normal[0];
+ mesh->normals[i * 3 + 1] = normal[1];
+ mesh->normals[i * 3 + 2] = normal[2];
}
}
void Mod_GenerateVertexMesh (msurface_t *surf)
{
- int i, *index;
- float *in;
- surfvertex_t *out;
- surfmesh_t *mesh;
+ int i, *index, *n;
+ float *in, s, t, normal[3];
+ surfmesh_t *mesh;
surf->lightmaptexturestride = 0;
surf->lightmaptexture = NULL;
- mesh = &surf->mesh;
+ surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[6]) + surf->poly_numverts * (4 + 2 + 2 + 3) * sizeof(float));
mesh->numverts = surf->poly_numverts;
mesh->numtriangles = surf->poly_numverts - 2;
- mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
- mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
- memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+ mesh->verts = (float *)(mesh + 1);
+ mesh->st = mesh->verts + mesh->numverts * 4;
+ mesh->ab = mesh->st + mesh->numverts * 2;
+ mesh->index = (int *)(mesh->ab + mesh->numverts * 2);
+ mesh->triangleneighbors = mesh->index + mesh->numtriangles * 3;
+ mesh->normals = (float *)(mesh->triangleneighbors + mesh->numtriangles * 3);
index = mesh->index;
+ n = mesh->triangleneighbors;
for (i = 0;i < mesh->numtriangles;i++)
{
*index++ = 0;
*index++ = i + 1;
*index++ = i + 2;
+ *n++ = -1;
+ *n++ = -1;
+ *n++ = i + 1;
}
- for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+ VectorCopy(surf->plane->normal, normal);
+ if (surf->flags & SURF_PLANEBACK)
+ VectorNegate(normal, normal);
+ for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
{
- VectorCopy (in, out->v);
- out->st[0] = (DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]) / surf->texinfo->texture->width;
- out->st[1] = (DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]) / surf->texinfo->texture->height;
+ s = (DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
+ t = (DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
+ mesh->verts[i * 4 + 0] = in[0];
+ mesh->verts[i * 4 + 1] = in[1];
+ mesh->verts[i * 4 + 2] = in[2];
+ mesh->st[i * 2 + 0] = s / surf->texinfo->texture->width;
+ mesh->st[i * 2 + 1] = t / surf->texinfo->texture->height;
+ mesh->ab[i * 2 + 0] = s * (1.0f / 16.0f);
+ mesh->ab[i * 2 + 1] = t * (1.0f / 16.0f);
+ mesh->normals[i * 3 + 0] = normal[0];
+ mesh->normals[i * 3 + 1] = normal[1];
+ mesh->normals[i * 3 + 2] = normal[2];
}
}
void Mod_GenerateSurfacePolygon (msurface_t *surf)
{
- float *vert;
- int i;
- int lindex;
- float *vec;
+ int i, lindex;
+ float *vec, *vert, mins[3], maxs[3], temp[3], dist;
// convert edges back to a normal polygon
surf->poly_numverts = surf->numedges;
VectorCopy (vec, vert);
vert += 3;
}
+ vert = surf->poly_verts;
+ VectorCopy(vert, mins);
+ VectorCopy(vert, maxs);
+ vert += 3;
+ for (i = 1;i < surf->poly_numverts;i++)
+ {
+ if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0];
+ if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1];
+ if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2];
+ vert += 3;
+ }
+ VectorCopy(mins, surf->poly_mins);
+ VectorCopy(maxs, surf->poly_maxs);
+ surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
+ surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
+ surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
+ surf->poly_radius2 = 0;
+ vert = surf->poly_verts;
+ for (i = 0;i < surf->poly_numverts;i++)
+ {
+ VectorSubtract(vert, surf->poly_center, temp);
+ dist = DotProduct(temp, temp);
+ if (surf->poly_radius2 < dist)
+ surf->poly_radius2 = dist;
+ vert += 3;
+ }
+ surf->poly_radius = sqrt(surf->poly_radius2);
}
/*
*/
static void Mod_LoadFaces (lump_t *l)
{
- dface_t *in;
+ dface_t *in;
msurface_t *out;
- int i, count, surfnum, planenum, side, ssize, tsize;
+ int i, count, surfnum, planenum, ssize, tsize;
in = (void *)(mod_base + l->fileofs);
if (l->filelen % sizeof(*in))
loadmodel->surfaces = out;
loadmodel->numsurfaces = count;
+ loadmodel->surfacevisframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+ loadmodel->surfacepvsframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
{
+ out->number = surfnum;
// FIXME: validate edges, texinfo, etc?
out->firstedge = LittleLong(in->firstedge);
out->numedges = LittleShort(in->numedges);
+ if ((unsigned int) out->firstedge + (unsigned int) out->numedges > (unsigned int) loadmodel->numsurfedges)
+ Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", out->firstedge, out->numedges, loadmodel->numsurfedges);
- out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo);
+ i = LittleShort (in->texinfo);
+ if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo)
+ Host_Error("Mod_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo);
+ out->texinfo = loadmodel->texinfo + i;
out->flags = out->texinfo->texture->flags;
planenum = LittleShort(in->planenum);
- side = LittleShort(in->side);
- if (side)
+ if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
+ Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
+
+ if (LittleShort(in->side))
out->flags |= SURF_PLANEBACK;
out->plane = loadmodel->planes + planenum;
// force lightmap upload on first time seeing the surface
out->cached_dlight = true;
- out->cached_ambient = -1000;
- out->cached_lightscalebit = -1000;
CalcSurfaceExtents (out);
out->samples = loadmodel->lightdata + (i * 3);
Mod_GenerateSurfacePolygon(out);
-
- if (out->texinfo->texture->flags & SURF_DRAWSKY)
- {
- out->shader = &Cshader_sky;
- out->samples = NULL;
- Mod_GenerateWarpMesh (out);
- continue;
- }
-
- if (out->texinfo->texture->flags & SURF_DRAWTURB)
- {
- if (out->texinfo->texture->glowtexture)
- out->shader = &Cshader_water_glow;
- else
- out->shader = &Cshader_water;
- /*
- for (i=0 ; i<2 ; i++)
- {
- out->extents[i] = 16384*1024;
- out->texturemins[i] = -8192*1024;
- }
- */
- out->samples = NULL;
- Mod_GenerateWarpMesh (out);
- continue;
- }
-
- if (!R_TextureHasAlpha(out->texinfo->texture->texture))
- out->flags |= SURF_CLIPSOLID;
- if (out->texinfo->flags & TEX_SPECIAL)
- {
- // qbsp couldn't find the texture for this surface, but it was either turb or sky... assume turb
- if (out->texinfo->texture->glowtexture)
- out->shader = &Cshader_water_glow;
- else
- out->shader = &Cshader_water;
- out->shader = &Cshader_water;
- out->samples = NULL;
- Mod_GenerateWarpMesh (out);
- }
- else if ((out->extents[0]+1) > (256*16) || (out->extents[1]+1) > (256*16))
- {
- Con_Printf ("Bad surface extents, converting to fullbright polygon");
- if (out->texinfo->texture->glowtexture)
- out->shader = &Cshader_wall_fullbright_glow;
- else
- out->shader = &Cshader_wall_fullbright;
- out->samples = NULL;
- Mod_GenerateVertexMesh(out);
- }
- else
+ if (out->texinfo->texture->shader == &Cshader_wall_lightmap)
{
+ if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
+ Host_Error ("Bad surface extents");
+ Mod_GenerateWallMesh (out, false);
// stainmap for permanent marks on walls
out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
// clear to white
memset(out->stainsamples, 255, ssize * tsize * 3);
- if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer)
- {
- if (out->texinfo->texture->glowtexture)
- out->shader = &Cshader_wall_vertex_glow;
- else
- out->shader = &Cshader_wall_vertex;
- Mod_GenerateVertexLitMesh(out);
- }
- else
- {
- if (out->texinfo->texture->glowtexture)
- out->shader = &Cshader_wall_lightmap_glow;
- else
- out->shader = &Cshader_wall_lightmap;
- Mod_GenerateLightmappedMesh(out);
- }
}
+ else
+ Mod_GenerateVertexMesh (out);
}
}
-static model_t *sortmodel;
-
-static int Mod_SurfaceQSortCompare(const void *voida, const void *voidb)
-{
- const msurface_t *a, *b;
- a = *((const msurface_t **)voida);
- b = *((const msurface_t **)voidb);
- if (a->shader != b->shader)
- return (long) a->shader - (long) b->shader;
- if (a->texinfo->texture != b->texinfo->texture);
- return a->texinfo->texture - b->texinfo->texture;
- return 0;
-}
-
-static void Mod_BrushSortedSurfaces(model_t *model, mempool_t *pool)
-{
- int surfnum;
- sortmodel = model;
- sortmodel->modelsortedsurfaces = Mem_Alloc(pool, sortmodel->nummodelsurfaces * sizeof(msurface_t *));
- for (surfnum = 0;surfnum < sortmodel->nummodelsurfaces;surfnum++)
- sortmodel->modelsortedsurfaces[surfnum] = &sortmodel->surfaces[surfnum + sortmodel->firstmodelsurface];
-
- qsort(sortmodel->modelsortedsurfaces, sortmodel->nummodelsurfaces, sizeof(msurface_t *), Mod_SurfaceQSortCompare);
-}
-
-
/*
=================
Mod_SetParent
for (j=0 ; j<4 ; j++)
out->ambient_sound_level[j] = in->ambient_level[j];
- // gl underwater warp
- // LordHavoc: disabled underwater warping
- /*
- if (out->contents != CONTENTS_EMPTY)
- {
- for (j=0 ; j<out->nummarksurfaces ; j++)
- out->firstmarksurface[j]->flags |= SURF_UNDERWATER;
- }
- */
+ // FIXME: Insert caustics here
}
}
hull->clip_maxs[0] = 16;
hull->clip_maxs[1] = 16;
hull->clip_maxs[2] = 36;
+ VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
hull = &loadmodel->hulls[2];
hull->clipnodes = out;
hull->clip_maxs[0] = 32;
hull->clip_maxs[1] = 32;
hull->clip_maxs[2] = 32;
+ VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
hull = &loadmodel->hulls[3];
hull->clipnodes = out;
hull->clip_maxs[0] = 16;
hull->clip_maxs[1] = 16;
hull->clip_maxs[2] = 18;
+ VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
}
else
{
hull->clip_maxs[0] = 16;
hull->clip_maxs[1] = 16;
hull->clip_maxs[2] = 32;
+ VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
hull = &loadmodel->hulls[2];
hull->clipnodes = out;
hull->clip_maxs[0] = 32;
hull->clip_maxs[1] = 32;
hull->clip_maxs[2] = 64;
+ VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
}
for (i=0 ; i<count ; i++, out++, in++)
*/
static void Mod_LoadMarksurfaces (lump_t *l)
{
- int i, j;
- short *in;
+ int i, j;
+ short *in;
in = (void *)(mod_base + l->fileofs);
if (l->filelen % sizeof(*in))
Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
- loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(msurface_t *));
+ loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(int));
for (i = 0;i < loadmodel->nummarksurfaces;i++)
{
j = (unsigned) LittleShort(in[i]);
if (j >= loadmodel->numsurfaces)
Host_Error ("Mod_ParseMarksurfaces: bad surface number");
- loadmodel->marksurfaces[i] = loadmodel->surfaces + j;
+ loadmodel->marksurfaces[i] = j;
}
}
out->normal[2] = LittleFloat (in->normal[2]);
out->dist = LittleFloat (in->dist);
- // LordHavoc: recalculated by PlaneClassify, FIXME: validate type and report error if type does not match normal?
-// out->type = LittleLong (in->type);
PlaneClassify(out);
}
}
// free the original winding
FreeWinding (in);
- // debugging
- //Mem_CheckSentinels(neww);
-
return neww;
}
VectorCopy (mid, b->points[b->numpoints]);
b->numpoints++;
}
-
- // debugging
- //Mem_CheckSentinels(f);
- //Mem_CheckSentinels(b);
}
typedef struct portal_s
{
portal_t *p;
p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
- //memset(p, 0, sizeof(portal_t));
p->chain = portalchain;
portalchain = p;
return p;
mleaf_t *leaf, *endleaf;
winding_t *w;
- //Mem_CheckSentinelsGlobal();
-
// recalculate bounding boxes for all leafs (because qbsp is very sloppy)
leaf = loadmodel->leafs;
endleaf = leaf + loadmodel->numleafs;
Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
- //Mem_CheckSentinelsGlobal();
-
// tally up portal and point counts
p = portalchain;
numportals = 0;
}
loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
loadmodel->numportals = numportals;
- loadmodel->portalpoints = (void *) ((long) loadmodel->portals + numportals * sizeof(mportal_t));
+ loadmodel->portalpoints = (void *) ((qbyte *) loadmodel->portals + numportals * sizeof(mportal_t));
loadmodel->numportalpoints = numpoints;
// clear all leaf portal chains
for (i = 0;i < loadmodel->numleafs;i++)
FreePortal(p);
p = pnext;
}
-
- //Mem_CheckSentinelsGlobal();
}
/*
portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
winding_t *nodeportalwinding, *frontwinding, *backwinding;
- // CheckLeafPortalConsistancy (node);
-
// if a leaf, we're done
if (node->contents)
return;
nodeportal->plane = *node->plane;
nodeportalwinding = BaseWindingForPlane (node->plane);
- //Mem_CheckSentinels(nodeportalwinding);
side = 0; // shut up compiler warning
for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
{
Mod_RecursiveNodePortals(back);
}
-/*
-void Mod_MakeOutsidePortals(mnode_t *node)
-{
- int i, j;
- portal_t *p, *portals[6];
- mnode_t *outside_node;
-
- outside_node = Mem_Alloc(loadmodel->mempool, sizeof(mnode_t));
- outside_node->contents = CONTENTS_SOLID;
- outside_node->portals = NULL;
-
- for (i = 0;i < 3;i++)
- {
- for (j = 0;j < 2;j++)
- {
- portals[j*3 + i] = p = AllocPortal ();
- memset (&p->plane, 0, sizeof(mplane_t));
- p->plane.normal[i] = j ? -1 : 1;
- p->plane.dist = -65536;
- p->winding = BaseWindingForPlane (&p->plane);
- if (j)
- AddPortalToNodes (p, outside_node, node);
- else
- AddPortalToNodes (p, node, outside_node);
- }
- }
-
- // clip the basewindings by all the other planes
- for (i = 0;i < 6;i++)
- {
- for (j = 0;j < 6;j++)
- {
- if (j == i)
- continue;
- portals[i]->winding = ClipWinding (portals[i]->winding, &portals[j]->plane, true);
- }
- }
-}
-*/
static void Mod_MakePortals(void)
{
-// Con_Printf("building portals for %s\n", loadmodel->name);
-
portalchain = NULL;
-// Mod_MakeOutsidePortals (loadmodel->nodes);
Mod_RecursiveNodePortals (loadmodel->nodes);
Mod_FinalizePortals();
}
Mod_LoadBrushModel
=================
*/
+extern void R_DrawBrushModelFakeShadow (entity_render_t *ent);
void Mod_LoadBrushModel (model_t *mod, void *buffer)
{
int i, j;
dmodel_t *bm;
mempool_t *mainmempool;
char *loadname;
+ model_t *originalloadmodel;
mod->type = mod_brush;
i = LittleLong (header->version);
if (i != BSPVERSION && i != 30)
- Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i or 30 (HalfLife))", mod->name, i, BSPVERSION);
+ Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION);
mod->ishlbsp = i == 30;
if (loadmodel->isworldmodel)
+ {
Cvar_SetValue("halflifebsp", mod->ishlbsp);
+ // until we get a texture for it...
+ R_ResetQuakeSky();
+ }
// swap all the lumps
mod_base = (qbyte *)header;
// store which lightmap format to use
mod->lightmaprgba = r_lightmaprgba.integer;
-// Mem_CheckSentinelsGlobal();
- // LordHavoc: had to move entity loading above everything to allow parsing various settings from worldspawn
Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-// Mem_CheckSentinelsGlobal();
Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-// Mem_CheckSentinelsGlobal();
-// Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-// Mem_CheckSentinelsGlobal();
Mod_MakeHull0 ();
-// Mem_CheckSentinelsGlobal();
Mod_MakePortals();
-// Mem_CheckSentinelsGlobal();
mod->numframes = 2; // regular and alternate animation
mainmempool = mod->mempool;
loadname = mod->name;
+ Mod_LoadLightList ();
+ originalloadmodel = loadmodel;
+
//
// set up the submodels (FIXME: this is confusing)
//
for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
{
// we only need to have a drawsky function if it is used (usually only on world model)
- if (surf->shader == &Cshader_sky)
+ if (surf->texinfo->texture->shader == &Cshader_sky)
mod->DrawSky = R_DrawBrushModelSky;
for (k = 0;k < surf->numedges;k++)
{
mod->yawmaxs[2] = mod->normalmaxs[2];
mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
-// mod->modelradius = modelradius;
+ mod->radius = modelradius;
+ mod->radius2 = modelradius * modelradius;
// LordHavoc: check for empty submodels (lacrima.bsp has such a glitch)
if (mod->normalmins[0] > mod->normalmaxs[0] || mod->normalmins[1] > mod->normalmaxs[1] || mod->normalmins[2] > mod->normalmaxs[2])
{
VectorClear(mod->yawmaxs);
VectorClear(mod->rotatedmins);
VectorClear(mod->rotatedmaxs);
- //mod->modelradius = 0;
+ mod->radius = 0;
+ mod->radius2 = 0;
}
-// VectorCopy (bm->maxs, mod->maxs);
-// VectorCopy (bm->mins, mod->mins);
-
-// mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
-
mod->numleafs = bm->visleafs;
- mod->SERAddEntity = Mod_Brush_SERAddEntity;
mod->Draw = R_DrawBrushModelNormal;
- mod->DrawShadow = NULL;
-
- Mod_BrushSortedSurfaces(mod, mainmempool);
+ mod->DrawFakeShadow = R_DrawBrushModelFakeShadow;
// LordHavoc: only register submodels if it is the world
// (prevents bsp models from replacing world submodels)
mod = loadmodel;
}
}
-// Mem_CheckSentinelsGlobal();
+
+ loadmodel = originalloadmodel;
+ Mod_ProcessLightList ();
}
+
projects / xonotic / darkplaces.git / blobdiff