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)
+{
+ 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)
{
- R_Clip_AddBox(currentrenderentity->mins, currentrenderentity->maxs, R_Entity_Callback, currentrenderentity, NULL);
+ 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);
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;
}
*/
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];
loadmodel->textures = NULL;
// 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)
- {
- if (loadmodel->isworldmodel)
- R_InitSky (data, 4);
- Mem_Free(data);
- }
- else
+ data = loadimagepixels(tx->name, false, 0, 0);
+ if (data)
{
- Mem_Free(data);
- Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
+ 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)))
{
if (!R_TextureHasAlpha(tx->texture))
tx->flags |= SURF_CLIPSOLID;
}
+
+ tx->detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
}
// sequence the animations
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
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);
+
+ incomplete = false;
+ for (j = 0;j < max;j++)
+ {
+ 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++)
- anims[k] = altanims[k];
+ altanims[k] = anims[k];
}
// link together the primary animation
for (j = 0;j < max;j++)
{
tx2 = anims[j];
- if (!tx2)
- Host_Error ("Missing frame %i of %s", j, tx->name);
tx2->animated = true;
tx2->anim_total[0] = max;
tx2->anim_total[1] = altmax;
}
}
- // link together the alternate animation
- for (j = 0;j < altmax;j++)
+ // if there really is an alternate anim...
+ if (anims[0] != altanims[0])
{
- tx2 = altanims[j];
- if (!tx2)
- Host_Error ("Missing frame %i of %s", j, tx->name);
- 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++)
+ // link together the alternate animation
+ for (j = 0;j < altmax;j++)
{
- tx2->anim_frames[0][k] = altanims[k];
- tx2->anim_frames[1][k] = anims[k];
+ 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];
+ }
}
}
}
}
}
+#if 0
#define MAX_SUBDIVPOLYTRIANGLES 4096
#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
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, smax, tmax;
+ float *in, s, t, u, v, ubase, vbase, uscale, vscale;
+ surfmesh_t *mesh;
smax = surf->extents[0] >> 4;
tmax = surf->extents[1] >> 4;
- surf->lightmaptexturestride = 0;
- surf->lightmaptexture = NULL;
- surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
- mesh->numverts = surf->poly_numverts;
- mesh->numtriangles = surf->poly_numverts - 2;
- mesh->vertex = (surfvertex_t *)(mesh + 1);
- mesh->index = (int *)(mesh->vertex + mesh->numverts);
- 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);
}
- 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);
- surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
+ surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * (4 + 2 + 2 + 2 + 1) * sizeof(float));
mesh->numverts = surf->poly_numverts;
mesh->numtriangles = surf->poly_numverts - 2;
- mesh->vertex = (surfvertex_t *)(mesh + 1);
- mesh->index = (int *)(mesh->vertex + mesh->numverts);
- 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;
index = mesh->index;
for (i = 0;i < mesh->numtriangles;i++)
*index++ = i + 2;
}
- for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+ 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) * uscale + ubase;
+ v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0) * vscale + vbase;
// 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);
+
+ 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);
}
}
void Mod_GenerateVertexMesh (msurface_t *surf)
{
- int i, *index;
- float *in;
- surfvertex_t *out;
- surfmesh_t *mesh;
+ int i, *index;
+ float *in, s, t;
+ surfmesh_t *mesh;
surf->lightmaptexturestride = 0;
surf->lightmaptexture = NULL;
- surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
+ surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * (4 + 2 + 2) * sizeof(float));
mesh->numverts = surf->poly_numverts;
mesh->numtriangles = surf->poly_numverts - 2;
- mesh->vertex = (surfvertex_t *)(mesh + 1);
- mesh->index = (int *)(mesh->vertex + mesh->numverts);
- 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);
index = mesh->index;
for (i = 0;i < mesh->numtriangles;i++)
*index++ = i + 2;
}
- for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+ 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);
}
}
void Mod_GenerateSurfacePolygon (msurface_t *surf)
{
- float *vert;
- int i;
- int lindex;
- float *vec;
+ int i, lindex;
+ float *vec, *vert, mins[3], maxs[3];
// convert edges back to a normal polygon
surf->poly_numverts = surf->numedges;
VectorCopy (vec, vert);
vert += 3;
}
-}
-
-static void Mod_SplitSurfMeshIfTooBig(msurface_t *s)
-{
- int j, base, tricount, newvertexcount, *index, *vertexremap;
- surfmesh_t *newmesh, *oldmesh, *firstmesh;
- if (s->mesh->numtriangles > 1000)
+ vert = surf->poly_verts;
+ VectorCopy(vert, mins);
+ VectorCopy(vert, maxs);
+ vert += 3;
+ for (i = 1;i < surf->poly_numverts;i++)
{
- vertexremap = Mem_Alloc(tempmempool, s->mesh->numverts * sizeof(int));
- base = 0;
- oldmesh = NULL;
- firstmesh = NULL;
- newmesh = NULL;
- while (base < s->mesh->numtriangles)
- {
- tricount = s->mesh->numtriangles - base;
- if (tricount > 1000)
- tricount = 1000;
- index = s->mesh->index + base * 3;
- base += tricount;
-
- newvertexcount = 0;
- memset(vertexremap, -1, s->mesh->numverts * sizeof(int));
- for (j = 0;j < tricount * 3;j++)
- if (vertexremap[index[j]] < 0)
- vertexremap[index[j]] = newvertexcount++;
-
- newmesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + newvertexcount * sizeof(surfvertex_t) + tricount * sizeof(int[3]));
- newmesh->chain = NULL;
- newmesh->numverts = newvertexcount;
- newmesh->numtriangles = tricount;
- newmesh->vertex = (surfvertex_t *)(newmesh + 1);
- newmesh->index = (int *)(newmesh->vertex + newvertexcount);
- for (j = 0;j < tricount * 3;j++)
- {
- newmesh->index[j] = vertexremap[index[j]];
- // yes this copies the same vertex multiple times in many cases... but that's ok...
- memcpy(&newmesh->vertex[newmesh->index[j]], &s->mesh->vertex[index[j]], sizeof(surfvertex_t));
- }
- if (oldmesh)
- oldmesh->chain = newmesh;
- else
- firstmesh = newmesh;
- oldmesh = newmesh;
- }
- Mem_Free(vertexremap);
- Mem_Free(s->mesh);
- s->mesh = firstmesh;
+ 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;
}
/*
{
out->shader = &Cshader_sky;
out->samples = NULL;
- Mod_GenerateWarpMesh (out);
+ Mod_GenerateVertexMesh (out);
}
else if (out->texinfo->texture->flags & SURF_DRAWTURB)
{
out->shader = &Cshader_water;
out->samples = NULL;
- Mod_GenerateWarpMesh (out);
+ Mod_GenerateVertexMesh (out);
}
else
{
out->shader = &Cshader_water;
out->shader = &Cshader_water;
out->samples = NULL;
- Mod_GenerateWarpMesh (out);
+ Mod_GenerateVertexMesh (out);
}
- else if ((out->extents[0]+1) > (256*16) || (out->extents[1]+1) > (256*16))
+ else if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
{
Con_Printf ("Bad surface extents, converting to fullbright polygon");
out->shader = &Cshader_wall_fullbright;
if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer)
{
out->shader = &Cshader_wall_vertex;
- Mod_GenerateVertexLitMesh(out);
+ Mod_GenerateWallMesh (out, true);
}
else
{
out->shader = &Cshader_wall_lightmap;
- Mod_GenerateLightmappedMesh(out);
+ Mod_GenerateWallMesh (out, false);
}
}
}
- Mod_SplitSurfMeshIfTooBig(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 (qbyte *) a->shader - (qbyte *) 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
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;
mod->numleafs = bm->visleafs;
- mod->SERAddEntity = Mod_Brush_SERAddEntity;
mod->Draw = R_DrawBrushModelNormal;
mod->DrawShadow = NULL;
- Mod_BrushSortedSurfaces(mod, mainmempool);
-
// LordHavoc: only register submodels if it is the world
// (prevents bsp models from replacing world submodels)
if (loadmodel->isworldmodel && i < (mod->numsubmodels - 1))
projects / xonotic / darkplaces.git / blobdiff