yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 07:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix bmodel clipping

Browse source
This commit is contained in:
Denis 2024-03-31 22:40:29 +03:00
parent d5c26f28d6
commit 85b7ae87ef
1 changed files with 35 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/client/refresh/soft/sw_bsp.c
View file

@ -58,7 +58,6 @@ R_EntityRotate (vec3_t vec)
vec[2] = DotProduct (entity_rotation[2], tvec); vec[2] = DotProduct (entity_rotation[2], tvec);
} }
/* /*
================ ================
R_RotateBmodel R_RotateBmodel
@ -153,13 +152,10 @@ R_RecursiveClipBPoly(entity_t *currententity, bedge_t *pedges, mnode_t *pnode, m
cplane_t *splitplane, tplane; cplane_t *splitplane, tplane;
mvertex_t *pvert, *plastvert, *ptvert; mvertex_t *pvert, *plastvert, *ptvert;
mnode_t *pn; mnode_t *pn;
qboolean makeclippededge; mvertex_t *prevclipvert = NULL;
mvertex_t *pfrontenter = bverts, *pfrontexit = bverts;
psideedges[0] = psideedges[1] = NULL; psideedges[0] = psideedges[1] = NULL;
makeclippededge = false;
// transform the BSP plane into model space // transform the BSP plane into model space
// FIXME: cache these? // FIXME: cache these?
splitplane = pnode->plane; splitplane = pnode->plane;
@ -180,19 +176,15 @@ R_RecursiveClipBPoly(entity_t *currententity, bedge_t *pedges, mnode_t *pnode, m
// set the status for the last point as the previous point // set the status for the last point as the previous point
// FIXME: cache this stuff somehow? // FIXME: cache this stuff somehow?
plastvert = pedges->v[0]; plastvert = pedges->v[0];
lastdist = DotProduct (plastvert->position, tplane.normal) - lastdist = DotProduct (plastvert->position, tplane.normal) - tplane.dist;
tplane.dist; if (lastdist >= 0)
if (lastdist > 0)
lastside = 0; lastside = 0;
else else
lastside = 1; lastside = 1;
pvert = pedges->v[1]; pvert = pedges->v[1];
dist = DotProduct (pvert->position, tplane.normal) - tplane.dist; dist = DotProduct (pvert->position, tplane.normal) - tplane.dist;
if (dist >= 0)
if (dist > 0)
side = 0; side = 0;
else else
side = 1; side = 1;
@ -221,34 +213,48 @@ R_RecursiveClipBPoly(entity_t *currententity, bedge_t *pedges, mnode_t *pnode, m
// split into two edges, one on each side, and remember entering // split into two edges, one on each side, and remember entering
// and exiting points // and exiting points
// FIXME: share the clip edge by having a winding direction flag? // FIXME: share the clip edge by having a winding direction flag?
if (numbedges + 4 > MAX_BMODEL_EDGES)
{
R_Printf(PRINT_ALL,"Out of edges for bmodel\n");
return;
}
// outside: last vert, clip vert
ptedge = &bedges[numbedges++]; ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[lastside]; ptedge->pnext = psideedges[lastside];
psideedges[lastside] = ptedge; psideedges[lastside] = ptedge;
ptedge->v[0] = plastvert; ptedge->v[0] = plastvert;
ptedge->v[1] = ptvert; ptedge->v[1] = ptvert;
// each two clipped verts we get a clipped-off contour;
// connect the verts by two edges (one per side)
// going in opposite directions
// this fixes surface 0 of model *50 (fan) in mine2:
// teleport 1231 770 -579
if (prevclipvert)
{
ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[lastside];
psideedges[lastside] = ptedge;
ptedge->v[0] = ptvert;
ptedge->v[1] = prevclipvert;
ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[side];
psideedges[side] = ptedge;
ptedge->v[0] = prevclipvert;
ptedge->v[1] = ptvert;
prevclipvert = NULL;
} else
prevclipvert = ptvert;
// inside: clip vert, current vert
ptedge = &bedges[numbedges++]; ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[side]; ptedge->pnext = psideedges[side];
psideedges[side] = ptedge; psideedges[side] = ptedge;
ptedge->v[0] = ptvert; ptedge->v[0] = ptvert;
ptedge->v[1] = pvert; ptedge->v[1] = pvert;
if (numbedges >= MAX_BMODEL_EDGES)
{
R_Printf(PRINT_ALL,"Out of edges for bmodel\n");
return;
}
if (side == 0)
{
// entering for front, exiting for back
pfrontenter = ptvert;
}
else
{
pfrontexit = ptvert;
}
makeclippededge = true;
} }
else else
{ {
@ -258,31 +264,6 @@ R_RecursiveClipBPoly(entity_t *currententity, bedge_t *pedges, mnode_t *pnode, m
} }
} }
// if anything was clipped, reconstitute and add the edges along the clip
// plane to both sides (but in opposite directions)
if (makeclippededge && pfrontexit != pfrontenter)
{
bedge_t *ptedge;
ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[0];
psideedges[0] = ptedge;
ptedge->v[0] = pfrontexit;
ptedge->v[1] = pfrontenter;
ptedge = &bedges[numbedges++];
ptedge->pnext = psideedges[1];
psideedges[1] = ptedge;
ptedge->v[0] = pfrontenter;
ptedge->v[1] = pfrontexit;
if (numbedges >= MAX_BMODEL_EDGES)
{
R_Printf(PRINT_ALL,"Out of edges for bmodel\n");
return;
}
}
// draw or recurse further // draw or recurse further
for (i=0 ; i<2 ; i++) for (i=0 ; i<2 ; i++)
{ {
@ -396,10 +377,6 @@ R_DrawSolidClippedSubmodelPolygons(entity_t *currententity, const model_t *curre
if ( !( psurf->texinfo->flags & ( SURF_TRANS66 | SURF_TRANS33 ) )) if ( !( psurf->texinfo->flags & ( SURF_TRANS66 | SURF_TRANS33 ) ))
{ {
// FIXME: Fan broken in borehole
// teleport: 1231.000000 770.250000 -579.375000
// map: maps/mine2.bsp
// model texture: textures/e2u1/metal6_1.wal
R_RecursiveClipBPoly(currententity, pbedge, topnode, psurf); R_RecursiveClipBPoly(currententity, pbedge, topnode, psurf);
} }
else else