X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=412536acb842739a05275b32a2240688419e093f;hb=922290ebf8e417dea08bf2e99062291ddf1e65ce;hp=826559074de1c3c1c42512e10b4976e992b1db9a;hpb=0cc298d3c03cc31166905b782f9f6545f8eee742;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 82655907..412536ac 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -27,8 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 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_surfaceworldnode = {0, "r_surfaceworldnode", "0"}; +cvar_t r_lockpvs = {0, "r_lockpvs", "0"}; +cvar_t r_lockvisibility = {0, "r_lockvisibility", "0"}; +cvar_t r_useportalculling = {0, "r_useportalculling", "1"}; cvar_t r_drawcollisionbrushes_polygonfactor = {0, "r_drawcollisionbrushes_polygonfactor", "-1"}; cvar_t r_drawcollisionbrushes_polygonoffset = {0, "r_drawcollisionbrushes_polygonoffset", "0"}; cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0"}; @@ -36,11 +37,11 @@ cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0"}; // 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]; +unsigned char r_pvsbits[(32768+7)>>3]; // TODO: dynamic resize according to r_refdef.worldmodel->brush.num_leafs -qbyte r_worldleafvisible[32768]; +unsigned char r_worldleafvisible[32768]; // TODO: dynamic resize according to r_refdef.worldmodel->num_surfaces -qbyte r_worldsurfacevisible[262144]; +unsigned char r_worldsurfacevisible[262144]; /* =============== @@ -53,9 +54,9 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) { int smax, tmax, i, j, size, size3, maps, stride, l; unsigned int *bl, scale; - qbyte *lightmap, *out, *stain; + unsigned char *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]; + static unsigned char templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; // update cached lighting info surface->cached_dlight = 0; @@ -83,7 +84,7 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) { 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++) + for (scale = r_refdef.lightstylevalue[surface->lightmapinfo->styles[maps]], i = 0;i < size3;i++) bl[i] += lightmap[i] * scale; } } @@ -131,7 +132,7 @@ void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radi float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2; msurface_t *surface, *endsurface; int i, s, t, smax, tmax, smax3, impacts, impactt, stained; - qbyte *bl; + unsigned char *bl; vec3_t impact; maxdist = radius * radius; @@ -209,9 +210,9 @@ loc0: { if (a > 1) a = 1; - bl[0] = (qbyte) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0])); - bl[1] = (qbyte) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1])); - bl[2] = (qbyte) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2])); + bl[0] = (unsigned char) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0])); + bl[1] = (unsigned char) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1])); + bl[2] = (unsigned char) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2])); stained = true; } } @@ -293,12 +294,12 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ============================================================= */ -static void R_DrawPortal_Callback(const void *calldata1, int calldata2) +static void R_DrawPortal_Callback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight) { + const mportal_t *portal = (mportal_t *)ent; int i; float *v; rmeshstate_t m; - const mportal_t *portal = (mportal_t *)calldata1; GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); GL_DepthMask(false); GL_DepthTest(true); @@ -308,7 +309,7 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2) m.pointer_vertex = varray_vertex3f; R_Mesh_State(&m); - i = calldata2; + i = surfacenumber; GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f), ((i & 0x0038) >> 3) * (1.0f / 7.0f), ((i & 0x01C0) >> 6) * (1.0f / 7.0f), @@ -329,7 +330,7 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2) // LordHavoc: this is just a nice debugging tool, very slow static void R_DrawPortals(void) { - int i, leafnum;//, portalnum; + int i, leafnum; mportal_t *portal; float center[3], f; model_t *model = r_refdef.worldmodel; @@ -350,8 +351,7 @@ static void R_DrawPortals(void) 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); + R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, (entity_render_t *)portal, leafnum, r_shadow_rtlight); } } } @@ -401,66 +401,94 @@ void R_WorldVisibility(void) // if possible find the leaf the view origin is in viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_vieworigin) : NULL; // if possible fetch the visible cluster bits - if (model->brush.FatPVS) + if (!r_lockpvs.integer && 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->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) + if (!r_lockvisibility.integer) { - // 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++) + // clear the visible surface and leaf flags arrays + memset(r_worldsurfacevisible, 0, model->num_surfaces); + memset(r_worldleafvisible, 0, model->brush.num_leafs); + + // if floating around in the void (no pvs data available, and no + // portals available), simply use all on-screen leafs. + if (!viewleaf || viewleaf->clusterindex < 0) { - // 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)) + // no visibility method: (used when floating around in the void) + // simply cull each leaf to the frustum (view pyramid) + // similar to quake's RecursiveWorldNode but without cache misses + for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++) { - renderstats.world_leafs++; - r_worldleafvisible[j] = true; - if (leaf->numleafsurfaces) - for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++) - r_worldsurfacevisible[*mark] = true; + // if leaf is in current pvs and on the screen, mark its surfaces + if (!R_CullBox(leaf->mins, leaf->maxs)) + { + renderstats.world_leafs++; + r_worldleafvisible[j] = true; + if (leaf->numleafsurfaces) + for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++) + r_worldsurfacevisible[*mark] = true; + } } } - } - else - { - 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 the user prefers to disable portal culling (testing?), simply + // use all on-screen leafs that are in the pvs. + else if (!r_useportalculling.integer) { - renderstats.world_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) + // pvs method: + // simply check if each leaf is in the Potentially Visible Set, + // and cull to frustum (view pyramid) + // similar to quake's RecursiveWorldNode but without cache misses + for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++) { - renderstats.world_portals++; - 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 leaf is in current pvs and on the screen, mark its surfaces + if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs)) + { + renderstats.world_leafs++; + r_worldleafvisible[j] = true; + if (leaf->numleafsurfaces) + for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++) + r_worldsurfacevisible[*mark] = true; + } + } + } + // otherwise use a recursive portal flow, culling each portal to + // frustum and checking if the leaf the portal leads to is in the pvs + else + { + int leafstackpos; + mportal_t *p; + mleaf_t *leafstack[8192]; + // simple-frustum 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 some surfaces that pvs alone would miss + // (such as a room in pvs that is hidden behind a wall, but the + // passage leading to the room is off-screen) + leafstack[0] = viewleaf; + leafstackpos = 1; + while (leafstackpos) + { + renderstats.world_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) + { + renderstats.world_portals++; + 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; + } } } } @@ -510,16 +538,16 @@ typedef struct r_q1bsp_getlightinfo_s vec3_t relativelightorigin; float lightradius; int *outleaflist; - qbyte *outleafpvs; + unsigned char *outleafpvs; int outnumleafs; int *outsurfacelist; - qbyte *outsurfacepvs; + unsigned char *outsurfacepvs; int outnumsurfaces; vec3_t outmins; vec3_t outmaxs; vec3_t lightmins; vec3_t lightmaxs; - const qbyte *pvs; + const unsigned char *pvs; } r_q1bsp_getlightinfo_t; @@ -529,18 +557,22 @@ void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node) mleaf_t *leaf; for (;;) { - if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs)) - return; - if (!node->plane) + mplane_t *plane = node->plane; + //if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs)) + // return; + if (!plane) break; - sides = BoxOnPlaneSide(info->lightmins, info->lightmaxs, node->plane) - 1; - if (sides == 2) + if (plane->type < 3) + sides = ((info->lightmaxs[plane->type] >= plane->dist) | ((info->lightmins[plane->type] < plane->dist) << 1)); + else + sides = BoxOnPlaneSide(info->lightmins, info->lightmaxs, plane); + if (sides == 3) { R_Q1BSP_RecursiveGetLightInfo(info, node->children[0]); node = node->children[1]; } else - node = node->children[sides]; + node = node->children[sides - 1]; } leaf = (mleaf_t *)node; if (info->pvs == NULL || CHECKPVSBIT(info->pvs, leaf->clusterindex)) @@ -570,7 +602,6 @@ void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node) { msurface_t *surface = info->model->data_surfaces + surfaceindex; if (BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs)) - if ((surface->texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT)) == MATERIALFLAG_WALL) { int triangleindex, t; const int *e; @@ -594,7 +625,7 @@ void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node) } } -void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, qbyte *outleafpvs, int *outnumleafspointer, 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 *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer) { r_q1bsp_getlightinfo_t info; VectorCopy(relativelightorigin, info.relativelightorigin); @@ -672,7 +703,7 @@ void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigi texture = surface->texture; if ((texture->basematerialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL) continue; - if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) + if ((texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) || (ent->flags & RENDER_NOCULLFACE)) continue; R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, surface->mins, surface->maxs); } @@ -709,7 +740,7 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, texture = surface->texture->currentframe; if ((texture->currentmaterialflags & (MATERIALFLAG_NODRAW | MATERIALFLAG_TRANSPARENT | MATERIALFLAG_WALL)) != MATERIALFLAG_WALL) continue; - if (texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) + if ((texture->textureflags & (Q3TEXTUREFLAG_TWOSIDED | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2)) || (ent->flags & RENDER_NOCULLFACE)) 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); } @@ -735,9 +766,23 @@ void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, } } +static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight) +{ + msurface_t *surface = ent->model->data_surfaces + surfacenumber; + texture_t *texture = surface->texture; + R_UpdateTextureInfo(ent, texture); + texture = texture->currentframe; + R_Shadow_RenderMode_Begin(); + R_Shadow_RenderMode_ActiveLight((rtlight_t *)rtlight); + R_Shadow_RenderMode_Lighting(false, true); + R_Shadow_SetupEntityLight(ent); + R_Shadow_RenderSurfacesLighting(ent, texture, 1, &surface); + R_Shadow_RenderMode_End(); +} + #define RSURF_MAX_BATCHSURFACES 1024 -void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolorbase, float *lightcolorpants, float *lightcolorshirt, int numsurfaces, const int *surfacelist) +void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist) { model_t *model = ent->model; msurface_t *surface; @@ -746,14 +791,9 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolorbase, float *light msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES]; vec3_t modelorg; texture_t *tex; - rtexture_t *basetexture = NULL; - rtexture_t *glosstexture = NULL; - float specularscale = 0; qboolean skip; if (r_drawcollisionbrushes.integer >= 2) return; - if (VectorLength2(lightcolorbase) + VectorLength2(lightcolorpants) + VectorLength2(lightcolorshirt) < 0.0001) - return; R_UpdateAllTextureInfo(ent); Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); tex = NULL; @@ -770,46 +810,50 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolorbase, float *light { if (batchnumsurfaces > 0) { - R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, glosstexture, specularscale, modelorg); + if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT) + { + int batchsurfaceindex; + for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++) + { + msurface_t *batchsurface = batchsurfacelist[batchsurfaceindex]; + vec3_t tempcenter, center; + tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f; + tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f; + tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f; + Matrix4x4_Transform(&ent->matrix, tempcenter, center); + R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - ent->model->data_surfaces, r_shadow_rtlight); + } + } + else + R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist); batchnumsurfaces = 0; } tex = surface->texture; texture = surface->texture->currentframe; - // FIXME: transparent surfaces need to be lit later - skip = (texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_TRANSPARENT)) != MATERIALFLAG_WALL; + skip = (texture->currentmaterialflags & MATERIALFLAG_SKY) != 0; if (skip) continue; - if (texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) - qglDisable(GL_CULL_FACE); - else - qglEnable(GL_CULL_FACE); - glosstexture = r_texture_black; - specularscale = 0; - if (texture->skin.gloss) - { - if (r_shadow_gloss.integer >= 1 && r_shadow_glossintensity.value > 0 && r_shadow_rtlight->specularscale > 0) - { - glosstexture = texture->skin.gloss; - specularscale = r_shadow_rtlight->specularscale * r_shadow_glossintensity.value; - } - } - else - { - if (r_shadow_gloss.integer >= 2 && r_shadow_gloss2intensity.value > 0 && r_shadow_glossintensity.value > 0 && r_shadow_rtlight->specularscale > 0) - { - glosstexture = r_texture_white; - specularscale = r_shadow_rtlight->specularscale * r_shadow_gloss2intensity.value; - } - } - basetexture = (ent->colormap < 0 && texture->skin.merged) ? texture->skin.merged : texture->skin.base; - if ((r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * (VectorLength2(lightcolorbase) + VectorLength2(lightcolorpants) + VectorLength2(lightcolorshirt)) + specularscale * VectorLength2(lightcolorbase) < (1.0f / 1048576.0f)) - skip = true; } if (!skip && surface->num_triangles) { if (batchnumsurfaces == RSURF_MAX_BATCHSURFACES) { - R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, glosstexture, specularscale, modelorg); + if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT) + { + int batchsurfaceindex; + for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++) + { + msurface_t *batchsurface = batchsurfacelist[batchsurfaceindex]; + vec3_t tempcenter, center; + tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f; + tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f; + tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f; + Matrix4x4_Transform(&ent->matrix, tempcenter, center); + R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - ent->model->data_surfaces, r_shadow_rtlight); + } + } + else + R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist); batchnumsurfaces = 0; } batchsurfacelist[batchnumsurfaces++] = surface; @@ -817,12 +861,69 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolorbase, float *light } if (batchnumsurfaces > 0) { - R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, glosstexture, specularscale, modelorg); + R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist); batchnumsurfaces = 0; } qglEnable(GL_CULL_FACE); } +//Made by [515] +void R_ReplaceWorldTexture (void) +{ + model_t *m; + texture_t *t; + int i; + const char *r, *newt; + m = r_refdef.worldmodel; + + if(Cmd_Argc() < 2) + { + Con_Print("r_replacemaptexture - replaces texture\n"); + Con_Print("r_replacemaptexture - switch back to default texture\n"); + return; + } + if(!cl.islocalgame || !cl.worldmodel) + { + Con_Print("This command works only in singleplayer\n"); + return; + } + r = Cmd_Argv(1); + newt = Cmd_Argv(2); + if(!newt[0]) + newt = r; + for(i=0,t=m->data_textures;inum_textures;i++,t++) + { + if(t->width && !strcasecmp(t->name, r)) + { + if(Mod_LoadSkinFrame(&t->skin, (char*)newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, r_fullbrights.integer)) + { + Con_Printf("%s replaced with %s\n", r, newt); + return; + } + else + { + Con_Printf("%s was not found\n", newt); + Mod_LoadSkinFrame(&t->skin, (char*)r, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, r_fullbrights.integer);//back to default + return; + } + } + } +} + +//Made by [515] +void R_ListWorldTextures (void) +{ + model_t *m; + texture_t *t; + int i; + m = r_refdef.worldmodel; + + Con_Print("Worldmodel textures :\n"); + for(i=0,t=m->data_textures;inum_textures;i++,t++) + if(t->skin.base != r_texture_notexture) + Con_Printf("%s\n", t->name); +} + #if 0 static void gl_surf_start(void) { @@ -842,12 +943,16 @@ void GL_Surf_Init(void) Cvar_RegisterVariable(&r_ambient); Cvar_RegisterVariable(&r_drawportals); - Cvar_RegisterVariable(&r_testvis); - Cvar_RegisterVariable(&r_surfaceworldnode); + Cvar_RegisterVariable(&r_lockpvs); + Cvar_RegisterVariable(&r_lockvisibility); + Cvar_RegisterVariable(&r_useportalculling); Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonfactor); Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonoffset); Cvar_RegisterVariable(&r_q3bsp_renderskydepth); + Cmd_AddCommand ("r_replacemaptexture", R_ReplaceWorldTexture); // By [515] + Cmd_AddCommand ("r_listmaptextures", R_ListWorldTextures); // By [515] + //R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); }