X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=6dfb17bc9f245c4a5f6dd62b4143df85751c44d1;hp=dbe24cdf16ff00a9517e7f0091c0fa76cb1f93ac;hb=a4c841abe711873346dd1eb47a78a6c8785c21fd;hpb=c5f3e2f2412f9b0510de4b399c34c39f949715b6 diff --git a/gl_rsurf.c b/gl_rsurf.c index dbe24cdf..6dfb17bc 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -24,19 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_LIGHTMAP_SIZE 256 -static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting -static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting - -static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; - -static mempool_t *r_surf_mempool = NULL; -static int r_surf_surfacevisiblelimit = 0; -static qbyte *r_surf_surfacevisible = NULL; - cvar_t r_ambient = {0, "r_ambient", "0"}; cvar_t r_drawportals = {0, "r_drawportals", "0"}; cvar_t r_testvis = {0, "r_testvis", "0"}; -cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"}; cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"}; cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"}; cvar_t r_drawcollisionbrushes_polygonfactor = {0, "r_drawcollisionbrushes_polygonfactor", "-1"}; @@ -44,222 +34,14 @@ cvar_t r_drawcollisionbrushes_polygonoffset = {0, "r_drawcollisionbrushes_polygo cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0"}; cvar_t gl_lightmaps = {0, "gl_lightmaps", "0"}; -/* -// FIXME: these arrays are huge! -int r_q1bsp_maxmarkleafs; -int r_q1bsp_nummarkleafs; -mleaf_t *r_q1bsp_maxleaflist[65536]; -int r_q1bsp_maxmarksurfaces; -int r_q1bsp_nummarksurfaces; -msurface_t *r_q1bsp_maxsurfacelist[65536]; - -// FIXME: these arrays are huge! -int r_q3bsp_maxmarkleafs; -int r_q3bsp_nummarkleafs; -q3mleaf_t *r_q3bsp_maxleaflist[65536]; -int r_q3bsp_maxmarksurfaces; -int r_q3bsp_nummarksurfaces; -q3msurface_t *r_q3bsp_maxsurfacelist[65536]; -*/ - -void R_Surf_ClearSurfaceVisible(int num) -{ - if (r_surf_surfacevisiblelimit < num) - { - Mem_Free(r_surf_surfacevisible); - r_surf_surfacevisiblelimit = num; - r_surf_surfacevisible = Mem_Alloc(r_surf_mempool, r_surf_surfacevisiblelimit); - } - memset(r_surf_surfacevisible, 0, num); -} - -static int dlightdivtable[32768]; - -static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf) -{ - int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract, k; - unsigned int *bl; - float dist, impact[3], local[3]; - dlight_t *light; - - lit = false; - - smax = (surf->extents[0] >> 4) + 1; - tmax = (surf->extents[1] >> 4) + 1; - smax3 = smax * 3; - - for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++) - { - if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) - continue; // not lit by this light - - Matrix4x4_Transform(matrix, light->origin, local); - dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; - - // for comparisons to minimum acceptable light - // compensate for LIGHTOFFSET - maxdist = (int) light->rtlight.lightmap_cullradius2 + LIGHTOFFSET; - - dist2 = dist * dist; - dist2 += LIGHTOFFSET; - if (dist2 >= maxdist) - continue; - - if (surf->plane->type < 3) - { - VectorCopy(local, impact); - impact[surf->plane->type] -= dist; - } - else - { - impact[0] = local[0] - surf->plane->normal[0] * dist; - impact[1] = local[1] - surf->plane->normal[1] * dist; - impact[2] = local[2] - surf->plane->normal[2] * dist; - } - - impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; - - s = bound(0, impacts, smax * 16) - impacts; - t = bound(0, impactt, tmax * 16) - impactt; - i = s * s + t * t + dist2; - if (i > maxdist) - continue; - - // reduce calculations - for (s = 0, i = impacts; s < smax; s++, i -= 16) - sdtable[s] = i * i + dist2; - - maxdist3 = maxdist - dist2; - - // convert to 8.8 blocklights format - red = light->rtlight.lightmap_light[0] * (1.0f / 128.0f); - green = light->rtlight.lightmap_light[1] * (1.0f / 128.0f); - blue = light->rtlight.lightmap_light[2] * (1.0f / 128.0f); - subtract = (int) (light->rtlight.lightmap_subtract * 4194304.0f); - bl = intblocklights; - - i = impactt; - for (t = 0;t < tmax;t++, i -= 16) - { - td = i * i; - // make sure some part of it is visible on this line - if (td < maxdist3) - { - maxdist2 = maxdist - td; - for (s = 0;s < smax;s++) - { - if (sdtable[s] < maxdist2) - { - k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract; - if (k > 0) - { - bl[0] += (red * k); - bl[1] += (green * k); - bl[2] += (blue * k); - lit = true; - } - } - bl += 3; - } - } - else // skip line - bl += smax3; - } - } - return lit; -} - -static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf) -{ - int lnum, s, t, smax, tmax, smax3, lit, impacts, impactt; - float sdtable[256], *bl, k, dist, dist2, maxdist, maxdist2, maxdist3, td1, td, red, green, blue, impact[3], local[3], subtract; - dlight_t *light; - - lit = false; - - smax = (surf->extents[0] >> 4) + 1; - tmax = (surf->extents[1] >> 4) + 1; - smax3 = smax * 3; - - for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++) - { - if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) - continue; // not lit by this light - - Matrix4x4_Transform(matrix, light->origin, local); - dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; - - // for comparisons to minimum acceptable light - // compensate for LIGHTOFFSET - maxdist = (int) light->rtlight.lightmap_cullradius2 + LIGHTOFFSET; - - dist2 = dist * dist; - dist2 += LIGHTOFFSET; - if (dist2 >= maxdist) - continue; - - if (surf->plane->type < 3) - { - VectorCopy(local, impact); - impact[surf->plane->type] -= dist; - } - else - { - impact[0] = local[0] - surf->plane->normal[0] * dist; - impact[1] = local[1] - surf->plane->normal[1] * dist; - impact[2] = local[2] - surf->plane->normal[2] * dist; - } - - impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; - - td = bound(0, impacts, smax * 16) - impacts; - td1 = bound(0, impactt, tmax * 16) - impactt; - td = td * td + td1 * td1 + dist2; - if (td > maxdist) - continue; - - // reduce calculations - for (s = 0, td1 = impacts; s < smax; s++, td1 -= 16.0f) - sdtable[s] = td1 * td1 + dist2; - - maxdist3 = maxdist - dist2; - - // convert to 8.8 blocklights format - red = light->rtlight.lightmap_light[0]; - green = light->rtlight.lightmap_light[1]; - blue = light->rtlight.lightmap_light[2]; - subtract = light->rtlight.lightmap_subtract * 32768.0f; - bl = floatblocklights; - - td1 = impactt; - for (t = 0;t < tmax;t++, td1 -= 16.0f) - { - td = td1 * td1; - // make sure some part of it is visible on this line - if (td < maxdist3) - { - maxdist2 = maxdist - td; - for (s = 0;s < smax;s++) - { - if (sdtable[s] < maxdist2) - { - k = (32768.0f / (sdtable[s] + td)) - subtract; - bl[0] += red * k; - bl[1] += green * k; - bl[2] += blue * k; - lit = true; - } - bl += 3; - } - } - else // skip line - bl += smax3; - } - } - return lit; -} +// flag arrays used for visibility checking on world model +// (all other entities have no per-surface/per-leaf visibility checks) +// TODO: dynamic resize according to r_refdef.worldmodel->brush.num_clusters +qbyte r_pvsbits[(32768+7)>>3]; +// TODO: dynamic resize according to r_refdef.worldmodel->brush.num_leafs +qbyte r_worldleafvisible[32768]; +// TODO: dynamic resize according to r_refdef.worldmodel->brush.num_surfaces +qbyte r_worldsurfacevisible[262144]; /* =============== @@ -268,176 +50,87 @@ R_BuildLightMap Combine and scale multiple lightmaps into the 8.8 format in blocklights =============== */ -static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) +static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) { - if (!r_floatbuildlightmap.integer) + int smax, tmax, i, j, size, size3, maps, stride, l; + unsigned int *bl, scale; + qbyte *lightmap, *out, *stain; + static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting + static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; + + // update cached lighting info + surface->cached_dlight = 0; + + smax = (surface->lightmapinfo->extents[0]>>4)+1; + tmax = (surface->lightmapinfo->extents[1]>>4)+1; + size = smax*tmax; + size3 = size*3; + lightmap = surface->lightmapinfo->samples; + +// set to full bright if no light data + bl = intblocklights; + if (!ent->model->brushq1.lightdata) { - int smax, tmax, i, j, size, size3, maps, stride, l; - unsigned int *bl, scale; - qbyte *lightmap, *out, *stain; - - // update cached lighting info - surf->cached_dlight = 0; - - smax = (surf->extents[0]>>4)+1; - tmax = (surf->extents[1]>>4)+1; - size = smax*tmax; - size3 = size*3; - lightmap = surf->samples; - - // set to full bright if no light data - bl = intblocklights; - if (!ent->model->brushq1.lightdata) - { - for (i = 0;i < size3;i++) - bl[i] = 255*256; - } - else - { - // clear to no light - memset(bl, 0, size*3*sizeof(unsigned int)); - - if (surf->dlightframe == r_framecount) - { - surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf); - if (surf->cached_dlight) - c_light_polys++; - } - - // add all the lightmaps - if (lightmap) - { - bl = intblocklights; - for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3) - for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++) - bl[i] += lightmap[i] * scale; - } - } - - stain = surf->stainsamples; - bl = intblocklights; - out = templight; - // the >> 16 shift adjusts down 8 bits to account for the stainmap - // scaling, and remaps the 0-65536 (2x overbright) to 0-256, it will - // be doubled during rendering to achieve 2x overbright - // (0 = 0.0, 128 = 1.0, 256 = 2.0) - if (ent->model->brushq1.lightmaprgba) - { - stride = (surf->lightmaptexturestride - smax) * 4; - for (i = 0;i < tmax;i++, out += stride) - { - for (j = 0;j < smax;j++) - { - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - *out++ = 255; - } - } - } - else - { - stride = (surf->lightmaptexturestride - smax) * 3; - for (i = 0;i < tmax;i++, out += stride) - { - for (j = 0;j < smax;j++) - { - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); - } - } - } - - R_UpdateTexture(surf->lightmaptexture, templight); + for (i = 0;i < size3;i++) + bl[i] = 255*256; } else { - int smax, tmax, i, j, size, size3, maps, stride, l; - float *bl, scale; - qbyte *lightmap, *out, *stain; - - // update cached lighting info - surf->cached_dlight = 0; - - smax = (surf->extents[0]>>4)+1; - tmax = (surf->extents[1]>>4)+1; - size = smax*tmax; - size3 = size*3; - lightmap = surf->samples; - - // set to full bright if no light data - bl = floatblocklights; - if (!ent->model->brushq1.lightdata) - { - for (i = 0;i < size3;i++) - bl[i] = 255*256; - } - else - { - memset(bl, 0, size*3*sizeof(float)); - - if (surf->dlightframe == r_framecount) - { - surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf); - if (surf->cached_dlight) - c_light_polys++; - } +// clear to no light + memset(bl, 0, size*3*sizeof(unsigned int)); - // add all the lightmaps - if (lightmap) - { - bl = floatblocklights; - for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3) - for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++) - bl[i] += lightmap[i] * scale; - } +// add all the lightmaps + if (lightmap) + { + bl = intblocklights; + for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++, lightmap += size3) + for (scale = d_lightstylevalue[surface->lightmapinfo->styles[maps]], i = 0;i < size3;i++) + bl[i] += lightmap[i] * scale; } + } - stain = surf->stainsamples; - bl = floatblocklights; - out = templight; - // this scaling adjusts down 8 bits to account for the stainmap - // scaling, and remaps the 0.0-2.0 (2x overbright) to 0-256, it will - // be doubled during rendering to achieve 2x overbright - // (0 = 0.0, 128 = 1.0, 256 = 2.0) - scale = 1.0f / (1 << 16); - if (ent->model->brushq1.lightmaprgba) + stain = surface->lightmapinfo->stainsamples; + bl = intblocklights; + out = templight; + // the >> 16 shift adjusts down 8 bits to account for the stainmap + // scaling, and remaps the 0-65536 (2x overbright) to 0-256, it will + // be doubled during rendering to achieve 2x overbright + // (0 = 0.0, 128 = 1.0, 256 = 2.0) + if (ent->model->brushq1.lightmaprgba) + { + stride = (surface->lightmapinfo->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) { - stride = (surf->lightmaptexturestride - smax) * 4; - for (i = 0;i < tmax;i++, out += stride) + for (j = 0;j < smax;j++) { - for (j = 0;j < smax;j++) - { - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - *out++ = 255; - } + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + *out++ = 255; } } - else + } + else + { + stride = (surface->lightmapinfo->lightmaptexturestride - smax) * 3; + for (i = 0;i < tmax;i++, out += stride) { - stride = (surf->lightmaptexturestride - smax) * 3; - for (i = 0;i < tmax;i++, out += stride) + for (j = 0;j < smax;j++) { - for (j = 0;j < smax;j++) - { - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - l = *bl++ * *stain++ * scale;*out++ = min(l, 255); - } + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); } } - - R_UpdateTexture(surf->lightmaptexture, templight); } + + R_UpdateTexture(surface->lightmaptexture, templight); } void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8]) { float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2; - msurface_t *surf, *endsurf; + msurface_t *surface, *endsurface; int i, s, t, smax, tmax, smax3, impacts, impactt, stained; qbyte *bl; vec3_t impact; @@ -446,7 +139,7 @@ void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radi invradius = 1.0f / radius; loc0: - if (node->contents < 0) + if (!node->plane) return; ndist = PlaneDiff(origin, node->plane); if (ndist > radius) @@ -475,15 +168,15 @@ loc0: impact[2] = origin[2] - node->plane->normal[2] * ndist; } - for (surf = model->brushq1.surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) + for (surface = model->brush.data_surfaces + node->firstsurface, endsurface = surface + node->numsurfaces;surface < endsurface;surface++) { - if (surf->stainsamples) + if (surface->lightmapinfo->stainsamples) { - smax = (surf->extents[0] >> 4) + 1; - tmax = (surf->extents[1] >> 4) + 1; + smax = (surface->lightmapinfo->extents[0] >> 4) + 1; + tmax = (surface->lightmapinfo->extents[1] >> 4) + 1; - impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; + impacts = DotProduct (impact, surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3] - surface->lightmapinfo->texturemins[0]; + impactt = DotProduct (impact, surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3] - surface->lightmapinfo->texturemins[1]; s = bound(0, impacts, smax * 16) - impacts; t = bound(0, impactt, tmax * 16) - impactt; @@ -495,7 +188,7 @@ loc0: for (s = 0, i = impacts; s < smax; s++, i -= 16) sdtable[s] = i * i + dist2; - bl = surf->stainsamples; + bl = surface->lightmapinfo->stainsamples; smax3 = smax * 3; stained = false; @@ -531,13 +224,13 @@ loc0: } // force lightmap upload if (stained) - surf->cached_dlight = true; + surface->cached_dlight = true; } } - if (node->children[0]->contents >= 0) + if (node->children[0]->plane) { - if (node->children[1]->contents >= 0) + if (node->children[1]->plane) { R_StainNode(node->children[0], model, origin, radius, fcolor); node = node->children[1]; @@ -549,7 +242,7 @@ loc0: goto loc0; } } - else if (node->children[1]->contents >= 0) + else if (node->children[1]->plane) { node = node->children[1]; goto loc0; @@ -563,7 +256,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int entity_render_t *ent; model_t *model; vec3_t org; - if (r_refdef.worldmodel == NULL || !r_refdef.worldmodel->brushq1.nodes) + if (r_refdef.worldmodel == NULL || !r_refdef.worldmodel->brush.data_nodes || !r_refdef.worldmodel->brushq1.lightdata) return; fcolor[0] = cr1; fcolor[1] = cg1; @@ -574,7 +267,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int fcolor[6] = cb2 - cb1; fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f); - R_StainNode(r_refdef.worldmodel->brushq1.nodes + r_refdef.worldmodel->brushq1.hulls[0].firstclipnode, r_refdef.worldmodel, origin, radius, fcolor); + R_StainNode(r_refdef.worldmodel->brush.data_nodes + r_refdef.worldmodel->brushq1.hulls[0].firstclipnode, r_refdef.worldmodel, origin, radius, fcolor); // look for embedded bmodels for (n = 0;n < cl_num_brushmodel_entities;n++) @@ -584,10 +277,10 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int if (model && model->name[0] == '*') { Mod_CheckLoaded(model); - if (model->brushq1.nodes) + if (model->brush.data_nodes) { Matrix4x4_Transform(&ent->inversematrix, origin, org); - R_StainNode(model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor); + R_StainNode(model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor); } } } @@ -602,199 +295,226 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ============================================================= */ -static void RSurf_AddLightmapToVertexColors_Color4f(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) +static void RSurf_DeformVertices(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t modelorg) { - int i; - float scale; - const qbyte *lm; - if (styles[0] != 255) + int i, j; + float center[3], forward[3], right[3], up[3], v[4][3]; + matrix4x4_t matrix1, imatrix1; + if (texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2) { - for (i = 0;i < numverts;i++, c += 4) + // a single autosprite surface can contain multiple sprites... + VectorClear(forward); + VectorClear(right); + VectorSet(up, 0, 0, 1); + for (j = 0;j < surface->num_vertices - 3;j += 4) { - lm = samples + lightmapoffsets[i]; - scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (styles[1] != 255) - { - lm += size3; - scale = d_lightstylevalue[styles[1]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (styles[2] != 255) - { - lm += size3; - scale = d_lightstylevalue[styles[2]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (styles[3] != 255) - { - lm += size3; - scale = d_lightstylevalue[styles[3]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - } - } - } + VectorClear(center); + for (i = 0;i < 4;i++) + VectorAdd(center, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (j+i) * 3, center); + VectorScale(center, 0.25f, center); + // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out? + Matrix4x4_FromVectors(&matrix1, (surface->groupmesh->data_normal3f + 3 * surface->num_firstvertex) + j*3, (surface->groupmesh->data_svector3f + 3 * surface->num_firstvertex) + j*3, (surface->groupmesh->data_tvector3f + 3 * surface->num_firstvertex) + j*3, center); + Matrix4x4_Invert_Simple(&imatrix1, &matrix1); + for (i = 0;i < 4;i++) + Matrix4x4_Transform(&imatrix1, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (j+i)*3, v[i]); + forward[0] = modelorg[0] - center[0]; + forward[1] = modelorg[1] - center[1]; + VectorNormalize(forward); + right[0] = forward[1]; + right[1] = -forward[0]; + for (i = 0;i < 4;i++) + VectorMAMAMAM(1, center, v[i][0], forward, v[i][1], right, v[i][2], up, varray_vertex3f + (surface->num_firstvertex+i+j) * 3); } } -} - -static void RSurf_FogColors_Vertex3f_Color4f(const float *v, float *c, float colorscale, int numverts, const float *modelorg) -{ - int i; - float diff[3], f; - if (fogenabled) + else if (texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE) { - for (i = 0;i < numverts;i++, v += 3, c += 4) + Matrix4x4_Transform(&ent->inversematrix, r_viewforward, forward); + Matrix4x4_Transform(&ent->inversematrix, r_viewright, right); + Matrix4x4_Transform(&ent->inversematrix, r_viewup, up); + // a single autosprite surface can contain multiple sprites... + for (j = 0;j < surface->num_vertices - 3;j += 4) { - VectorSubtract(v, modelorg, diff); - f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff))); - VectorScale(c, f, c); + VectorClear(center); + for (i = 0;i < 4;i++) + VectorAdd(center, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (j+i) * 3, center); + VectorScale(center, 0.25f, center); + // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out? + Matrix4x4_FromVectors(&matrix1, (surface->groupmesh->data_normal3f + 3 * surface->num_firstvertex) + j*3, (surface->groupmesh->data_svector3f + 3 * surface->num_firstvertex) + j*3, (surface->groupmesh->data_tvector3f + 3 * surface->num_firstvertex) + j*3, center); + Matrix4x4_Invert_Simple(&imatrix1, &matrix1); + for (i = 0;i < 4;i++) + Matrix4x4_Transform(&imatrix1, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (j+i)*3, v[i]); + for (i = 0;i < 4;i++) + VectorMAMAMAM(1, center, v[i][0], forward, v[i][1], right, v[i][2], up, varray_vertex3f + (surface->num_firstvertex+i+j) * 3); } } - else if (colorscale != 1) - for (i = 0;i < numverts;i++, c += 4) - VectorScale(c, colorscale, c); + else + memcpy((varray_vertex3f + 3 * surface->num_firstvertex), (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), sizeof(float[3]) * surface->num_vertices); } -static void RSurf_FoggedColors_Vertex3f_Color4f(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) +// any sort of deformvertices call is *VERY* rare, so this must be optimized +// to skip deformvertices quickly! +#if 1 +#define RSurf_GetVertexPointer(ent, texture, surface, modelorg) ((texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) ? (RSurf_DeformVertices(ent, texture, surface, modelorg), varray_vertex3f) : surface->groupmesh->data_vertex3f) +#else +static float *RSurf_GetVertexPointer(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t modelorg) { - int i; - float diff[3], f; - r *= colorscale; - g *= colorscale; - b *= colorscale; - if (fogenabled) + if (texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) { - for (i = 0;i < numverts;i++, v += 3, c += 4) - { - VectorSubtract(v, modelorg, diff); - f = 1 - exp(fogdensity/DotProduct(diff, diff)); - c[0] = r * f; - c[1] = g * f; - c[2] = b * f; - c[3] = a; - } + RSurf_DeformVertices(ent, texture, surface, modelorg); + return varray_vertex3f; } else + return surface->groupmesh->data_vertex3f; +} +#endif + +void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t) +{ + // we don't need to set currentframe if t->animated is false because + // it was already set up by the texture loader for non-animating + if (t->animated) { - for (i = 0;i < numverts;i++, c += 4) - { - c[0] = r; - c[1] = g; - c[2] = b; - c[3] = a; - } + t->currentframe = t->anim_frames[ent->frame != 0][(t->anim_total[ent->frame != 0] >= 2) ? ((int)(r_refdef.time * 5.0f) % t->anim_total[ent->frame != 0]) : 0]; + t = t->currentframe; } + t->currentmaterialflags = t->basematerialflags; + t->currentalpha = ent->alpha; + if (t->basematerialflags & MATERIALFLAG_WATERALPHA) + t->currentalpha *= r_wateralpha.value; + if (!(ent->flags & RENDER_LIGHT)) + t->currentmaterialflags |= MATERIALFLAG_FULLBRIGHT; + if (ent->effects & EF_ADDITIVE) + t->currentmaterialflags |= MATERIALFLAG_ADD | MATERIALFLAG_TRANSPARENT; + else if (t->currentalpha < 1) + t->currentmaterialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT; } -static void RSurf_FogPassColors_Vertex3f_Color4f(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) +matrix4x4_t r_surf_waterscrollmatrix; + +void R_UpdateAllTextureInfo(entity_render_t *ent) { int i; - float diff[3], f; - r *= colorscale; - g *= colorscale; - b *= colorscale; - for (i = 0;i < numverts;i++, v += 3, c += 4) - { - VectorSubtract(v, modelorg, diff); - f = exp(fogdensity/DotProduct(diff, diff)); - c[0] = r; - c[1] = g; - c[2] = b; - c[3] = a * f; - } + Matrix4x4_CreateTranslate(&r_surf_waterscrollmatrix, sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0); + if (ent->model) + for (i = 0;i < ent->model->brush.num_textures;i++) + R_UpdateTextureInfo(ent, ent->model->brush.data_textures + i); } -static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color, float scale) +static void R_DrawSurfaceList(const entity_render_t *ent, texture_t *texture, int texturenumsurfaces, const msurface_t **texturesurfacelist, const vec3_t modelorg) { - float f; - const float *v; + int i; + int texturesurfaceindex; + const float *v, *vertex3f; float *c; - int i, l, lit = false; - const dlight_t *light; - vec3_t lightorigin; - for (l = 0;l < r_numdlights;l++) + float diff[3]; + float f, r, g, b, a, base, colorscale; + const msurface_t *surface; + qboolean dolightmap; + qboolean dobase; + qboolean doambient; + qboolean dodetail; + qboolean doglow; + qboolean dofogpass; + qboolean fogallpasses; + qboolean waterscrolling; + surfmesh_t *groupmesh; + rtexture_t *lightmaptexture; + rmeshstate_t m; + texture = texture->currentframe; + if (texture->currentmaterialflags & MATERIALFLAG_NODRAW) + return; + c_faces += texturenumsurfaces; + // gl_lightmaps debugging mode skips normal texturing + if (gl_lightmaps.integer) { - if (dlightbits[l >> 5] & (1 << (l & 31))) + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_DepthTest(true); + qglDisable(GL_CULL_FACE); + GL_Color(1, 1, 1, 1); + memset(&m, 0, sizeof(m)); + R_Mesh_State(&m); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - light = &r_dlight[l]; - Matrix4x4_Transform(matrix, light->origin, lightorigin); - for (i = 0, v = vert, c = color;i < numverts;i++, v += 3, c += 4) - { - f = VectorDistance2(v, lightorigin) + LIGHTOFFSET; - if (f < light->rtlight.lightmap_cullradius2) - { - f = ((1.0f / f) - light->rtlight.lightmap_subtract) * scale; - VectorMA(c, f, light->rtlight.lightmap_light, c); - lit = true; - } - } + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + R_Mesh_ColorPointer(surface->lightmaptexture ? NULL : surface->groupmesh->data_lightmapcolor4f); + R_Mesh_VertexPointer(surface->groupmesh->data_vertex3f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); } + qglEnable(GL_CULL_FACE); + return; } - return lit; -} - -static void RSurfShader_Transparent_Callback(const void *calldata1, int calldata2) -{ - const entity_render_t *ent = calldata1; - const msurface_t *surf = ent->model->brushq1.surfaces + calldata2; - rmeshstate_t m; - float currentalpha; - float base, colorscale; - vec3_t modelorg; - texture_t *texture; - float args[4] = {0.05f,0,0,0.04f}; - int rendertype, turb, fullbright; - - R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); - - texture = surf->texinfo->texture; - if (texture->animated) - texture = texture->anim_frames[ent->frame != 0][(texture->anim_total[ent->frame != 0] >= 2) ? ((int) (r_refdef.time * 5.0f) % texture->anim_total[ent->frame != 0]) : 0]; - currentalpha = ent->alpha; - if (surf->flags & SURF_WATERALPHA) - currentalpha *= r_wateralpha.value; - - GL_DepthTest(!(ent->effects & EF_NODEPTHTEST)); - if (ent->effects & EF_ADDITIVE) - { - rendertype = SURFRENDER_ADD; + GL_DepthTest(!(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST)); + GL_DepthMask(!(texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)); + if (texture->currentmaterialflags & MATERIALFLAG_ADD) GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - } - else if (currentalpha < 1 || texture->skin.fog != NULL) - { - rendertype = SURFRENDER_ALPHA; + else if (texture->currentmaterialflags & MATERIALFLAG_ALPHA) GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthMask(false); - } else - { - rendertype = SURFRENDER_OPAQUE; GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(!(ent->effects & EF_NODEPTHTEST)); + // water waterscrolling in texture matrix + waterscrolling = (texture->currentmaterialflags & MATERIALFLAG_WATER) && r_waterscroll.value != 0; + if (texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) + qglDisable(GL_CULL_FACE); + if (texture->currentmaterialflags & MATERIALFLAG_SKY) + { + if (skyrendernow) + { + skyrendernow = false; + if (skyrendermasked) + R_Sky(); + } + // LordHavoc: HalfLife maps have freaky skypolys... + if (!ent->model->brush.ishlbsp) + { + R_Mesh_Matrix(&ent->matrix); + GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1); + if (skyrendermasked) + { + // depth-only (masking) + GL_ColorMask(0,0,0,0); + // just to make sure that braindead drivers don't draw anything + // despite that colormask... + GL_BlendFunc(GL_ZERO, GL_ONE); + } + else + { + // fog sky + GL_BlendFunc(GL_ONE, GL_ZERO); + } + GL_DepthMask(true); + GL_DepthTest(true); + memset(&m, 0, sizeof(m)); + R_Mesh_State(&m); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(surface->groupmesh->data_vertex3f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); + } } - - turb = (surf->flags & SURF_DRAWTURB) && r_waterscroll.value; - fullbright = !(ent->flags & RENDER_LIGHT) || (surf->flags & SURF_DRAWFULLBRIGHT) || !surf->samples; - base = fullbright ? 2.0f : r_ambient.value * (1.0f / 64.0f); - if (surf->flags & SURF_DRAWTURB) - base *= 0.5f; - if ((surf->flags & SURF_DRAWTURB) && gl_textureshader && r_watershader.value && !fogenabled && fullbright && ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1) + else if ((texture->currentmaterialflags & MATERIALFLAG_WATER) && r_watershader.value && gl_textureshader && !texture->skin.glow && !fogenabled && ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1) { // NVIDIA Geforce3 distortion texture shader on water - GL_Color(1, 1, 1, currentalpha); + float args[4] = {0.05f,0,0,0.04f}; memset(&m, 0, sizeof(m)); - m.pointer_vertex = surf->mesh.data_vertex3f; m.tex[0] = R_GetTexture(mod_shared_distorttexture[(int)(r_refdef.time * 16)&63]); m.tex[1] = R_GetTexture(texture->skin.base); m.texcombinergb[0] = GL_REPLACE; m.texcombinergb[1] = GL_REPLACE; - m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = surf->mesh.data_texcoordtexture2f; Matrix4x4_CreateFromQuakeEntity(&m.texmatrix[0], 0, 0, 0, 0, 0, 0, r_watershader.value); - Matrix4x4_CreateTranslate(&m.texmatrix[1], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0); + m.texmatrix[1] = r_surf_waterscrollmatrix; R_Mesh_State(&m); + GL_Color(1, 1, 1, texture->currentalpha); GL_ActiveTexture(0); qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D); GL_ActiveTexture(1); @@ -803,1396 +523,1187 @@ static void RSurfShader_Transparent_Callback(const void *calldata1, int calldata qglTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, &args[0]); qglEnable(GL_TEXTURE_SHADER_NV); - GL_LockArrays(0, surf->mesh.num_vertices); - R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); - GL_LockArrays(0, 0); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(RSurf_GetVertexPointer(ent, texture, surface, modelorg)); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + R_Mesh_TexCoordPointer(1, 2, surface->groupmesh->data_texcoordtexture2f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } qglDisable(GL_TEXTURE_SHADER_NV); qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D); GL_ActiveTexture(0); } - else + else if (texture->currentmaterialflags & (MATERIALFLAG_WATER | MATERIALFLAG_WALL)) { - memset(&m, 0, sizeof(m)); - m.pointer_vertex = surf->mesh.data_vertex3f; - m.pointer_color = varray_color4f; - m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; - m.tex[0] = R_GetTexture(texture->skin.base); - if (turb) - { - // scrolling in texture matrix - Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0); - } - colorscale = 1; - if (gl_combine.integer) - { - m.texrgbscale[0] = 4; - colorscale *= 0.25f; - } - R_FillColors(varray_color4f, surf->mesh.num_vertices, base * ent->colormod[0], base * ent->colormod[1], base * ent->colormod[2], currentalpha); - if (!fullbright) - { - if (surf->dlightframe == r_framecount) - RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, surf->mesh.num_vertices, surf->mesh.data_vertex3f, varray_color4f, 1); - if (surf->samples) - RSurf_AddLightmapToVertexColors_Color4f(surf->mesh.data_lightmapoffsets, varray_color4f,surf->mesh.num_vertices, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); - } - RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, colorscale, surf->mesh.num_vertices, modelorg); - R_Mesh_State(&m); - GL_LockArrays(0, surf->mesh.num_vertices); - R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); - GL_LockArrays(0, 0); - if (texture->skin.glow) - { - memset(&m, 0, sizeof(m)); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - m.pointer_color = varray_color4f; - m.tex[0] = R_GetTexture(texture->skin.glow); - m.pointer_vertex = surf->mesh.data_vertex3f; - if (m.tex[0]) + // normal surface (wall or water) + dobase = true; + dolightmap = !(texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT); + doambient = r_ambient.value >= (1/64.0f); + dodetail = r_detailtextures.integer && texture->skin.detail != NULL && !(texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT); + doglow = texture->skin.glow != NULL; + dofogpass = fogenabled && !(texture->currentmaterialflags & MATERIALFLAG_ADD); + fogallpasses = fogenabled && !(texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT); + if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT) + { + if (dobase && dolightmap && gl_combine.integer) { - m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; - if (turb) + dobase = false; + memset(&m, 0, sizeof(m)); + m.tex[1] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[1] = r_surf_waterscrollmatrix; + m.texrgbscale[1] = 2; + m.pointer_color = varray_color4f; + R_Mesh_State(&m); + colorscale = 1; + r = ent->colormod[0] * colorscale; + g = ent->colormod[1] * colorscale; + b = ent->colormod[2] * colorscale; + a = texture->currentalpha; + base = r_ambient.value * (1.0f / 64.0f); + // q3bsp has no lightmap updates, so the lightstylevalue that + // would normally be baked into the lightmaptexture must be + // applied to the color + if (ent->model->brushq1.lightdata) { - // scrolling in texture matrix - Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0); + float scale = d_lightstylevalue[0] * (1.0f / 128.0f); + r *= scale; + g *= scale; + b *= scale; + } + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + R_Mesh_TexCoordPointer(1, 2, surface->groupmesh->data_texcoordtexture2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + if (fogallpasses) + { + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = f * r; + c[1] = f * g; + c[2] = f * b; + c[3] = a; + } + } + else + { + R_Mesh_ColorPointer(NULL); + GL_Color(r, g, b, a); + } + } + else + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(varray_color4f); + if (!surface->lightmaptexture) + { + for (i = 0, c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, c += 4) + { + c[0] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+0] * r; + c[1] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+1] * g; + c[2] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+2] * b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + } + if (fogallpasses) + { + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + VectorScale(c, f, c); + } + } + } + else + { + R_Mesh_ColorPointer(NULL); + GL_Color(0, 0, 0, a); + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); } } - R_Mesh_State(&m); - RSurf_FoggedColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, 1, 1, currentalpha, 1, surf->mesh.num_vertices, modelorg); - GL_LockArrays(0, surf->mesh.num_vertices); - R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); - GL_LockArrays(0, 0); - } - if (fogenabled && rendertype != SURFRENDER_ADD) - { - memset(&m, 0, sizeof(m)); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - m.pointer_color = varray_color4f; - m.tex[0] = R_GetTexture(texture->skin.fog); - m.pointer_vertex = surf->mesh.data_vertex3f; - if (m.tex[0]) + if (dobase) { - m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; - if (turb) + dobase = false; + memset(&m, 0, sizeof(m)); + m.tex[0] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; + m.pointer_color = varray_color4f; + colorscale = 1; + if (gl_combine.integer) + { + m.texrgbscale[0] = 4; + colorscale *= 0.25f; + } + R_Mesh_State(&m); + r = ent->colormod[0] * colorscale; + g = ent->colormod[1] * colorscale; + b = ent->colormod[2] * colorscale; + a = texture->currentalpha; + if (dolightmap) + { + // q3bsp has no lightmap updates, so the lightstylevalue that + // would normally be baked into the lightmaptexture must be + // applied to the color + if (!ent->model->brushq1.lightdata) + { + float scale = d_lightstylevalue[0] * (1.0f / 128.0f); + r *= scale; + g *= scale; + b *= scale; + } + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + c[0] = 0; + c[1] = 0; + c[2] = 0; + if (!surface->lightmapinfo) + VectorCopy((surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex) + i*4, c); + else //if (surface->lightmapinfo) + { + const qbyte *lm = surface->lightmapinfo->samples + (surface->groupmesh->data_lightmapoffsets + surface->num_firstvertex)[i]; + float scale = d_lightstylevalue[surface->lightmapinfo->styles[0]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (surface->lightmapinfo->styles[1] != 255) + { + int size3 = ((surface->lightmapinfo->extents[0]>>4)+1)*((surface->lightmapinfo->extents[1]>>4)+1)*3; + lm += size3; + scale = d_lightstylevalue[surface->lightmapinfo->styles[1]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (surface->lightmapinfo->styles[2] != 255) + { + lm += size3; + scale = d_lightstylevalue[surface->lightmapinfo->styles[2]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (surface->lightmapinfo->styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[surface->lightmapinfo->styles[3]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + } + } + } + } + c[0] *= r; + c[1] *= g; + c[2] *= b; + if (fogallpasses) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + VectorScale(c, f, c); + } + if (!surface->lightmapinfo && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + else + c[3] = a; + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + else { - // scrolling in texture matrix - Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(r_refdef.time) * 0.025 * r_waterscroll.value, sin(r_refdef.time * 0.8f) * 0.025 * r_waterscroll.value, 0); + if (fogallpasses) + { + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + if (!surface->lightmapinfo && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + { + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = r * f; + c[1] = g * f; + c[2] = b * f; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + } + } + else + { + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = r * f; + c[1] = g * f; + c[2] = b * f; + c[3] = a; + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + else + { + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + if (!surface->lightmaptexture && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + { + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + } + } + else + { + R_Mesh_ColorPointer(NULL); + GL_Color(r, g, b, a); + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } } } - R_Mesh_State(&m); - RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, 1, surf->mesh.num_vertices, modelorg); - GL_LockArrays(0, surf->mesh.num_vertices); - R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); - GL_LockArrays(0, 0); } - } -} - -void R_UpdateTextureInfo(entity_render_t *ent) -{ - int i, texframe, alttextures; - texture_t *t; - - if (!ent->model) - return; - - alttextures = ent->frame != 0; - texframe = (int)(r_refdef.time * 5.0f); - for (i = 0;i < ent->model->brushq1.numtextures;i++) - { - t = ent->model->brushq1.textures + i; - t->currentalpha = ent->alpha; - if (t->flags & SURF_WATERALPHA) - t->currentalpha *= r_wateralpha.value; - if (ent->effects & EF_ADDITIVE) - t->rendertype = SURFRENDER_ADD; - else if (t->currentalpha < 1 || t->skin.fog != NULL) - t->rendertype = SURFRENDER_ALPHA; else - t->rendertype = SURFRENDER_OPAQUE; - // we don't need to set currentframe if t->animated is false because - // it was already set up by the texture loader for non-animating - if (t->animated) - t->currentframe = t->anim_frames[alttextures][(t->anim_total[alttextures] >= 2) ? (texframe % t->anim_total[alttextures]) : 0]; - } -} - -void R_DrawSurfaceList(entity_render_t *ent, texture_t *texture, int texturenumsurfaces, msurface_t **texturesurfacelist) -{ - int texturesurfaceindex; - vec3_t center, modelorg; - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); - rmeshstate_t m; - if (gl_lightmaps.integer) - { - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(true); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - memset(&m, 0, sizeof(m)); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.tex[0] = R_GetTexture(surface->lightmaptexture); - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - else if (texture->rendertype != SURFRENDER_OPAQUE) - { - // transparent vertex shaded from lightmap - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - Matrix4x4_Transform(&ent->matrix, surface->poly_center, center); - R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : center, RSurfShader_Transparent_Callback, ent, surface - ent->model->brushq1.surfaces); - } - } - else if (texture->flags & SURF_LIGHTMAP) - { - qboolean dolightmap = (ent->flags & RENDER_LIGHT); - qboolean dobase = true; - qboolean doambient = r_ambient.value > 0; - qboolean dodetail = r_detailtextures.integer != 0; - qboolean doglow = texture->skin.glow != NULL; - qboolean dofog = fogenabled; - // multitexture cases - if (r_textureunits.integer >= 2 && gl_combine.integer && dobase && dolightmap) { - dobase = false; - dolightmap = false; - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(true); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(texture->skin.base); - m.texrgbscale[1] = 2; - if (r_textureunits.integer >= 3 && !doambient && dodetail) + if (!dolightmap && dobase) + { + dolightmap = false; + dobase = false; + GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], 1); + memset(&m, 0, sizeof(m)); + m.tex[0] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; + R_Mesh_State(&m); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(RSurf_GetVertexPointer(ent, texture, surface, modelorg)); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + if (r_lightmapintensity <= 0 && dolightmap && dobase) + { + dolightmap = false; + dobase = false; + GL_Color(0, 0, 0, 1); + memset(&m, 0, sizeof(m)); + R_Mesh_State(&m); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(RSurf_GetVertexPointer(ent, texture, surface, modelorg)); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + if (r_textureunits.integer >= 2 && gl_combine.integer && dolightmap && dobase) + { + // dualtexture combine + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + dolightmap = false; + dobase = false; + memset(&m, 0, sizeof(m)); + m.tex[1] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[1] = r_surf_waterscrollmatrix; + m.texrgbscale[1] = 2; + R_Mesh_State(&m); + r = ent->colormod[0] * r_lightmapintensity; + g = ent->colormod[1] * r_lightmapintensity; + b = ent->colormod[2] * r_lightmapintensity; + GL_Color(r, g, b, 1); + if (texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) + { + R_Mesh_VertexPointer(varray_vertex3f); + if (r == 1 && g == 1 && b == 1) + { + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + RSurf_DeformVertices(ent, texture, surface, modelorg); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + R_Mesh_TexCoordPointer(1, 2, surface->groupmesh->data_texcoordtexture2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else //if (r == 1 && g == 1 && b == 1) + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(surface->groupmesh->data_lightmapcolor4f); + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + else + { + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + RSurf_DeformVertices(ent, texture, surface, modelorg); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + R_Mesh_TexCoordPointer(1, 2, surface->groupmesh->data_texcoordtexture2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, c += 4) + { + c[0] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+0] * r; + c[1] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+1] * g; + c[2] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+2] * b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3]; + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + } + else + { + if (r == 1 && g == 1 && b == 1) + { +#if 0 + // experimental direct state calls for measuring + // R_Mesh_ call overhead, do not use! + R_Mesh_VertexPointer(varray_vertex3f); + R_Mesh_TexCoordPointer(0, 2, varray_texcoord2f[0]); + R_Mesh_TexCoordPointer(1, 2, varray_texcoord2f[1]); + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(varray_color4f); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), surface->groupmesh->data_vertex3f); + qglClientActiveTexture(GL_TEXTURE0_ARB); + qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), surface->groupmesh->data_texcoordlightmap2f); + qglClientActiveTexture(GL_TEXTURE1_ARB); + qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), surface->groupmesh->data_texcoordtexture2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + qglDisableClientState(GL_COLOR_ARRAY); + qglColor4f(r, g, b, 1); + } + else //if (r == 1 && g == 1 && b == 1) + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + qglEnableClientState(GL_COLOR_ARRAY); + qglColorPointer(4, GL_FLOAT, sizeof(float[4]), surface->groupmesh->data_lightmapcolor4f); + } + qglLockArraysEXT(0, surface->num_vertices); + qglDrawRangeElements(GL_TRIANGLES, surface->num_firstvertex, surface->num_firstvertex + surface->num_vertices, surface->num_triangles * 3, GL_UNSIGNED_INT, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + qglUnlockArraysEXT(); + } +#else + groupmesh = NULL; + lightmaptexture = NULL; + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + if (groupmesh != surface->groupmesh) + { + groupmesh = surface->groupmesh; + R_Mesh_VertexPointer(groupmesh->data_vertex3f); + R_Mesh_TexCoordPointer(0, 2, groupmesh->data_texcoordlightmap2f); + R_Mesh_TexCoordPointer(1, 2, groupmesh->data_texcoordtexture2f); + if (!lightmaptexture) + R_Mesh_ColorPointer(groupmesh->data_lightmapcolor4f); + } + if (lightmaptexture != surface->lightmaptexture) + { + lightmaptexture = surface->lightmaptexture; + if (lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else //if (r == 1 && g == 1 && b == 1) + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(surface->groupmesh->data_lightmapcolor4f); + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } +#endif + } + else + { + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(surface->groupmesh->data_vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + R_Mesh_TexCoordPointer(1, 2, surface->groupmesh->data_texcoordtexture2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, c += 4) + { + c[0] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+0] * r; + c[1] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+1] * g; + c[2] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+2] * b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3]; + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + } + } + // single texture + if (dolightmap) { - m.tex[2] = R_GetTexture(texture->skin.detail); - m.texrgbscale[2] = 2; - dodetail = false; - if (r_textureunits.integer >= 3 && texture->skin.glow) + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_Color(1, 1, 1, 1); + memset(&m, 0, sizeof(m)); + R_Mesh_State(&m); + if (texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) { - m.tex[3] = R_GetTexture(texture->skin.glow); - m.texcombinergb[3] = GL_ADD; - doglow = false; + R_Mesh_VertexPointer(varray_vertex3f); for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.tex[1] = R_GetTexture(surface->lightmaptexture); - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f; - m.pointer_texcoord[2] = surface->mesh.data_texcoorddetail2f; - m.pointer_texcoord[3] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); + surface = texturesurfacelist[texturesurfaceindex]; + RSurf_DeformVertices(ent, texture, surface, modelorg); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordlightmap2f); + if (surface->lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(surface->lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else //if (r == 1 && g == 1 && b == 1) + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(surface->groupmesh->data_lightmapcolor4f); + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); GL_LockArrays(0, 0); } } else { + groupmesh = NULL; + lightmaptexture = NULL; for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.tex[1] = R_GetTexture(surface->lightmaptexture); - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f; - m.pointer_texcoord[2] = surface->mesh.data_texcoorddetail2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); + surface = texturesurfacelist[texturesurfaceindex]; + if (groupmesh != surface->groupmesh) + { + groupmesh = surface->groupmesh; + R_Mesh_VertexPointer(groupmesh->data_vertex3f); + R_Mesh_TexCoordPointer(0, 2, groupmesh->data_texcoordlightmap2f); + if (!lightmaptexture) + R_Mesh_ColorPointer(groupmesh->data_lightmapcolor4f); + } + if (lightmaptexture != surface->lightmaptexture) + { + lightmaptexture = surface->lightmaptexture; + if (lightmaptexture) + { + R_Mesh_TexBind(0, R_GetTexture(lightmaptexture)); + R_Mesh_ColorPointer(NULL); + } + else //if (r == 1 && g == 1 && b == 1) + { + R_Mesh_TexBind(0, R_GetTexture(r_texture_white)); + R_Mesh_ColorPointer(surface->groupmesh->data_lightmapcolor4f); + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); GL_LockArrays(0, 0); } } } - else if (r_textureunits.integer >= 3 && !doambient && !dodetail && doglow) + if (dobase) { - m.tex[2] = R_GetTexture(texture->skin.glow); - m.texcombinergb[2] = GL_ADD; - doglow = false; - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); + GL_DepthMask(false); + GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1); + memset(&m, 0, sizeof(m)); + m.tex[0] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; + R_Mesh_State(&m); + if (texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.tex[1] = R_GetTexture(surface->lightmaptexture); - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = surface->mesh.data_texcoordlightmap2f; - m.pointer_texcoord[2] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); + R_Mesh_VertexPointer(varray_vertex3f); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + RSurf_DeformVertices(ent, texture, surface, modelorg); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } + } + else + { + groupmesh = NULL; + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + if (groupmesh != surface->groupmesh) + { + groupmesh = surface->groupmesh; + R_Mesh_VertexPointer(groupmesh->data_vertex3f); + R_Mesh_TexCoordPointer(0, 2, groupmesh->data_texcoordtexture2f); + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } } } } - // anything not handled above - if (dobase) + if (doambient) { - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(true); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - if (ent->flags & RENDER_LIGHT) - GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1); - else - GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], 1); + doambient = false; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(texture->skin.base); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; + m.pointer_color = varray_color4f; + colorscale = 1; + if (gl_combine.integer) + { + m.texrgbscale[0] = 4; + colorscale *= 0.25f; + } + R_Mesh_State(&m); + base = r_ambient.value * (1.0f / 64.0f); + r = ent->colormod[0] * colorscale * base; + g = ent->colormod[1] * colorscale * base; + b = ent->colormod[2] * colorscale * base; + a = texture->currentalpha; for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + c[0] = r; + c[1] = g; + c[2] = b; + if (fogallpasses) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + VectorScale(c, f, c); + } + if (!surface->lightmaptexture && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + else + c[3] = a; + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); GL_LockArrays(0, 0); } } - GL_DepthMask(false); - if (dolightmap) + if (dodetail) { GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(texture->skin.base); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.tex[0] = R_GetTexture(surface->lightmaptexture); - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordlightmap2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (doambient) - { - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - GL_DepthTest(true); - memset(&m, 0, sizeof(m)); - GL_Color(r_ambient.value * (1.0f / 128.0f) * ent->colormod[0], r_ambient.value * (1.0f / 128.0f) * ent->colormod[1], r_ambient.value * (1.0f / 128.0f) * ent->colormod[2], 1); - m.tex[0] = R_GetTexture(texture->skin.base); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (dodetail) - { - GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); - GL_DepthMask(false); - GL_DepthTest(true); GL_Color(1, 1, 1, 1); memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(texture->skin.detail); + R_Mesh_State(&m); for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); + surface = texturesurfacelist[texturesurfaceindex]; + R_Mesh_VertexPointer(RSurf_GetVertexPointer(ent, texture, surface, modelorg)); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoorddetail2f); + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); GL_LockArrays(0, 0); } } if (doglow) { + // if glow was not already done using multitexture, do it now. GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(texture->skin.glow); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (dofog) - { - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthMask(false); - GL_DepthTest(true); - memset(&m, 0, sizeof(m)); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; m.pointer_color = varray_color4f; - m.tex[0] = R_GetTexture(texture->skin.glow); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - if (m.tex[0]) - m.pointer_texcoord[0] = surface->mesh.data_texcoordtexture2f; - R_Mesh_State(&m); - RSurf_FogPassColors_Vertex3f_Color4f(surface->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surface->mesh.num_vertices, modelorg); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - } - else if (texture->flags & SURF_DRAWTURB) - { - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - RSurfShader_Transparent_Callback(ent, surface - ent->model->brushq1.surfaces); - } - } - else if (texture->flags & SURF_DRAWSKY) - { - if (skyrendernow) - { - skyrendernow = false; - if (skyrendermasked) - R_Sky(); - } - // LordHavoc: HalfLife maps have freaky skypolys... - if (!ent->model->brush.ishlbsp) - { - R_Mesh_Matrix(&ent->matrix); - GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1); - if (skyrendermasked) + R_Mesh_State(&m); + colorscale = 1; + r = ent->colormod[0] * colorscale; + g = ent->colormod[1] * colorscale; + b = ent->colormod[2] * colorscale; + a = texture->currentalpha; + if (fogallpasses) { - // depth-only (masking) - GL_ColorMask(0,0,0,0); - // just to make sure that braindead drivers don't draw anything - // despite that colormask... - GL_BlendFunc(GL_ZERO, GL_ONE); + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) + { + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + R_Mesh_ColorPointer(varray_color4f); + if (!surface->lightmaptexture && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + { + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = f * r; + c[1] = f * g; + c[2] = f * b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + } + } + else + { + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = f * r; + c[1] = f * g; + c[2] = f * b; + c[3] = a; + } + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); + } } else { - // fog sky - GL_BlendFunc(GL_ONE, GL_ZERO); - } - GL_DepthMask(true); - GL_DepthTest(true); - memset(&m, 0, sizeof(m)); - for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) - { - msurface_t *surface = texturesurfacelist[texturesurfaceindex]; - m.pointer_vertex = surface->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, surface->mesh.num_vertices); - R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i); - GL_LockArrays(0, 0); - } - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); - } - } -} - -void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces) -{ - int i, j, f, *surfacevisframes, flagsmask; - msurface_t *surface, **surfacechain; - texture_t *t, *texture; - model_t *model = ent->model; - vec3_t modelorg; - const int maxsurfacelist = 1024; - int numsurfacelist = 0; - msurface_t *surfacelist[1024]; - if (model == NULL) - return; - R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); - - if (ent != r_refdef.worldentity) - { - // because bmodels can be reused, we have to decide which things to render - // from scratch every time - int *mark = model->brushq1.surfacevisframes + model->firstmodelsurface; - surface = model->brushq1.surfaces + model->firstmodelsurface; - for (i = 0;i < model->nummodelsurfaces;i++, mark++, surface++) - { - *mark = r_framecount; - surface->dlightframe = -1; - } - } - - // update light styles - if (!skysurfaces) - { - if (r_dynamic.integer && !r_rtdlight) - R_MarkLights(ent); - for (i = 0;i < model->brushq1.light_styles;i++) - { - if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]]) - { - model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]]; - if ((surfacechain = model->brushq1.light_styleupdatechains[i])) - for (;(surface = *surfacechain);surfacechain++) - surface->cached_dlight = true; - } - } - } - - R_UpdateTextureInfo(ent); - surfacevisframes = model->brushq1.surfacevisframes; - flagsmask = skysurfaces ? SURF_DRAWSKY : (SURF_DRAWTURB | SURF_LIGHTMAP); - f = 0; - t = NULL; - numsurfacelist = 0; - for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++) - { - if (surfacevisframes[j] == r_framecount) - { - surface = model->brushq1.surfaces + j; - if (t != surface->texinfo->texture) - { - if (numsurfacelist) + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist); - numsurfacelist = 0; + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + if (!surface->lightmaptexture && (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) + { + R_Mesh_ColorPointer(varray_color4f); + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) + { + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * a; + } + } + else + { + R_Mesh_ColorPointer(NULL); + GL_Color(r, g, b, a); + } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); } - t = surface->texinfo->texture; - f = t->flags & flagsmask; - texture = t->currentframe; } - if (f) + } + if (dofogpass) + { + // if this is opaque use alpha blend which will darken the earlier + // passes cheaply. + // + // if this is an alpha blended material, all the earlier passes + // were darkened by fog already, so we only need to add the fog + // color ontop through the fog mask texture + // + // if this is an additive blended material, all the earlier passes + // were darkened by fog already, and we should not add fog color + // (because the background was not darkened, there is no fog color + // that was lost behind it). + if (!fogallpasses) + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + else + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + memset(&m, 0, sizeof(m)); + m.tex[0] = R_GetTexture(texture->skin.fog); + if (waterscrolling) + m.texmatrix[0] = r_surf_waterscrollmatrix; + R_Mesh_State(&m); + r = fogcolor[0]; + g = fogcolor[1]; + b = fogcolor[2]; + a = texture->currentalpha; + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - // mark any backface surfaces as not visible - if (PlaneDist(modelorg, surface->plane) < surface->plane->dist) + surface = texturesurfacelist[texturesurfaceindex]; + vertex3f = RSurf_GetVertexPointer(ent, texture, surface, modelorg); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_TexCoordPointer(0, 2, surface->groupmesh->data_texcoordtexture2f); + R_Mesh_ColorPointer(varray_color4f); + //RSurf_FogPassColors_Vertex3f_Color4f((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], texture->currentalpha, 1, surface->num_vertices, modelorg); + if (surface->lightmaptexture && !(texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)) { - if (!(surface->flags & SURF_PLANEBACK)) + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) { - surfacevisframes[j] = -1; - continue; + VectorSubtract(v, modelorg, diff); + f = exp(fogdensity/DotProduct(diff, diff)); + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = (surface->groupmesh->data_lightmapcolor4f + 4 * surface->num_firstvertex)[i*4+3] * f * a; } } else { - if ((surface->flags & SURF_PLANEBACK)) + for (i = 0, v = (vertex3f + 3 * surface->num_firstvertex), c = (varray_color4f + 4 * surface->num_firstvertex);i < surface->num_vertices;i++, v += 3, c += 4) { - surfacevisframes[j] = -1; - continue; + VectorSubtract(v, modelorg, diff); + f = exp(fogdensity/DotProduct(diff, diff)); + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = f * a; } } - // add face to draw list and update lightmap if necessary - c_faces++; - if (surface->cached_dlight && surface->lightmaptexture != NULL) - R_BuildLightMap(ent, surface); - surfacelist[numsurfacelist++] = surface; - if (numsurfacelist >= maxsurfacelist) - { - R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist); - numsurfacelist = 0; - } + GL_LockArrays(surface->num_firstvertex, surface->num_vertices); + R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); + GL_LockArrays(0, 0); } } } - if (numsurfacelist) - R_DrawSurfaceList(ent, texture, numsurfacelist, surfacelist); + if (texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) + qglEnable(GL_CULL_FACE); } -static void R_DrawPortal_Callback(const void *calldata1, int calldata2) +static void RSurfShader_Transparent_Callback(const void *calldata1, int calldata2) { - int i; - float *v; - rmeshstate_t m; - const mportal_t *portal = calldata1; - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthMask(false); - GL_DepthTest(true); - R_Mesh_Matrix(&r_identitymatrix); - - memset(&m, 0, sizeof(m)); - m.pointer_vertex = varray_vertex3f; - R_Mesh_State(&m); + const entity_render_t *ent = calldata1; + const msurface_t *surface = ent->model->brush.data_surfaces + calldata2; + vec3_t modelorg; + texture_t *texture; - i = calldata2; - GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f), - ((i & 0x0038) >> 3) * (1.0f / 7.0f), - ((i & 0x01C0) >> 6) * (1.0f / 7.0f), - 0.125f); - if (PlaneDiff(r_vieworigin, (&portal->plane)) < 0) - { - for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3) - VectorCopy(portal->points[i].position, v); - } - else - for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3) - VectorCopy(portal->points[i].position, v); - GL_LockArrays(0, portal->numpoints); - R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements); - GL_LockArrays(0, 0); -} + texture = surface->texture; + if (texture->basematerialflags & MATERIALFLAG_SKY) + return; // transparent sky is too difficult + R_UpdateTextureInfo(ent, texture); -// LordHavoc: this is just a nice debugging tool, very slow -static void R_DrawPortals(void) -{ - int i, portalnum; - mportal_t *portal; - float center[3], f; - model_t *model = r_refdef.worldmodel; - if (model == NULL) - return; - for (portalnum = 0, portal = model->brushq1.portals;portalnum < model->brushq1.numportals;portalnum++, portal++) - { - if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) - if (!R_CullBox(portal->mins, portal->maxs)) - { - VectorClear(center); - for (i = 0;i < portal->numpoints;i++) - VectorAdd(center, portal->points[i].position, center); - f = ixtable[portal->numpoints]; - VectorScale(center, f, center); - R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, portal, portalnum); - } - } + R_Mesh_Matrix(&ent->matrix); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); + R_DrawSurfaceList(ent, texture, 1, &surface, modelorg); } -void R_WorldVisibility(void) +void R_QueueSurfaceList(entity_render_t *ent, texture_t *texture, int texturenumsurfaces, const msurface_t **texturesurfacelist, const vec3_t modelorg) { - int i, j, *mark; - mleaf_t *leaf; - mleaf_t *viewleaf; - model_t *model = r_refdef.worldmodel; - int *surfacevisframes = model->brushq1.surfacevisframes; - int leafstackpos; - mportal_t *p; - mleaf_t *leafstack[8192]; - - if (!model || !model->brushq1.PointInLeaf) - return; - - viewleaf = model->brushq1.PointInLeaf(model, r_vieworigin); - if (!viewleaf) - return; - - if (viewleaf->contents == CONTENTS_SOLID || r_surfaceworldnode.integer) + int texturesurfaceindex; + const msurface_t *surface; + vec3_t tempcenter, center; + if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT) { - // equivilant to quake's RecursiveWorldNode but faster and more effective - for (j = 0, leaf = model->brushq1.data_leafs;j < model->brushq1.num_leafs;j++, leaf++) + // drawing sky transparently would be too difficult + if (!(texture->currentmaterialflags & MATERIALFLAG_SKY)) { - if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox (leaf->mins, leaf->maxs)) + for (texturesurfaceindex = 0;texturesurfaceindex < texturenumsurfaces;texturesurfaceindex++) { - c_leafs++; - leaf->visframe = r_framecount; - if (leaf->nummarksurfaces) - for (i = 0, mark = leaf->firstmarksurface;i < leaf->nummarksurfaces;i++, mark++) - surfacevisframes[*mark] = r_framecount; + surface = texturesurfacelist[texturesurfaceindex]; + tempcenter[0] = (surface->mins[0] + surface->maxs[0]) * 0.5f; + tempcenter[1] = (surface->mins[1] + surface->maxs[1]) * 0.5f; + tempcenter[2] = (surface->mins[2] + surface->maxs[2]) * 0.5f; + Matrix4x4_Transform(&ent->matrix, tempcenter, center); + R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : center, RSurfShader_Transparent_Callback, ent, surface - ent->model->brush.data_surfaces); } } } else - { - // LordHavoc: portal-passage worldnode with PVS; - // follows portals leading outward from viewleaf, does not venture - // offscreen or into leafs that are not visible, faster than Quake's - // RecursiveWorldNode - leafstack[0] = viewleaf; - leafstackpos = 1; - while (leafstackpos) - { - c_leafs++; - leaf = leafstack[--leafstackpos]; - leaf->visframe = r_framecount; - // draw any surfaces bounding this leaf - if (leaf->nummarksurfaces) - for (i = 0, mark = leaf->firstmarksurface;i < leaf->nummarksurfaces;i++, mark++) - surfacevisframes[*mark] = r_framecount; - // follow portals into other leafs - for (p = leaf->portals;p;p = p->next) - if (DotProduct(r_vieworigin, p->plane.normal) < (p->plane.dist + 1) && p->past->visframe != r_framecount && !R_CullBox(p->mins, p->maxs) && CHECKPVSBIT(r_pvsbits, p->past->clusterindex)) - leafstack[leafstackpos++] = p->past; - } - } - - if (r_drawportals.integer) - R_DrawPortals(); -} - -void R_Q1BSP_DrawSky(entity_render_t *ent) -{ - if (ent->model == NULL) - return; - R_DrawSurfaces(ent, true); + R_DrawSurfaceList(ent, texture, texturenumsurfaces, texturesurfacelist, modelorg); } -void R_Q1BSP_Draw(entity_render_t *ent) -{ - if (ent->model == NULL) - return; - c_bmodels++; - R_DrawSurfaces(ent, false); -} - -void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) +void R_DrawSurfaces(entity_render_t *ent, qboolean skysurfaces) { + int i, j, f, flagsmask; + msurface_t *surface, **surfacechain; + texture_t *t, *texture; model_t *model = ent->model; - vec3_t lightmins, lightmaxs; - int t, leafindex, marksurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0; - const int *e; - const float *v[3]; - msurface_t *surface; - mleaf_t *leaf; - const qbyte *pvs; - lightmins[0] = relativelightorigin[0] - lightradius; - lightmins[1] = relativelightorigin[1] - lightradius; - lightmins[2] = relativelightorigin[2] - lightradius; - lightmaxs[0] = relativelightorigin[0] + lightradius; - lightmaxs[1] = relativelightorigin[1] + lightradius; - lightmaxs[2] = relativelightorigin[2] + lightradius; - *outnumclusterspointer = 0; - *outnumsurfacespointer = 0; - memset(outclusterpvs, 0, model->brush.num_pvsclusterbytes); - memset(outsurfacepvs, 0, (model->nummodelsurfaces + 7) >> 3); + vec3_t modelorg; + const int maxsurfacelist = 1024; + int numsurfacelist = 0; + const msurface_t *surfacelist[1024]; if (model == NULL) + return; + R_Mesh_Matrix(&ent->matrix); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); + + // update light styles + if (!skysurfaces && model->brushq1.light_styleupdatechains) { - VectorCopy(lightmins, outmins); - VectorCopy(lightmaxs, outmaxs); - return; - } - VectorCopy(relativelightorigin, outmins); - VectorCopy(relativelightorigin, outmaxs); - if (model->brush.GetPVS) - pvs = model->brush.GetPVS(model, relativelightorigin); - else - pvs = NULL; - // FIXME: use BSP recursion as lights are often small - for (leafindex = 0, leaf = model->brushq1.data_leafs;leafindex < model->brushq1.num_leafs;leafindex++, leaf++) - { - if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && (pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex))) - { - outmins[0] = min(outmins[0], leaf->mins[0]); - outmins[1] = min(outmins[1], leaf->mins[1]); - outmins[2] = min(outmins[2], leaf->mins[2]); - outmaxs[0] = max(outmaxs[0], leaf->maxs[0]); - outmaxs[1] = max(outmaxs[1], leaf->maxs[1]); - outmaxs[2] = max(outmaxs[2], leaf->maxs[2]); - if (outclusterpvs) - { - if (!CHECKPVSBIT(outclusterpvs, leaf->clusterindex)) - { - SETPVSBIT(outclusterpvs, leaf->clusterindex); - outclusterlist[outnumclusters++] = leaf->clusterindex; - } - } - if (outsurfacepvs) - { - for (marksurfaceindex = 0;marksurfaceindex < leaf->nummarksurfaces;marksurfaceindex++) - { - surfaceindex = leaf->firstmarksurface[marksurfaceindex]; - if (!CHECKPVSBIT(outsurfacepvs, surfaceindex)) - { - surface = model->brushq1.surfaces + surfaceindex; - if (BoxesOverlap(lightmins, lightmaxs, surface->poly_mins, surface->poly_maxs) && (surface->flags & SURF_LIGHTMAP) && !surface->texinfo->texture->skin.fog) - { - for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3) - { - v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3; - v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3; - v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3; - if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) - { - SETPVSBIT(outsurfacepvs, surfaceindex); - outsurfacelist[outnumsurfaces++] = surfaceindex; - break; - } - } - } - } - } - } - } - } - - // limit combined leaf box to light boundaries - outmins[0] = max(outmins[0], lightmins[0]); - outmins[1] = max(outmins[1], lightmins[1]); - outmins[2] = max(outmins[2], lightmins[2]); - outmaxs[0] = min(outmaxs[0], lightmaxs[0]); - outmaxs[1] = min(outmaxs[1], lightmaxs[1]); - outmaxs[2] = min(outmaxs[2], lightmaxs[2]); - - *outnumclusterspointer = outnumclusters; - *outnumsurfacespointer = outnumsurfaces; -} - -void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist) -{ - model_t *model = ent->model; - vec3_t lightmins, lightmaxs; - msurface_t *surface; - int surfacelistindex; - if (r_drawcollisionbrushes.integer < 2) - { - lightmins[0] = relativelightorigin[0] - lightradius; - lightmins[1] = relativelightorigin[1] - lightradius; - lightmins[2] = relativelightorigin[2] - lightradius; - lightmaxs[0] = relativelightorigin[0] + lightradius; - lightmaxs[1] = relativelightorigin[1] + lightradius; - lightmaxs[2] = relativelightorigin[2] + lightradius; - R_Mesh_Matrix(&ent->matrix); - R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) - { - surface = model->brushq1.surfaces + surfacelist[surfacelistindex]; - R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->mesh.num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->poly_mins, surface->poly_maxs); - } - R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, lightradius + model->radius + r_shadow_projectdistance.value, numshadowmark, shadowmarklist); - } -} - -void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist) -{ - model_t *model = ent->model; - vec3_t lightmins, lightmaxs, modelorg; - msurface_t *surface; - texture_t *t; - int surfacelistindex; - if (r_drawcollisionbrushes.integer < 2) - { - lightmins[0] = relativelightorigin[0] - lightradius; - lightmins[1] = relativelightorigin[1] - lightradius; - lightmins[2] = relativelightorigin[2] - lightradius; - lightmaxs[0] = relativelightorigin[0] + lightradius; - lightmaxs[1] = relativelightorigin[1] + lightradius; - lightmaxs[2] = relativelightorigin[2] + lightradius; - R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); - R_UpdateTextureInfo(ent); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) - { - surface = model->brushq1.surfaces + surfacelist[surfacelistindex]; - if (r_shadow_compilingrtlight) - { - // if compiling an rtlight, capture the mesh - t = surface->texinfo->texture; - if (t->flags & SURF_LIGHTMAP && t->skin.fog == NULL) - Mod_ShadowMesh_AddMesh(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_light, surface->texinfo->texture->skin.base, surface->texinfo->texture->skin.gloss, surface->texinfo->texture->skin.nmap, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, surface->mesh.num_triangles, surface->mesh.data_element3i); - } - else if (ent != r_refdef.worldentity || ent->model->brushq1.surfacevisframes[surface - ent->model->brushq1.surfaces] == r_framecount) - { - t = surface->texinfo->texture->currentframe; - // FIXME: transparent surfaces need to be lit later - if (t->flags & SURF_LIGHTMAP && t->rendertype == SURFRENDER_OPAQUE) - R_Shadow_RenderLighting(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, t->skin.gloss, lightcubemap, ambientscale, diffusescale, specularscale); - } - } - } -} - -void R_DrawCollisionBrush(colbrushf_t *brush) -{ - int i; - rmeshstate_t m; - memset(&m, 0, sizeof(m)); - m.pointer_vertex = brush->points->v; - R_Mesh_State(&m); - i = (int)(((size_t)brush) / sizeof(colbrushf_t)); - GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f); - GL_LockArrays(0, brush->numpoints); - R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements); - GL_LockArrays(0, 0); -} - -void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3msurface_t *face) -{ - int i; - rmeshstate_t m; - if (!face->mesh.num_collisiontriangles) - return; - memset(&m, 0, sizeof(m)); - m.pointer_vertex = face->mesh.data_collisionvertex3f; - R_Mesh_State(&m); - i = (int)(((size_t)face) / sizeof(q3msurface_t)); - GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f); - GL_LockArrays(0, face->mesh.num_collisionvertices); - R_Mesh_Draw(face->mesh.num_collisionvertices, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i); - GL_LockArrays(0, 0); -} - -void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber) -{ - const entity_render_t *ent = voident; - q3msurface_t *face = ent->model->brushq3.data_faces + facenumber; - rmeshstate_t m; - R_Mesh_Matrix(&ent->matrix); - memset(&m, 0, sizeof(m)); - if ((ent->effects & EF_ADDITIVE) || (face->texture->textureflags & Q3TEXTUREFLAG_ADDITIVE)) - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - else - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthMask(false); - GL_DepthTest(!(ent->effects & EF_NODEPTHTEST)); - m.tex[0] = R_GetTexture(face->texture->skin.base); - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - // LordHavoc: quake3 was not able to do this; lit transparent surfaces - if (gl_combine.integer) - { - m.texrgbscale[0] = 2; - if (r_textureunits.integer >= 2) - { - m.tex[1] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[1] = face->mesh.data_texcoordlightmap2f; - GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], ent->alpha); - } - else - { - if (ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1 && ent->alpha == 1) - m.pointer_color = face->mesh.data_lightmapcolor4f; - else - { - int i; - for (i = 0;i < face->mesh.num_vertices;i++) - { - varray_color4f[i*4+0] = face->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0]; - varray_color4f[i*4+1] = face->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1]; - varray_color4f[i*4+2] = face->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2]; - varray_color4f[i*4+3] = face->mesh.data_lightmapcolor4f[i*4+3] * ent->alpha; - } - m.pointer_color = varray_color4f; - } - } - } - else - { - int i; - for (i = 0;i < face->mesh.num_vertices;i++) - { - varray_color4f[i*4+0] = face->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0] * 2.0f; - varray_color4f[i*4+1] = face->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1] * 2.0f; - varray_color4f[i*4+2] = face->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2] * 2.0f; - varray_color4f[i*4+3] = face->mesh.data_lightmapcolor4f[i*4+3] * ent->alpha; - } - m.pointer_color = varray_color4f; - } - if (face->texture->textureflags & (Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) - { - int i, j; - float center[3], center2[3], forward[3], right[3], up[3], v[4][3]; - matrix4x4_t matrix1, imatrix1; - R_Mesh_Matrix(&r_identitymatrix); - // a single autosprite surface can contain multiple sprites... - for (j = 0;j < face->mesh.num_vertices - 3;j += 4) - { - VectorClear(center); - for (i = 0;i < 4;i++) - VectorAdd(center, face->mesh.data_vertex3f + (j+i) * 3, center); - VectorScale(center, 0.25f, center); - Matrix4x4_Transform(&ent->matrix, center, center2); - // FIXME: calculate vectors from triangle edges instead of using texture vectors as an easy way out? - Matrix4x4_FromVectors(&matrix1, face->mesh.data_normal3f + j*3, face->mesh.data_svector3f + j*3, face->mesh.data_tvector3f + j*3, center); - Matrix4x4_Invert_Simple(&imatrix1, &matrix1); - for (i = 0;i < 4;i++) - Matrix4x4_Transform(&imatrix1, face->mesh.data_vertex3f + (j+i)*3, v[i]); - if (face->texture->textureflags & Q3TEXTUREFLAG_AUTOSPRITE2) - { - forward[0] = r_vieworigin[0] - center2[0]; - forward[1] = r_vieworigin[1] - center2[1]; - forward[2] = 0; - VectorNormalize(forward); - right[0] = forward[1]; - right[1] = -forward[0]; - right[2] = 0; - up[0] = 0; - up[1] = 0; - up[2] = 1; - } - else - { - VectorCopy(r_viewforward, forward); - VectorCopy(r_viewright, right); - VectorCopy(r_viewup, up); - } - for (i = 0;i < 4;i++) - VectorMAMAMAM(1, center2, v[i][0], forward, v[i][1], right, v[i][2], up, varray_vertex3f + (i+j) * 3); - } - m.pointer_vertex = varray_vertex3f; - } - else - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - if (face->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglDisable(GL_CULL_FACE); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - if (face->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglEnable(GL_CULL_FACE); -} - -void R_Q3BSP_DrawFaceList(entity_render_t *ent, q3mtexture_t *t, int texturenumfaces, q3msurface_t **texturefacelist) -{ - int i, texturefaceindex; - rmeshstate_t m; - if (!texturenumfaces) - return; - c_faces += texturenumfaces; - // gl_lightmaps debugging mode skips normal texturing - if (gl_lightmaps.integer) - { - GL_DepthMask(true); - GL_DepthTest(true); - GL_BlendFunc(GL_ONE, GL_ZERO); - qglDisable(GL_CULL_FACE); - memset(&m, 0, sizeof(m)); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.tex[0] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[0] = face->mesh.data_texcoordlightmap2f; - if (face->lightmaptexture) - { - GL_Color(1, 1, 1, 1); - m.pointer_color = NULL; - } - else - m.pointer_color = face->mesh.data_lightmapcolor4f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - qglEnable(GL_CULL_FACE); - return; - } - // transparent surfaces get sorted for later drawing - if ((t->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE)) - { - vec3_t facecenter, center; - // drawing sky transparently would be too difficult - if (t->surfaceparms & Q3SURFACEPARM_SKY) - return; - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f; - facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f; - facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f; - Matrix4x4_Transform(&ent->matrix, facecenter, center); - R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces); - } - return; - } - // sky surfaces draw sky if needed and render themselves as a depth mask - if (t->surfaceparms & Q3SURFACEPARM_SKY) - { - if (skyrendernow) - { - skyrendernow = false; - if (skyrendermasked) - R_Sky(); - } - if (!r_q3bsp_renderskydepth.integer) - return; - - R_Mesh_Matrix(&ent->matrix); - - GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1); - if (skyrendermasked) - { - // depth-only (masking) - GL_ColorMask(0,0,0,0); - // just to make sure that braindead drivers don't draw anything - // despite that colormask... - GL_BlendFunc(GL_ZERO, GL_ONE); - } - else - { - // fog sky - GL_BlendFunc(GL_ONE, GL_ZERO); - } - GL_DepthMask(true); - GL_DepthTest(true); - - memset(&m, 0, sizeof(m)); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); - return; - } - // anything else is a typical wall, lightmap * texture + glow - qboolean dolightmap = (ent->flags & RENDER_LIGHT); - qboolean dobase = true; - qboolean doambient = r_ambient.value > 0; - qboolean doglow = t->skin.glow != NULL; - qboolean dofog = fogenabled; - if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglDisable(GL_CULL_FACE); - if (!dolightmap && dobase) - { - dolightmap = false; - dobase = false; - GL_DepthMask(true); - GL_DepthTest(true); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_Color(ent->colormod[0], ent->colormod[1], ent->colormod[2], 1); - if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglDisable(GL_CULL_FACE); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.base); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (r_lightmapintensity <= 0 && dolightmap && dobase) - { - dolightmap = false; - dobase = false; - GL_DepthMask(true); - GL_DepthTest(true); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_Color(0, 0, 0, 1); - memset(&m, 0, sizeof(m)); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + for (i = 0;i < model->brushq1.light_styles;i++) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); + if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]]) + { + model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]]; + if ((surfacechain = model->brushq1.light_styleupdatechains[i])) + for (;(surface = *surfacechain);surfacechain++) + surface->cached_dlight = true; + } } } - if (r_textureunits.integer >= 2 && gl_combine.integer && dolightmap && dobase) + + R_UpdateAllTextureInfo(ent); + flagsmask = skysurfaces ? MATERIALFLAG_SKY : (MATERIALFLAG_WATER | MATERIALFLAG_WALL); + f = 0; + t = NULL; + texture = NULL; + numsurfacelist = 0; + if (ent == r_refdef.worldentity) { - // dualtexture combine - dolightmap = false; - dobase = false; - GL_DepthMask(true); - GL_DepthTest(true); - GL_BlendFunc(GL_ONE, GL_ZERO); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.base); - GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1); - m.pointer_color = NULL; - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + for (i = 0, j = model->firstmodelsurface, surface = model->brush.data_surfaces + j;i < model->nummodelsurfaces;i++, j++, surface++) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - if (!face->lightmaptexture) + if (!r_worldsurfacevisible[j]) continue; - m.tex[1] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = face->mesh.data_texcoordlightmap2f; - m.texrgbscale[1] = 2; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - if (r_lightmapintensity == 1 && ent->colormod[0] == 1 && ent->colormod[1] == 1 && ent->colormod[2] == 1) - { - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + if (t != surface->texture) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - if (face->lightmaptexture) - continue; - m.tex[1] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = face->mesh.data_texcoordlightmap2f; - m.texrgbscale[1] = 2; - m.pointer_color = face->mesh.data_lightmapcolor4f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); + if (numsurfacelist) + { + R_QueueSurfaceList(ent, texture, numsurfacelist, surfacelist, modelorg); + numsurfacelist = 0; + } + t = surface->texture; + f = t->currentmaterialflags & flagsmask; + texture = t->currentframe; } - } - else - { - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + if (f && surface->num_triangles) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - if (face->lightmaptexture) - continue; - m.tex[1] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_texcoord[1] = face->mesh.data_texcoordlightmap2f; - m.texrgbscale[1] = 2; - m.pointer_color = varray_color4f; - for (i = 0;i < face->mesh.num_vertices;i++) + // if lightmap parameters changed, rebuild lightmap texture + if (surface->cached_dlight && surface->lightmapinfo->samples) + R_BuildLightMap(ent, surface); + // add face to draw list + surfacelist[numsurfacelist++] = surface; + if (numsurfacelist >= maxsurfacelist) { - varray_color4f[i*4+0] = face->mesh.data_lightmapcolor4f[i*4+0] * ent->colormod[0] * r_lightmapintensity; - varray_color4f[i*4+1] = face->mesh.data_lightmapcolor4f[i*4+1] * ent->colormod[1] * r_lightmapintensity; - varray_color4f[i*4+2] = face->mesh.data_lightmapcolor4f[i*4+2] * ent->colormod[2] * r_lightmapintensity; - varray_color4f[i*4+3] = face->mesh.data_lightmapcolor4f[i*4+3]; + R_QueueSurfaceList(ent, texture, numsurfacelist, surfacelist, modelorg); + numsurfacelist = 0; } - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); } } } - // single texture - if (dolightmap) - { - GL_DepthMask(true); - GL_DepthTest(true); - GL_BlendFunc(GL_ONE, GL_ZERO); - memset(&m, 0, sizeof(m)); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.tex[0] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[0] = face->mesh.data_texcoordlightmap2f; - if (face->lightmaptexture) - m.pointer_color = NULL; - else - m.pointer_color = face->mesh.data_lightmapcolor4f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (dobase) - { - GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); - GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(r_lightmapintensity * ent->colormod[0], r_lightmapintensity * ent->colormod[1], r_lightmapintensity * ent->colormod[2], 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.base); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } - } - if (doambient) + else { - GL_BlendFunc(GL_ONE, GL_ONE); - GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(r_ambient.value * (1.0f / 128.0f) * ent->colormod[0], r_ambient.value * (1.0f / 128.0f) * ent->colormod[1], r_ambient.value * (1.0f / 128.0f) * ent->colormod[2], 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.base); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + for (i = 0, j = model->firstmodelsurface, surface = model->brush.data_surfaces + j;i < model->nummodelsurfaces;i++, j++, surface++) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); + if (t != surface->texture) + { + if (numsurfacelist) + { + R_QueueSurfaceList(ent, texture, numsurfacelist, surfacelist, modelorg); + numsurfacelist = 0; + } + t = surface->texture; + f = t->currentmaterialflags & flagsmask; + texture = t->currentframe; + } + if (f && surface->num_triangles) + { + // if lightmap parameters changed, rebuild lightmap texture + if (surface->cached_dlight && surface->lightmapinfo->samples) + R_BuildLightMap(ent, surface); + // add face to draw list + surfacelist[numsurfacelist++] = surface; + if (numsurfacelist >= maxsurfacelist) + { + R_QueueSurfaceList(ent, texture, numsurfacelist, surfacelist, modelorg); + numsurfacelist = 0; + } + } } } - if (doglow) + if (numsurfacelist) + R_QueueSurfaceList(ent, texture, numsurfacelist, surfacelist, modelorg); +} + +static void R_DrawPortal_Callback(const void *calldata1, int calldata2) +{ + int i; + float *v; + rmeshstate_t m; + const mportal_t *portal = calldata1; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + GL_DepthTest(true); + R_Mesh_Matrix(&r_identitymatrix); + + memset(&m, 0, sizeof(m)); + m.pointer_vertex = varray_vertex3f; + R_Mesh_State(&m); + + i = calldata2; + GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f), + ((i & 0x0038) >> 3) * (1.0f / 7.0f), + ((i & 0x01C0) >> 6) * (1.0f / 7.0f), + 0.125f); + if (PlaneDiff(r_vieworigin, (&portal->plane)) < 0) { - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.glow); - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) - { - q3msurface_t *face = texturefacelist[texturefaceindex]; - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); - } + for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3) + VectorCopy(portal->points[i].position, v); } - if (dofog) + else + for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3) + VectorCopy(portal->points[i].position, v); + GL_LockArrays(0, portal->numpoints); + R_Mesh_Draw(0, portal->numpoints, portal->numpoints - 2, polygonelements); + GL_LockArrays(0, 0); +} + +// LordHavoc: this is just a nice debugging tool, very slow +static void R_DrawPortals(void) +{ + int i, leafnum;//, portalnum; + mportal_t *portal; + float center[3], f; + model_t *model = r_refdef.worldmodel; + if (model == NULL) + return; + for (leafnum = 0;leafnum < r_refdef.worldmodel->brush.num_leafs;leafnum++) { - float modelorg[3]; - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_DepthMask(false); - GL_DepthTest(true); - GL_Color(1, 1, 1, 1); - memset(&m, 0, sizeof(m)); - m.tex[0] = R_GetTexture(t->skin.fog); - m.pointer_color = varray_color4f; - for (texturefaceindex = 0;texturefaceindex < texturenumfaces;texturefaceindex++) + if (r_worldleafvisible[leafnum]) { - q3msurface_t *face = texturefacelist[texturefaceindex]; - if (m.tex[0]) - m.pointer_texcoord[0] = face->mesh.data_texcoordtexture2f; - m.pointer_vertex = face->mesh.data_vertex3f; - R_Mesh_State(&m); - RSurf_FogPassColors_Vertex3f_Color4f(face->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, face->mesh.num_vertices, modelorg); - GL_LockArrays(0, face->mesh.num_vertices); - R_Mesh_Draw(face->mesh.num_vertices, face->mesh.num_triangles, face->mesh.data_element3i); - GL_LockArrays(0, 0); + //for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++) + for (portal = r_refdef.worldmodel->brush.data_leafs[leafnum].portals;portal;portal = portal->next) + { + if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) + if (!R_CullBox(portal->mins, portal->maxs)) + { + VectorClear(center); + for (i = 0;i < portal->numpoints;i++) + VectorAdd(center, portal->points[i].position, center); + f = ixtable[portal->numpoints]; + VectorScale(center, f, center); + //R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, portal, portalnum); + R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, portal, leafnum); + } + } } } - if (t->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglEnable(GL_CULL_FACE); } -void R_Q3BSP_DrawFaces(entity_render_t *ent, int skyfaces) +static void R_DrawCollisionBrush(colbrushf_t *brush) { - int i, ti, flagsmask, flags; - q3msurface_t *face; - model_t *model; - q3mtexture_t *t; - const int maxfaces = 1024; - int numfaces = 0; - q3msurface_t *facelist[1024]; - R_Mesh_Matrix(&ent->matrix); - model = ent->model; - flagsmask = Q3SURFACEFLAG_NODRAW | Q3SURFACEFLAG_SKY; - if (skyfaces) - flags = Q3SURFACEFLAG_SKY; - else - flags = 0; - if (ent == r_refdef.worldentity) + int i; + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + m.pointer_vertex = brush->points->v; + R_Mesh_State(&m); + i = (int)(((size_t)brush) / sizeof(colbrushf_t)); + GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f); + GL_LockArrays(0, brush->numpoints); + R_Mesh_Draw(0, brush->numpoints, brush->numtriangles, brush->elements); + GL_LockArrays(0, 0); +} + +static void R_DrawCollisionSurface(entity_render_t *ent, msurface_t *surface) +{ + int i; + rmeshstate_t m; + if (!surface->num_collisiontriangles) + return; + memset(&m, 0, sizeof(m)); + m.pointer_vertex = surface->data_collisionvertex3f; + R_Mesh_State(&m); + i = (int)(((size_t)surface) / sizeof(msurface_t)); + GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f); + GL_LockArrays(0, surface->num_collisionvertices); + R_Mesh_Draw(0, surface->num_collisionvertices, surface->num_collisiontriangles, surface->data_collisionelement3i); + GL_LockArrays(0, 0); +} + +void R_WorldVisibility(void) +{ + int i, j, *mark; + mleaf_t *leaf; + mleaf_t *viewleaf; + model_t *model = r_refdef.worldmodel; + + if (!model) + return; + + // if possible find the leaf the view origin is in + viewleaf = model->brushq1.PointInLeaf ? model->brushq1.PointInLeaf(model, r_vieworigin) : NULL; + // if possible fetch the visible cluster bits + if (model->brush.FatPVS) + model->brush.FatPVS(model, r_vieworigin, 2, r_pvsbits, sizeof(r_pvsbits)); + + // clear the visible surface and leaf flags arrays + memset(r_worldsurfacevisible, 0, model->brush.num_surfaces); + memset(r_worldleafvisible, 0, model->brush.num_leafs); + + // if the user prefers surfaceworldnode (testing?) or the viewleaf could + // not be found, or the viewleaf is not part of the visible world + // (floating around in the void), use the pvs method + if (r_surfaceworldnode.integer || !viewleaf || viewleaf->clusterindex < 0) { - int j; - q3mleaf_t *leaf; - R_Surf_ClearSurfaceVisible(r_refdef.worldmodel->brushq3.num_faces); - for (j = 0, leaf = r_refdef.worldmodel->brushq3.data_leafs;j < r_refdef.worldmodel->brushq3.num_leafs;j++, leaf++) + // pvs method: + // similar to quake's RecursiveWorldNode but without cache misses + for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++) { + // if leaf is in current pvs and on the screen, mark its surfaces if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs)) { c_leafs++; - for (i = 0;i < leaf->numleaffaces;i++) - r_surf_surfacevisible[leaf->firstleaffacenum[i]] = 1; - } - } - for (ti = 0, t = model->brushq3.data_textures;ti < model->brushq3.num_textures;ti++, t++) - { - if ((t->surfaceflags & flagsmask) == flags) - { - numfaces = 0; - for (i = 0;i < t->numfaces;i++) - { - if (r_surf_surfacevisible[t->facenumlist[i]]) - { - face = t->facelist[i]; - //if (!R_CullBox(face->mins, face->maxs)) - if (face->mesh.num_triangles) - { - if (numfaces >= maxfaces) - { - if (numfaces) - R_Q3BSP_DrawFaceList(ent, t, numfaces, facelist); - numfaces = 0; - } - facelist[numfaces++] = face; - } - } - } - if (numfaces) - R_Q3BSP_DrawFaceList(ent, t, numfaces, facelist); + r_worldleafvisible[j] = true; + if (leaf->numleafsurfaces) + for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++) + r_worldsurfacevisible[*mark] = true; } } } else { - t = NULL; - numfaces = 0; - for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) + int leafstackpos; + mportal_t *p; + mleaf_t *leafstack[8192]; + // portal method: + // follows portals leading outward from viewleaf, does not venture + // offscreen or into leafs that are not visible, faster than Quake's + // RecursiveWorldNode and vastly better in unvised maps, often culls a + // lot of surface that pvs alone would miss + leafstack[0] = viewleaf; + leafstackpos = 1; + while (leafstackpos) { - if ((face->texture->surfaceflags & flagsmask) == flags && face->mesh.num_triangles) - { - if (t != face->texture || numfaces >= maxfaces) - { - if (numfaces) - R_Q3BSP_DrawFaceList(ent, t, numfaces, facelist); - numfaces = 0; - t = face->texture; - } - facelist[numfaces++] = face; - } + c_leafs++; + leaf = leafstack[--leafstackpos]; + r_worldleafvisible[leaf - model->brush.data_leafs] = true; + // mark any surfaces bounding this leaf + if (leaf->numleafsurfaces) + for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++) + r_worldsurfacevisible[*mark] = true; + // follow portals into other leafs + // the checks are: + // if viewer is behind portal (portal faces outward into the scene) + // and the portal polygon's bounding box is on the screen + // and the leaf has not been visited yet + // and the leaf is visible in the pvs + // (the first two checks won't cause as many cache misses as the leaf checks) + for (p = leaf->portals;p;p = p->next) + if (DotProduct(r_vieworigin, p->plane.normal) < (p->plane.dist + 1) && !R_CullBox(p->mins, p->maxs) && !r_worldleafvisible[p->past - model->brush.data_leafs] && CHECKPVSBIT(r_pvsbits, p->past->clusterindex)) + leafstack[leafstackpos++] = p->past; } - if (numfaces) - R_Q3BSP_DrawFaceList(ent, t, numfaces, facelist); } + + if (r_drawportals.integer) + R_DrawPortals(); } -void R_Q3BSP_DrawSky(entity_render_t *ent) +void R_Q1BSP_DrawSky(entity_render_t *ent) { + if (ent->model == NULL) + return; if (r_drawcollisionbrushes.integer < 2) - R_Q3BSP_DrawFaces(ent, true); + R_DrawSurfaces(ent, true); } -void R_Q3BSP_Draw(entity_render_t *ent) +void R_Q1BSP_Draw(entity_render_t *ent) { + if (ent->model == NULL) + return; + c_bmodels++; if (r_drawcollisionbrushes.integer < 2) - R_Q3BSP_DrawFaces(ent, false); - if (r_drawcollisionbrushes.integer >= 1) + R_DrawSurfaces(ent, false); + if (r_drawcollisionbrushes.integer >= 1 && ent->model->brush.num_brushes) { int i; model_t *model = ent->model; - q3msurface_t *face; + msurface_t *surface; + q3mbrush_t *brush; GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); GL_DepthTest(true); qglPolygonOffset(r_drawcollisionbrushes_polygonfactor.value, r_drawcollisionbrushes_polygonoffset.value); - for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++) - if (model->brushq3.data_thismodel->firstbrush[i].colbrushf && model->brushq3.data_thismodel->firstbrush[i].colbrushf->numtriangles) - R_DrawCollisionBrush(model->brushq3.data_thismodel->firstbrush[i].colbrushf); - for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) - if (face->mesh.num_collisiontriangles) - R_Q3BSP_DrawCollisionFace(ent, face); + for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++) + if (brush->colbrushf && brush->colbrushf->numtriangles) + R_DrawCollisionBrush(brush->colbrushf); + for (i = 0, surface = model->brush.data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++) + if (surface->num_collisiontriangles) + R_DrawCollisionSurface(ent, surface); qglPolygonOffset(0, 0); } } -void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) +void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) { model_t *model = ent->model; vec3_t lightmins, lightmaxs; - int t, leafindex, marksurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0; + int t, leafindex, leafsurfaceindex, surfaceindex, triangleindex, outnumclusters = 0, outnumsurfaces = 0; const int *e; const float *v[3]; - q3msurface_t *surface; - q3mleaf_t *leaf; + msurface_t *surface; + mleaf_t *leaf; const qbyte *pvs; lightmins[0] = relativelightorigin[0] - lightradius; lightmins[1] = relativelightorigin[1] - lightradius; @@ -2216,8 +1727,9 @@ void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa pvs = model->brush.GetPVS(model, relativelightorigin); else pvs = NULL; + R_UpdateAllTextureInfo(ent); // FIXME: use BSP recursion as lights are often small - for (leafindex = 0, leaf = model->brushq3.data_leafs;leafindex < model->brushq3.num_leafs;leafindex++, leaf++) + for (leafindex = 0, leaf = model->brush.data_leafs;leafindex < model->brush.num_leafs;leafindex++, leaf++) { if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && (pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex))) { @@ -2237,42 +1749,25 @@ void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa } if (outsurfacepvs) { - for (marksurfaceindex = 0;marksurfaceindex < leaf->numleaffaces;marksurfaceindex++) + for (leafsurfaceindex = 0;leafsurfaceindex < leaf->numleafsurfaces;leafsurfaceindex++) { - surface = leaf->firstleafface[marksurfaceindex]; - surfaceindex = surface - model->brushq3.data_faces; + surfaceindex = leaf->firstleafsurface[leafsurfaceindex]; if (!CHECKPVSBIT(outsurfacepvs, surfaceindex)) { - if (BoxesOverlap(lightmins, lightmaxs, surface->mins, surface->maxs) && !(surface->texture->surfaceparms & Q3SURFACEPARM_TRANS) && !(surface->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW)) && surface->mesh.num_triangles) + surface = model->brush.data_surfaces + surfaceindex; + if (BoxesOverlap(lightmins, lightmaxs, surface->mins, surface->maxs)) + if ((surface->texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT)) == MATERIALFLAG_WALL) { - if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - { - for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3) - { - v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3; - v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3; - v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3; - if (lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) - { - SETPVSBIT(outsurfacepvs, surfaceindex); - outsurfacelist[outnumsurfaces++] = surfaceindex; - break; - } - } - } - else + for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3) { - for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->mesh.num_triangles;triangleindex++, t++, e += 3) + v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3; + v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3; + v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3; + if (lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) { - v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3; - v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3; - v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3; - if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) - { - SETPVSBIT(outsurfacepvs, surfaceindex); - outsurfacelist[outnumsurfaces++] = surfaceindex; - break; - } + SETPVSBIT(outsurfacepvs, surfaceindex); + outsurfacelist[outnumsurfaces++] = surfaceindex; + break; } } } @@ -2294,98 +1789,90 @@ void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa *outnumsurfacespointer = outnumsurfaces; } -void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist) +void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs) { model_t *model = ent->model; - vec3_t lightmins, lightmaxs; - q3msurface_t *surface; + msurface_t *surface; int surfacelistindex; if (r_drawcollisionbrushes.integer < 2) { - lightmins[0] = relativelightorigin[0] - lightradius; - lightmins[1] = relativelightorigin[1] - lightradius; - lightmins[2] = relativelightorigin[2] - lightradius; - lightmaxs[0] = relativelightorigin[0] + lightradius; - lightmaxs[1] = relativelightorigin[1] + lightradius; - lightmaxs[2] = relativelightorigin[2] + lightradius; R_Mesh_Matrix(&ent->matrix); R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles); + if (!r_shadow_compilingrtlight) + R_UpdateAllTextureInfo(ent); for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { - surface = model->brushq3.data_faces + surfacelist[surfacelistindex]; - // FIXME: check some manner of face->rendermode here? - if (!(surface->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) && !(surface->texture->surfaceparms & (Q3SURFACEPARM_SKY | Q3SURFACEPARM_TRANS)) && !(surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED)) - R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->mesh.num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs); + surface = model->brush.data_surfaces + surfacelist[surfacelistindex]; + if ((surface->texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL) + continue; + if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) + continue; + R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, lightmins, lightmaxs, surface->mins, surface->maxs); } R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, lightradius + model->radius + r_shadow_projectdistance.value, numshadowmark, shadowmarklist); } } -void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist) +void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist) { model_t *model = ent->model; - vec3_t lightmins, lightmaxs, modelorg; - q3msurface_t *surface; + msurface_t *surface; + texture_t *t; int surfacelistindex; if (r_drawcollisionbrushes.integer < 2) { - lightmins[0] = relativelightorigin[0] - lightradius; - lightmins[1] = relativelightorigin[1] - lightradius; - lightmins[2] = relativelightorigin[2] - lightradius; - lightmaxs[0] = relativelightorigin[0] + lightradius; - lightmaxs[1] = relativelightorigin[1] + lightradius; - lightmaxs[2] = relativelightorigin[2] + lightradius; R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); + if (!r_shadow_compilingrtlight) + R_UpdateAllTextureInfo(ent); for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { - surface = model->brushq3.data_faces + surfacelist[surfacelistindex]; + surface = model->brush.data_surfaces + surfacelist[surfacelistindex]; + if (surface->texture->basematerialflags & MATERIALFLAG_NODRAW || !surface->num_triangles) + continue; if (r_shadow_compilingrtlight) { // if compiling an rtlight, capture the mesh - Mod_ShadowMesh_AddMesh(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_light, surface->texture->skin.base, surface->texture->skin.gloss, surface->texture->skin.nmap, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, surface->mesh.num_triangles, surface->mesh.data_element3i); + t = surface->texture; + if ((t->basematerialflags & (MATERIALFLAG_WALL | MATERIALFLAG_TRANSPARENT)) == MATERIALFLAG_WALL) + Mod_ShadowMesh_AddMesh(r_shadow_mempool, r_shadow_compilingrtlight->static_meshchain_light, surface->texture->skin.base, surface->texture->skin.gloss, surface->texture->skin.nmap, surface->groupmesh->data_vertex3f, surface->groupmesh->data_svector3f, surface->groupmesh->data_tvector3f, surface->groupmesh->data_normal3f, surface->groupmesh->data_texcoordtexture2f, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)); } - else if (!(surface->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) && surface->mesh.num_triangles) + else if (ent != r_refdef.worldentity || r_worldsurfacevisible[surfacelist[surfacelistindex]]) { - if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglDisable(GL_CULL_FACE); - R_Shadow_RenderLighting(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i, surface->mesh.data_vertex3f, surface->mesh.data_svector3f, surface->mesh.data_tvector3f, surface->mesh.data_normal3f, surface->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, surface->texture->skin.base, surface->texture->skin.nmap, surface->texture->skin.gloss, lightcubemap, ambientscale, diffusescale, specularscale); - if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglEnable(GL_CULL_FACE); + t = surface->texture->currentframe; + // FIXME: transparent surfaces need to be lit later + if ((t->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_TRANSPARENT)) == MATERIALFLAG_WALL) + { + if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) + qglDisable(GL_CULL_FACE); + R_Shadow_RenderLighting(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle), surface->groupmesh->data_vertex3f, surface->groupmesh->data_svector3f, surface->groupmesh->data_tvector3f, surface->groupmesh->data_normal3f, surface->groupmesh->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, t->skin.gloss, lightcubemap, ambientscale, diffusescale, specularscale); + if (surface->texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) + qglEnable(GL_CULL_FACE); + } } } } } +#if 0 static void gl_surf_start(void) { - r_surf_mempool = Mem_AllocPool("gl_rsurf", 0, NULL); - r_surf_surfacevisiblelimit = 65536; - r_surf_surfacevisible = Mem_Alloc(r_surf_mempool, r_surf_surfacevisiblelimit); } static void gl_surf_shutdown(void) { - r_surf_surfacevisiblelimit = 0; - r_surf_surfacevisible = NULL; - Mem_FreePool(&r_surf_mempool); } static void gl_surf_newmap(void) { } +#endif void GL_Surf_Init(void) { - int i; - dlightdivtable[0] = 4194304; - for (i = 1;i < 32768;i++) - dlightdivtable[i] = 4194304 / (i << 7); Cvar_RegisterVariable(&r_ambient); Cvar_RegisterVariable(&r_drawportals); Cvar_RegisterVariable(&r_testvis); - Cvar_RegisterVariable(&r_floatbuildlightmap); Cvar_RegisterVariable(&r_detailtextures); Cvar_RegisterVariable(&r_surfaceworldnode); Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonfactor); @@ -2393,6 +1880,6 @@ void GL_Surf_Init(void) Cvar_RegisterVariable(&r_q3bsp_renderskydepth); Cvar_RegisterVariable(&gl_lightmaps); - R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); + //R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); }