X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=723e9fb4ce3ee2028ffcc20b6924f1e02955dedd;hp=d97098d5894530e6b6c2a67e09f9cf6d96dce704;hb=c9c011dcf7b2ee062e9493139b89fff99f63ea25;hpb=f13419f00e3f8335e9a25498560a433597f28f50 diff --git a/gl_rsurf.c b/gl_rsurf.c index d97098d5..723e9fb4 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -47,12 +47,12 @@ R_BuildLightMap Combine and scale multiple lightmaps into the 8.8 format in blocklights =============== */ -void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) +void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface, int combine) { int smax, tmax, i, size, size3, maps, l; int *bl, scale; unsigned char *lightmap, *out, *stain; - dp_model_t *model = ent->model; + model_t *model = ent->model; int *intblocklights; unsigned char *templight; @@ -131,7 +131,7 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D) Image_MakesRGBColorsFromLinear_Lightmap(templight, templight, size); - R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1); + R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1, combine); // update the surface's deluxemap if it has one if (surface->deluxemaptexture != r_texture_blanknormalmap) @@ -169,11 +169,11 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface) l = (int)(n[2] * 128 + 128);out[0] = bound(0, l, 255); out[3] = 255; } - R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1); + R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1, r_q1bsp_lightmap_updates_combine.integer); } } -static void R_StainNode (mnode_t *node, dp_model_t *model, const vec3_t origin, float radius, const float fcolor[8]) +static 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 *surface, *endsurface; @@ -300,7 +300,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int int n; float fcolor[8]; entity_render_t *ent; - dp_model_t *model; + model_t *model; vec3_t org; if (r_refdef.scene.worldmodel == NULL || !r_refdef.scene.worldmodel->brush.data_nodes || !r_refdef.scene.worldmodel->brushq1.lightdata) return; @@ -383,18 +383,18 @@ void R_DrawPortals(void) int i, leafnum; mportal_t *portal; float center[3], f; - dp_model_t *model = r_refdef.scene.worldmodel; + model_t *model = r_refdef.scene.worldmodel; if (model == NULL) return; - for (leafnum = 0;leafnum < r_refdef.scene.worldmodel->brush.num_leafs;leafnum++) + for (leafnum = 0;leafnum < model->brush.num_leafs;leafnum++) { if (r_refdef.viewcache.world_leafvisible[leafnum]) { //for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++) - for (portal = r_refdef.scene.worldmodel->brush.data_leafs[leafnum].portals;portal;portal = portal->next) + for (portal = model->brush.data_leafs[leafnum].portals;portal;portal = portal->next) { if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) - if (!R_CullBox(portal->mins, portal->maxs)) + if (!R_CullFrustum(portal->mins, portal->maxs)) { VectorClear(center); for (i = 0;i < portal->numpoints;i++) @@ -411,26 +411,22 @@ void R_DrawPortals(void) static void R_View_WorldVisibility_CullSurfaces(void) { int surfaceindex; - int surfaceindexstart; - int surfaceindexend; unsigned char *surfacevisible; msurface_t *surfaces; - dp_model_t *model = r_refdef.scene.worldmodel; + model_t *model = r_refdef.scene.worldmodel; if (!model) return; if (r_trippy.integer) return; if (r_usesurfaceculling.integer < 1) return; - surfaceindexstart = model->firstmodelsurface; - surfaceindexend = surfaceindexstart + model->nummodelsurfaces; surfaces = model->data_surfaces; surfacevisible = r_refdef.viewcache.world_surfacevisible; - for (surfaceindex = surfaceindexstart; surfaceindex < surfaceindexend; surfaceindex++) + for (surfaceindex = model->submodelsurfaces_start; surfaceindex < model->submodelsurfaces_end; surfaceindex++) { if (surfacevisible[surfaceindex]) { - if (R_CullBox(surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs) + if (R_CullFrustum(surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs) || (r_vis_trace_surfaces.integer && !R_CanSeeBox(r_vis_trace_samples.integer, r_vis_trace_eyejitter.value, r_vis_trace_enlarge.value, r_vis_trace_expand.value, r_vis_trace_pad.value, r_refdef.view.origin, surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs))) surfacevisible[surfaceindex] = 0; } @@ -442,23 +438,28 @@ void R_View_WorldVisibility(qbool forcenovis) int i, j, *mark; mleaf_t *leaf; mleaf_t *viewleaf; - dp_model_t *model = r_refdef.scene.worldmodel; + model_t *model = r_refdef.scene.worldmodel; if (!model) return; - if (r_refdef.view.usecustompvs) - { - // clear the visible surface and leaf flags arrays - memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces); + if (r_lockvisibility.integer) + return; + + // clear the visible surface and leaf flags arrays + memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces); + if(!r_lockpvs.integer) memset(r_refdef.viewcache.world_leafvisible, 0, model->brush.num_leafs); - r_refdef.viewcache.world_novis = false; + r_refdef.viewcache.world_novis = false; + + if (r_refdef.view.usecustompvs) + { // simply cull each marked leaf to the frustum (view pyramid) 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_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs)) + if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullFrustum(leaf->mins, leaf->maxs)) { r_refdef.stats[r_stat_world_leafs]++; r_refdef.viewcache.world_leafvisible[j] = true; @@ -467,23 +468,14 @@ void R_View_WorldVisibility(qbool forcenovis) r_refdef.viewcache.world_surfacevisible[*mark] = true; } } - R_View_WorldVisibility_CullSurfaces(); - return; } - - // if possible find the leaf the view origin is in - viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_refdef.view.origin) : NULL; - // if possible fetch the visible cluster bits - if (!r_lockpvs.integer && model->brush.FatPVS) - model->brush.FatPVS(model, r_refdef.view.origin, 2, r_refdef.viewcache.world_pvsbits, (r_refdef.viewcache.world_numclusters+7)>>3, false); - - if (!r_lockvisibility.integer) + else { - // clear the visible surface and leaf flags arrays - memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces); - memset(r_refdef.viewcache.world_leafvisible, 0, model->brush.num_leafs); - - r_refdef.viewcache.world_novis = false; + // if possible find the leaf the view origin is in + viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_refdef.view.origin) : NULL; + // if possible fetch the visible cluster bits + if (!r_lockpvs.integer && model->brush.FatPVS) + model->brush.FatPVS(model, r_refdef.view.origin, 2, r_refdef.viewcache.world_pvsbits, (r_refdef.viewcache.world_numclusters+7)>>3, false); // if floating around in the void (no pvs data available, and no // portals available), simply use all on-screen leafs. @@ -498,7 +490,7 @@ void R_View_WorldVisibility(qbool forcenovis) if (leaf->clusterindex < 0) continue; // if leaf is in current pvs and on the screen, mark its surfaces - if (!R_CullBox(leaf->mins, leaf->maxs)) + if (!R_CullFrustum(leaf->mins, leaf->maxs)) { r_refdef.stats[r_stat_world_leafs]++; r_refdef.viewcache.world_leafvisible[j] = true; @@ -521,7 +513,7 @@ void R_View_WorldVisibility(qbool forcenovis) if (leaf->clusterindex < 0) continue; // if leaf is in current pvs and on the screen, mark its surfaces - if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs)) + if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullFrustum(leaf->mins, leaf->maxs)) { r_refdef.stats[r_stat_world_leafs]++; r_refdef.viewcache.world_leafvisible[j] = true; @@ -580,7 +572,7 @@ void R_View_WorldVisibility(qbool forcenovis) cullmaxs[0] = p->maxs[0] + cullbias; cullmaxs[1] = p->maxs[1] + cullbias; cullmaxs[2] = p->maxs[2] + cullbias; - if (R_CullBox(cullmins, cullmaxs)) + if (R_CullFrustum(cullmins, cullmaxs)) continue; if (r_vis_trace.integer) { @@ -595,8 +587,10 @@ void R_View_WorldVisibility(qbool forcenovis) } } } - R_View_WorldVisibility_CullSurfaces(); } + + // Cull the rest + R_View_WorldVisibility_CullSurfaces(); } void R_Mod_DrawSky(entity_render_t *ent) @@ -608,8 +602,8 @@ void R_Mod_DrawSky(entity_render_t *ent) void R_Mod_DrawAddWaterPlanes(entity_render_t *ent) { - int i, j, n, flagsmask; - dp_model_t *model = ent->model; + int i, n, flagsmask; + model_t *model = ent->model; msurface_t *surfaces; if (model == NULL) return; @@ -622,13 +616,10 @@ void R_Mod_DrawAddWaterPlanes(entity_render_t *ent) // add visible surfaces to draw list if (ent == r_refdef.scene.worldentity) { - for (i = 0;i < model->nummodelsurfaces;i++) - { - j = model->sortedmodelsurfaces[i]; - if (r_refdef.viewcache.world_surfacevisible[j]) - if (surfaces[j].texture->basematerialflags & flagsmask) - R_Water_AddWaterPlane(surfaces + j, 0); - } + for (i = model->submodelsurfaces_start;i < model->submodelsurfaces_end;i++) + if (r_refdef.viewcache.world_surfacevisible[i]) + if (surfaces[i].texture->basematerialflags & flagsmask) + R_Water_AddWaterPlane(surfaces + i, 0); } else { @@ -636,19 +627,16 @@ void R_Mod_DrawAddWaterPlanes(entity_render_t *ent) n = ent->entitynumber; else n = 0; - for (i = 0;i < model->nummodelsurfaces;i++) - { - j = model->sortedmodelsurfaces[i]; - if (surfaces[j].texture->basematerialflags & flagsmask) - R_Water_AddWaterPlane(surfaces + j, n); - } + for (i = model->submodelsurfaces_start;i < model->submodelsurfaces_end;i++) + if (surfaces[i].texture->basematerialflags & flagsmask) + R_Water_AddWaterPlane(surfaces + i, n); } rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity } void R_Mod_Draw(entity_render_t *ent) { - dp_model_t *model = ent->model; + model_t *model = ent->model; if (model == NULL) return; R_DrawModelSurfaces(ent, false, true, false, false, false, false); @@ -656,7 +644,7 @@ void R_Mod_Draw(entity_render_t *ent) void R_Mod_DrawDepth(entity_render_t *ent) { - dp_model_t *model = ent->model; + model_t *model = ent->model; if (model == NULL || model->surfmesh.isanimated) return; GL_ColorMask(0,0,0,0); @@ -678,7 +666,7 @@ void R_Mod_DrawDebug(entity_render_t *ent) void R_Mod_DrawPrepass(entity_render_t *ent) { - dp_model_t *model = ent->model; + model_t *model = ent->model; if (model == NULL) return; R_DrawModelSurfaces(ent, false, true, false, false, true, false); @@ -686,7 +674,7 @@ void R_Mod_DrawPrepass(entity_render_t *ent) typedef struct r_q1bsp_getlightinfo_s { - dp_model_t *model; + model_t *model; vec3_t relativelightorigin; float lightradius; int *outleaflist; @@ -764,7 +752,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo continue; #endif #if 0 - if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes)) + if (!r_shadow_compilingrtlight && R_CullBox(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes)) continue; #endif // axial planes can be processed much more quickly @@ -837,7 +825,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo continue; #endif #if 1 - if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes)) + if (!r_shadow_compilingrtlight && R_CullBox(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes)) continue; #endif @@ -1021,7 +1009,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons continue; #endif #if 1 - if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes)) + if (!r_shadow_compilingrtlight && R_CullBox(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes)) continue; #endif surfaceindex = leaf->surfaceindex; @@ -1088,7 +1076,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons continue; #endif #if 0 - if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes)) + if (!r_shadow_compilingrtlight && R_CullBox(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes)) continue; #endif if (info->lightmins[axis] <= node->backmax) @@ -1142,7 +1130,7 @@ static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboo info->outnumleafs = 0; info->outnumsurfaces = 0; memset(info->outleafpvs, 0, (info->model->brush.num_leafs + 7) >> 3); - memset(info->outsurfacepvs, 0, (info->model->nummodelsurfaces + 7) >> 3); + memset(info->outsurfacepvs, 0, (info->model->num_surfaces + 7) >> 3); memset(info->outshadowtrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3); memset(info->outlighttrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3); } @@ -1248,7 +1236,7 @@ void R_Mod_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float VectorCopy(info.relativelightorigin, info.outmaxs); memset(visitingleafpvs, 0, (info.model->brush.num_leafs + 7) >> 3); memset(outleafpvs, 0, (info.model->brush.num_leafs + 7) >> 3); - memset(outsurfacepvs, 0, (info.model->nummodelsurfaces + 7) >> 3); + memset(outsurfacepvs, 0, (info.model->num_surfaces + 7) >> 3); memset(outshadowtrispvs, 0, (info.model->surfmesh.num_triangles + 7) >> 3); memset(outlighttrispvs, 0, (info.model->surfmesh.num_triangles + 7) >> 3); if (info.model->brush.GetPVS && !info.noocclusion) @@ -1297,7 +1285,7 @@ void R_Mod_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float void R_Mod_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist) { - dp_model_t *model = ent->model; + model_t *model = ent->model; msurface_t *surface; int surfacelistindex; int sidetotals[6] = { 0, 0, 0, 0, 0, 0 }, sidemasks = 0; @@ -1328,7 +1316,7 @@ static const msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES]; void R_Mod_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs) { - dp_model_t *model = ent->model; + model_t *model = ent->model; const msurface_t *surface; int modelsurfacelistindex, batchnumsurfaces; // check the box in modelspace, it was already checked in worldspace @@ -1407,7 +1395,7 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, co extern qbool r_shadow_usingdeferredprepass; void R_Mod_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs) { - dp_model_t *model = ent->model; + model_t *model = ent->model; const msurface_t *surface; int i, k, kend, l, endsurface, batchnumsurfaces, texturenumsurfaces; const msurface_t **texturesurfacelist; @@ -1491,7 +1479,7 @@ void R_Mod_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfaceli //Made by [515] static void R_ReplaceWorldTexture_f(cmd_state_t *cmd) { - dp_model_t *m; + model_t *m; texture_t *t; int i; const char *r, *newt; @@ -1540,7 +1528,7 @@ static void R_ReplaceWorldTexture_f(cmd_state_t *cmd) //Made by [515] static void R_ListWorldTextures_f(cmd_state_t *cmd) { - dp_model_t *m; + model_t *m; texture_t *t; int i; if (!r_refdef.scene.worldmodel)