X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=portals.c;h=2872a8ca89c1a3faaa1fe22ef11cc8be242a1a94;hp=05a188666935759c15be5928f95e763924b51abf;hb=85a33377d64ae8438e6582a7b8472f5a4bd41942;hpb=cf61c6c2365bf16570498041673304235ec3f155 diff --git a/portals.c b/portals.c index 05a18866..2872a8ca 100644 --- a/portals.c +++ b/portals.c @@ -1,5 +1,7 @@ #include "quakedef.h" +#include "polygon.h" +#include "portals.h" #define MAXRECURSIVEPORTALPLANES 1024 #define MAXRECURSIVEPORTALS 256 @@ -12,82 +14,28 @@ static float portaltemppoints2[256][3]; static int portal_markid = 0; static float boxpoints[4*3]; -int Portal_ClipPolygonToPlane(float *in, float *out, int inpoints, int maxoutpoints, tinyplane_t *p) +static int Portal_PortalThroughPortalPlanes(tinyplane_t *clipplanes, int clipnumplanes, float *targpoints, int targnumpoints, float *out, int maxpoints) { - int i, outpoints, prevside, side; - float *prevpoint, prevdist, dist, dot; - - if (inpoints < 3) - return inpoints; - // begin with the last point, then enter the loop with the first point as current - prevpoint = in + 3 * (inpoints - 1); - prevdist = DotProduct(prevpoint, p->normal) - p->dist; - prevside = prevdist >= 0 ? SIDE_FRONT : SIDE_BACK; - i = 0; - outpoints = 0; - goto begin; - for (;i < inpoints;i++) + int numpoints = targnumpoints, i, w; + if (numpoints < 1) + return numpoints; + if (maxpoints > 256) + maxpoints = 256; + w = 0; + memcpy(&portaltemppoints[w][0][0], targpoints, numpoints * 3 * sizeof(float)); + for (i = 0;i < clipnumplanes && numpoints > 0;i++) { - prevpoint = in; - prevdist = dist; - prevside = side; - in += 3; - -begin: - dist = DotProduct(in, p->normal) - p->dist; - side = dist >= 0 ? SIDE_FRONT : SIDE_BACK; - - if (prevside == SIDE_FRONT) - { - if (outpoints >= maxoutpoints) - return -1; - VectorCopy(prevpoint, out); - out += 3; - outpoints++; - if (side == SIDE_FRONT) - continue; - } - else if (side == SIDE_BACK) - continue; - - // generate a split point - if (outpoints >= maxoutpoints) - return -1; - dot = prevdist / (prevdist - dist); - out[0] = prevpoint[0] + dot * (in[0] - prevpoint[0]); - out[1] = prevpoint[1] + dot * (in[1] - prevpoint[1]); - out[2] = prevpoint[2] + dot * (in[2] - prevpoint[2]); - out += 3; - outpoints++; + PolygonF_Divide(numpoints, &portaltemppoints[w][0][0], clipplanes[i].normal[0], clipplanes[i].normal[1], clipplanes[i].normal[2], clipplanes[i].dist, 1.0f/32.0f, 256, &portaltemppoints[1-w][0][0], &numpoints, 0, NULL, NULL, NULL); + w = 1-w; + numpoints = min(numpoints, 256); } - - return outpoints; -} - - -int Portal_PortalThroughPortalPlanes(tinyplane_t *clipplanes, int clipnumplanes, float *targpoints, int targnumpoints, float *out, int maxpoints) -{ - int numpoints, i; - if (targnumpoints < 3) - return targnumpoints; - if (maxpoints < 3) - return -1; - numpoints = targnumpoints; - memcpy(&portaltemppoints[0][0][0], targpoints, numpoints * 3 * sizeof(float)); - for (i = 0;i < clipnumplanes;i++) - { - numpoints = Portal_ClipPolygonToPlane(&portaltemppoints[0][0][0], &portaltemppoints[1][0][0], numpoints, 256, clipplanes + i); - if (numpoints < 3) - return numpoints; - memcpy(&portaltemppoints[0][0][0], &portaltemppoints[1][0][0], numpoints * 3 * sizeof(float)); - } - if (numpoints > maxpoints) - return -1; - memcpy(out, &portaltemppoints[0][0][0], numpoints * 3 * sizeof(float)); + numpoints = min(numpoints, maxpoints); + if (numpoints > 0) + memcpy(out, &portaltemppoints[w][0][0], numpoints * 3 * sizeof(float)); return numpoints; } -int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, int numclipplanes) +static int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, int numclipplanes) { mportal_t *p; int newpoints, i, prev; @@ -123,7 +71,7 @@ int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, i VectorSubtract(eye, portaltemppoints2[i], v1); VectorSubtract(portaltemppoints2[prev], portaltemppoints2[i], v2); CrossProduct(v1, v2, newplanes[i].normal); - VectorNormalizeFast(newplanes[i].normal); + VectorNormalize(newplanes[i].normal); newplanes[i].dist = DotProduct(eye, newplanes[i].normal); if (DotProduct(newplanes[i].normal, center) <= newplanes[i].dist) { @@ -148,7 +96,7 @@ int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, i return false; } -void Portal_PolygonRecursiveMarkLeafs(mnode_t *node, float *polypoints, int numpoints) +static void Portal_PolygonRecursiveMarkLeafs(mnode_t *node, float *polypoints, int numpoints) { int i, front; float *p; @@ -180,7 +128,7 @@ loc0: goto loc0; } -int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpoints) +int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int numpoints) { int i, prev, returnvalue; mleaf_t *eyeleaf; @@ -192,7 +140,6 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo portal_markid++; - Mod_CheckLoaded(model); Portal_PolygonRecursiveMarkLeafs(model->brush.data_nodes, polypoints, numpoints); eyeleaf = model->brush.PointInLeaf(model, eye); @@ -210,7 +157,7 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo VectorSubtract(eye, (&polypoints[i * 3]), v1); VectorSubtract((&polypoints[prev * 3]), (&polypoints[i * 3]), v2); CrossProduct(v1, v2, portalplanes[i].normal); - VectorNormalizeFast(portalplanes[i].normal); + VectorNormalize(portalplanes[i].normal); portalplanes[i].dist = DotProduct(eye, portalplanes[i].normal); if (DotProduct(portalplanes[i].normal, center) <= portalplanes[i].dist) { @@ -258,7 +205,7 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo }\ } -int Portal_CheckBox(model_t *model, vec3_t eye, vec3_t a, vec3_t b) +int Portal_CheckBox(dp_model_t *model, vec3_t eye, vec3_t a, vec3_t b) { if (eye[0] >= (a[0] - 1.0f) && eye[0] < (b[0] + 1.0f) && eye[1] >= (a[1] - 1.0f) && eye[1] < (b[1] + 1.0f) @@ -317,8 +264,6 @@ int Portal_CheckBox(model_t *model, vec3_t eye, vec3_t a, vec3_t b) return false; } -vec3_t trianglepoints[3]; - typedef struct portalrecursioninfo_s { int exact; @@ -327,24 +272,33 @@ typedef struct portalrecursioninfo_s vec3_t boxmaxs; int numsurfaces; int *surfacelist; - qbyte *surfacepvs; + unsigned char *surfacepvs; int numleafs; + unsigned char *visitingleafpvs; // used to prevent infinite loops int *leaflist; - qbyte *leafpvs; - model_t *model; + unsigned char *leafpvs; + unsigned char *shadowtrispvs; + unsigned char *lighttrispvs; + dp_model_t *model; vec3_t eye; float *updateleafsmins; float *updateleafsmaxs; } portalrecursioninfo_t; -void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int firstclipplane, int numclipplanes) +static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int firstclipplane, int numclipplanes) { mportal_t *p; int newpoints, i, prev; float dist; - vec3_t center, v1, v2; + vec3_t center; tinyplane_t *newplanes; + int leafindex = leaf - info->model->brush.data_leafs; + + if (CHECKPVSBIT(info->visitingleafpvs, leafindex)) + return; // recursive loop of leafs (cmc.bsp for megatf coop) + + SETPVSBIT(info->visitingleafpvs, leafindex); for (i = 0;i < 3;i++) { @@ -355,7 +309,6 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first if (info->leafpvs) { - int leafindex = leaf - info->model->brush.data_leafs; if (!CHECKPVSBIT(info->leafpvs, leafindex)) { SETPVSBIT(info->leafpvs, leafindex); @@ -369,47 +322,38 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first for (i = 0;i < leaf->numleafsurfaces;i++) { int surfaceindex = leaf->firstleafsurface[i]; - if (!CHECKPVSBIT(info->surfacepvs, surfaceindex)) + msurface_t *surface = info->model->data_surfaces + surfaceindex; + if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs)) { - msurface_t *surface = info->model->brush.data_surfaces + surfaceindex; - if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs)) + qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs); + qboolean addedtris = false; + int t, tend; + const int *elements; + const float *vertex3f; + float v[9]; + vertex3f = info->model->surfmesh.data_vertex3f; + elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle); + for (t = surface->num_firsttriangle, tend = t + surface->num_triangles;t < tend;t++, elements += 3) { - if (info->exact) + VectorCopy(vertex3f + elements[0] * 3, v + 0); + VectorCopy(vertex3f + elements[1] * 3, v + 3); + VectorCopy(vertex3f + elements[2] * 3, v + 6); + if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6) + && (insidebox || TriangleBBoxOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs)) + && (!info->exact || Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0)) { - int j; - const int *elements; - const float *vertex3f; - float v[9], trimins[3], trimaxs[3]; - vertex3f = surface->groupmesh->data_vertex3f; - elements = (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle); - for (j = 0;j < surface->num_triangles;j++, elements += 3) - { - VectorCopy(vertex3f + elements[0] * 3, v + 0); - VectorCopy(vertex3f + elements[1] * 3, v + 3); - VectorCopy(vertex3f + elements[2] * 3, v + 6); - if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6)) - { - trimins[0] = min(v[0], min(v[3], v[6])); - trimaxs[0] = max(v[0], max(v[3], v[6])); - trimins[1] = min(v[1], min(v[4], v[7])); - trimaxs[1] = max(v[1], max(v[4], v[7])); - trimins[2] = min(v[2], min(v[5], v[8])); - trimaxs[2] = max(v[2], max(v[5], v[8])); - if (BoxesOverlap(trimins, trimaxs, info->boxmins, info->boxmaxs) && Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) >= 3) - { - SETPVSBIT(info->surfacepvs, surfaceindex); - info->surfacelist[info->numsurfaces++] = surfaceindex; - break; - } - } - } - } - else - { - SETPVSBIT(info->surfacepvs, surfaceindex); - info->surfacelist[info->numsurfaces++] = surfaceindex; + addedtris = true; + if (info->shadowtrispvs) + SETPVSBIT(info->shadowtrispvs, t); + if (info->lighttrispvs) + SETPVSBIT(info->lighttrispvs, t); } } + if (addedtris && !CHECKPVSBIT(info->surfacepvs, surfaceindex)) + { + SETPVSBIT(info->surfacepvs, surfaceindex); + info->surfacelist[info->numsurfaces++] = surfaceindex; + } } } } @@ -434,18 +378,16 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first VectorAdd(center, portaltemppoints2[i], center); // ixtable is a 1.0f / N table VectorScale(center, ixtable[newpoints], center); - // calculate the planes, and make sure the polygon can see it's own center + // calculate the planes, and make sure the polygon can see its own center newplanes = &portalplanes[firstclipplane + numclipplanes]; for (prev = newpoints - 1, i = 0;i < newpoints;prev = i, i++) { - VectorSubtract(portaltemppoints2[prev], portaltemppoints2[i], v1); - VectorSubtract(info->eye, portaltemppoints2[i], v2); - CrossProduct(v1, v2, newplanes[i].normal); - VectorNormalizeFast(newplanes[i].normal); + TriangleNormal(portaltemppoints2[prev], portaltemppoints2[i], info->eye, newplanes[i].normal); + VectorNormalize(newplanes[i].normal); newplanes[i].dist = DotProduct(info->eye, newplanes[i].normal); if (DotProduct(newplanes[i].normal, center) <= newplanes[i].dist) { - // polygon can't see it's own center, discard and use parent portal + // polygon can't see its own center, discard and use parent portal break; } } @@ -456,9 +398,11 @@ void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, int first } } } + + CLEARPVSBIT(info->visitingleafpvs, leafindex); } -void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node) +static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node) { if (node->plane) { @@ -471,12 +415,12 @@ void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node) else { mleaf_t *leaf = (mleaf_t *)node; - if (leaf->portals) + if (leaf->clusterindex >= 0) Portal_RecursiveFlow(info, leaf, 0, info->numfrustumplanes); } } -void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *leafpvs, int *numleafspointer, int *surfacelist, qbyte *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs) +void Portal_Visibility(dp_model_t *model, const vec3_t eye, int *leaflist, unsigned char *leafpvs, int *numleafspointer, int *surfacelist, unsigned char *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs, unsigned char *shadowtrispvs, unsigned char *lighttrispvs, unsigned char *visitingleafpvs) { int i; portalrecursioninfo_t info; @@ -488,9 +432,7 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *l return; } - Mod_CheckLoaded(model); - - if (!model->brush.num_portals) + if (!model->brush.data_nodes) { Con_Print("Portal_Visibility: not a brush model\n"); return; @@ -513,6 +455,7 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *l info.surfacelist = surfacelist; info.surfacepvs = surfacepvs; info.numleafs = 0; + info.visitingleafpvs = visitingleafpvs; info.leaflist = leaflist; info.leafpvs = leafpvs; info.model = model; @@ -520,6 +463,8 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *l info.numfrustumplanes = numfrustumplanes; info.updateleafsmins = updateleafsmins; info.updateleafsmaxs = updateleafsmaxs; + info.shadowtrispvs = shadowtrispvs; + info.lighttrispvs = lighttrispvs; Portal_RecursiveFindLeafForFlow(&info, model->brush.data_nodes);