X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=portals.c;h=fdc4ecb98d114c23d2cdaf4592b4936be5ca7211;hb=7be57779a5aad5abdf281eca4a321509f64fd0b3;hp=18e17b79e29c90eb00a19dccd10fbbb770675a19;hpb=9e12e94923d6998872c0ea7312ac721b0fe4bba4;p=xonotic%2Fdarkplaces.git diff --git a/portals.c b/portals.c index 18e17b79..fdc4ecb9 100644 --- a/portals.c +++ b/portals.c @@ -135,12 +135,12 @@ int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, i { if (Portal_RecursiveFlowSearch(p->past, eye, firstclipplane + numclipplanes, newpoints)) return true; - } + } else { if (Portal_RecursiveFlowSearch(p->past, eye, firstclipplane, numclipplanes)) return true; - } + } } } } @@ -193,9 +193,9 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo portal_markid++; Mod_CheckLoaded(model); - Portal_PolygonRecursiveMarkLeafs(model->nodes, polypoints, numpoints); + Portal_PolygonRecursiveMarkLeafs(model->brushq1.nodes, polypoints, numpoints); - eyeleaf = Mod_PointInLeaf(eye, model); + eyeleaf = model->brushq1.PointInLeaf(model, eye); // find the center by averaging VectorClear(center); @@ -322,24 +322,28 @@ vec3_t trianglepoints[3]; typedef struct portalrecursioninfo_s { int exact; - float nradius; + int numfrustumplanes; + vec3_t boxmins; + vec3_t boxmaxs; qbyte *surfacemark; qbyte *leafmark; model_t *model; vec3_t eye; + float *updateleafsmins; + float *updateleafsmaxs; } portalrecursioninfo_t; void Portal_RecursiveFlow_ExactMarkSurfaces(portalrecursioninfo_t *info, int *mark, int nummarksurfaces, int firstclipplane, int numclipplanes) { int i, j, *elements; + vec3_t trimins, trimaxs; msurface_t *surf; - surfmesh_t *surfmesh; for (i = 0;i < nummarksurfaces;i++, mark++) { if (!info->surfacemark[*mark]) { - surf = info->model->surfaces + *mark; + surf = info->model->brushq1.surfaces + *mark; if (surf->poly_numverts) { if (surf->flags & SURF_PLANEBACK) @@ -357,23 +361,25 @@ void Portal_RecursiveFlow_ExactMarkSurfaces(portalrecursioninfo_t *info, int *ma } else { - for (surfmesh = surf->mesh;surfmesh;surfmesh = surfmesh->chain) + for (j = 0, elements = surf->mesh.data_element3i;j < surf->mesh.num_triangles;j++, elements += 3) { - for (j = 0, elements = surfmesh->index;j < surfmesh->numtriangles;j++, elements += 3) + VectorCopy((surf->mesh.data_vertex3f + elements[0] * 3), trianglepoints[0]); + VectorCopy((surf->mesh.data_vertex3f + elements[1] * 3), trianglepoints[1]); + VectorCopy((surf->mesh.data_vertex3f + elements[2] * 3), trianglepoints[2]); + if (PointInfrontOfTriangle(info->eye, trianglepoints[0], trianglepoints[1], trianglepoints[2])) { - VectorCopy((surfmesh->verts + elements[0] * 4), trianglepoints[0]); - VectorCopy((surfmesh->verts + elements[1] * 4), trianglepoints[1]); - VectorCopy((surfmesh->verts + elements[2] * 4), trianglepoints[2]); - if ((info->eye[0] - trianglepoints[0][0]) * ((trianglepoints[0][1] - trianglepoints[1][1]) * (trianglepoints[2][2] - trianglepoints[1][2]) - (trianglepoints[0][2] - trianglepoints[1][2]) * (trianglepoints[2][1] - trianglepoints[1][1])) - + (info->eye[1] - trianglepoints[0][1]) * ((trianglepoints[0][2] - trianglepoints[1][2]) * (trianglepoints[2][0] - trianglepoints[1][0]) - (trianglepoints[0][0] - trianglepoints[1][0]) * (trianglepoints[2][2] - trianglepoints[1][2])) - + (info->eye[2] - trianglepoints[0][2]) * ((trianglepoints[0][0] - trianglepoints[1][0]) * (trianglepoints[2][1] - trianglepoints[1][1]) - (trianglepoints[0][1] - trianglepoints[1][1]) * (trianglepoints[2][0] - trianglepoints[1][0])) > 0 - && Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, trianglepoints[0], 3, &portaltemppoints2[0][0], 256) >= 3) - break; + trimins[0] = min(trianglepoints[0][0], min(trianglepoints[1][0], trianglepoints[2][0])); + trimaxs[0] = max(trianglepoints[0][0], max(trianglepoints[1][0], trianglepoints[2][0])); + trimins[1] = min(trianglepoints[0][1], min(trianglepoints[1][1], trianglepoints[2][1])); + trimaxs[1] = max(trianglepoints[0][1], max(trianglepoints[1][1], trianglepoints[2][1])); + trimins[2] = min(trianglepoints[0][2], min(trianglepoints[1][2], trianglepoints[2][2])); + trimaxs[2] = max(trianglepoints[0][2], max(trianglepoints[1][2], trianglepoints[2][2])); + if (BoxesOverlap(trimins, trimaxs, info->boxmins, info->boxmaxs)) + if (Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, trianglepoints[0], 3, &portaltemppoints2[0][0], 256) >= 3) + break; } - if (j < surfmesh->numtriangles) - break; } - if (surfmesh == NULL) + if (j == surf->mesh.num_triangles) continue; } info->surfacemark[*mark] = true; @@ -389,8 +395,14 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first vec3_t center, v1, v2; tinyplane_t *newplanes; + for (i = 0;i < 3;i++) + { + if (info->updateleafsmins && info->updateleafsmins[i] > leaf->mins[i]) info->updateleafsmins[i] = leaf->mins[i]; + if (info->updateleafsmaxs && info->updateleafsmaxs[i] < leaf->maxs[i]) info->updateleafsmaxs[i] = leaf->maxs[i]; + } + if (info->leafmark) - info->leafmark[leaf - info->model->leafs] = true; + info->leafmark[leaf - info->model->brushq1.data_leafs] = true; // mark surfaces in leaf that can be seen through portal if (leaf->nummarksurfaces && info->surfacemark) @@ -405,9 +417,9 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first // follow portals into other leafs for (p = leaf->portals;p;p = p->next) { - // only flow through portals facing away from the viewer + // only flow through portals facing the viewer dist = PlaneDiff(info->eye, (&p->plane)); - if (dist < 0 && dist >= info->nradius) + if (dist < 0 && BoxesOverlap(p->past->mins, p->past->maxs, info->boxmins, info->boxmaxs)) { newpoints = Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, (float *) p->points, p->numpoints, &portaltemppoints2[0][0], 256); if (newpoints < 3) @@ -426,8 +438,8 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first newplanes = &portalplanes[firstclipplane + numclipplanes]; for (prev = newpoints - 1, i = 0;i < newpoints;prev = i, i++) { - VectorSubtract(info->eye, portaltemppoints2[i], v1); - VectorSubtract(portaltemppoints2[prev], portaltemppoints2[i], v2); + VectorSubtract(portaltemppoints2[prev], portaltemppoints2[i], v1); + VectorSubtract(info->eye, portaltemppoints2[i], v2); CrossProduct(v1, v2, newplanes[i].normal); VectorNormalizeFast(newplanes[i].normal); newplanes[i].dist = DotProduct(info->eye, newplanes[i].normal); @@ -446,19 +458,42 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first } } -void Portal_Visibility(model_t *model, const vec3_t eye, qbyte *leafmark, qbyte *surfacemark, const mplane_t *frustumplanes, int numfrustumplanes, int exact, float radius) +void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node) +{ + if (node->contents) + { + if (node->contents != CONTENTS_SKY && node->contents != CONTENTS_SOLID) + Portal_RecursiveFlow(info, (mleaf_t *)node, 0, info->numfrustumplanes); + } + else + { + float f = DotProduct(info->eye, node->plane->normal) - node->plane->dist; + if (f > -0.1) + Portal_RecursiveFindLeafForFlow(info, node->children[0]); + if (f < 0.1) + Portal_RecursiveFindLeafForFlow(info, node->children[1]); + } +} + +void Portal_Visibility(model_t *model, const vec3_t eye, qbyte *leafmark, qbyte *surfacemark, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs) { int i; portalrecursioninfo_t info; // if there is no model, it can not block visibility if (model == NULL) - Host_Error("Portal_Visibility: NULL model\n"); + { + Con_Print("Portal_Visibility: NULL model\n"); + return; + } Mod_CheckLoaded(model); - if (model->type != mod_brush) - Host_Error("Portal_Visibility: not a brush model\n"); + if (!model->brushq1.numportals) + { + Con_Print("Portal_Visibility: not a brush model\n"); + return; + } // put frustum planes (if any) into tinyplane format at start of buffer for (i = 0;i < numfrustumplanes;i++) @@ -470,14 +505,18 @@ void Portal_Visibility(model_t *model, const vec3_t eye, qbyte *leafmark, qbyte ranoutofportalplanes = false; ranoutofportals = false; - info.nradius = -radius; + VectorCopy(boxmins, info.boxmins); + VectorCopy(boxmaxs, info.boxmaxs); info.exact = exact; info.surfacemark = surfacemark; info.leafmark = leafmark; info.model = model; VectorCopy(eye, info.eye); + info.numfrustumplanes = numfrustumplanes; + info.updateleafsmins = updateleafsmins; + info.updateleafsmaxs = updateleafsmaxs; - Portal_RecursiveFlow(&info, Mod_PointInLeaf(eye, model), 0, numfrustumplanes); + Portal_RecursiveFindLeafForFlow(&info, model->brushq1.nodes); if (ranoutofportalplanes) Con_Printf("Portal_RecursiveFlow: ran out of %d plane stack when recursing through portals\n", MAXRECURSIVEPORTALPLANES);