mirror of
https://github.com/ioquake/ioq3.git
synced 2025-05-31 09:01:54 +00:00
OpenGL2: Preallocate grid surfaces like other BSP surfaces.
This commit is contained in:
SmileTheory
parent
1cf0b21cda
commit
fe8ac838e2
3 changed files with 65 additions and 88 deletions
|
|
@ -822,7 +822,7 @@ ParseMesh
|
|||
===============
|
||||
*/
|
||||
static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors, msurface_t *surf ) {
|
||||
srfBspSurface_t *grid;
|
||||
srfBspSurface_t *grid = (srfBspSurface_t *)surf->data;
|
||||
int i, j;
|
||||
int width, height, numPoints;
|
||||
srfVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
|
||||
|
|
@ -903,8 +903,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
|
|||
}
|
||||
|
||||
// pre-tesseleate
|
||||
grid = R_SubdividePatchToGrid( width, height, points );
|
||||
surf->data = (surfaceType_t *)grid;
|
||||
R_SubdividePatchToGrid( grid, width, height, points );
|
||||
|
||||
// copy the level of detail origin, which is the center
|
||||
// of the group of all curves that must subdivide the same
|
||||
|
|
@ -917,6 +916,12 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
|
|||
VectorScale( bounds[1], 0.5f, grid->lodOrigin );
|
||||
VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
|
||||
grid->lodRadius = VectorLength( tmpVec );
|
||||
|
||||
surf->cullinfo.type = CULLINFO_BOX | CULLINFO_SPHERE;
|
||||
VectorCopy(grid->cullBounds[0], surf->cullinfo.bounds[0]);
|
||||
VectorCopy(grid->cullBounds[1], surf->cullinfo.bounds[1]);
|
||||
VectorCopy(grid->cullOrigin, surf->cullinfo.localOrigin);
|
||||
surf->cullinfo.radius = grid->cullRadius;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1077,6 +1082,8 @@ static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int
|
|||
flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
|
||||
flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
|
||||
}
|
||||
|
||||
surf->cullinfo = CULLINFO_NONE;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1321,7 +1328,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert column into grid2 right after after column l
|
||||
if (m) row = grid2->height-1;
|
||||
else row = 0;
|
||||
grid2 = R_GridInsertColumn( grid2, l+1, row,
|
||||
R_GridInsertColumn( grid2, l+1, row,
|
||||
grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1365,7 +1372,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert row into grid2 right after after row l
|
||||
if (m) column = grid2->width-1;
|
||||
else column = 0;
|
||||
grid2 = R_GridInsertRow( grid2, l+1, column,
|
||||
R_GridInsertRow( grid2, l+1, column,
|
||||
grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1418,7 +1425,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert column into grid2 right after after column l
|
||||
if (m) row = grid2->height-1;
|
||||
else row = 0;
|
||||
grid2 = R_GridInsertColumn( grid2, l+1, row,
|
||||
R_GridInsertColumn( grid2, l+1, row,
|
||||
grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1462,7 +1469,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert row into grid2 right after after row l
|
||||
if (m) column = grid2->width-1;
|
||||
else column = 0;
|
||||
grid2 = R_GridInsertRow( grid2, l+1, column,
|
||||
R_GridInsertRow( grid2, l+1, column,
|
||||
grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1516,7 +1523,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert column into grid2 right after after column l
|
||||
if (m) row = grid2->height-1;
|
||||
else row = 0;
|
||||
grid2 = R_GridInsertColumn( grid2, l+1, row,
|
||||
R_GridInsertColumn( grid2, l+1, row,
|
||||
grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1560,7 +1567,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert row into grid2 right after after row l
|
||||
if (m) column = grid2->width-1;
|
||||
else column = 0;
|
||||
grid2 = R_GridInsertRow( grid2, l+1, column,
|
||||
R_GridInsertRow( grid2, l+1, column,
|
||||
grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
|
||||
if (!grid2)
|
||||
break;
|
||||
|
|
@ -1615,7 +1622,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert column into grid2 right after after column l
|
||||
if (m) row = grid2->height-1;
|
||||
else row = 0;
|
||||
grid2 = R_GridInsertColumn( grid2, l+1, row,
|
||||
R_GridInsertColumn( grid2, l+1, row,
|
||||
grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1659,7 +1666,7 @@ int R_StitchPatches( int grid1num, int grid2num ) {
|
|||
// insert row into grid2 right after after row l
|
||||
if (m) column = grid2->width-1;
|
||||
else column = 0;
|
||||
grid2 = R_GridInsertRow( grid2, l+1, column,
|
||||
R_GridInsertRow( grid2, l+1, column,
|
||||
grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
|
||||
grid2->lodStitched = qfalse;
|
||||
s_worldData.surfaces[grid2num].data = (void *) grid2;
|
||||
|
|
@ -1749,37 +1756,37 @@ R_MovePatchSurfacesToHunk
|
|||
===============
|
||||
*/
|
||||
void R_MovePatchSurfacesToHunk(void) {
|
||||
int i, size;
|
||||
srfBspSurface_t *grid, *hunkgrid;
|
||||
int i;
|
||||
srfBspSurface_t *grid;
|
||||
|
||||
for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
|
||||
void *copyFrom;
|
||||
//
|
||||
grid = (srfBspSurface_t *) s_worldData.surfaces[i].data;
|
||||
// if this surface is not a grid
|
||||
if ( grid->surfaceType != SF_GRID )
|
||||
continue;
|
||||
//
|
||||
size = sizeof(*grid);
|
||||
hunkgrid = ri.Hunk_Alloc(size, h_low);
|
||||
Com_Memcpy(hunkgrid, grid, size);
|
||||
|
||||
hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_low );
|
||||
Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
|
||||
copyFrom = grid->widthLodError;
|
||||
grid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_low );
|
||||
Com_Memcpy(grid->widthLodError, copyFrom, grid->width * 4);
|
||||
ri.Free(copyFrom);
|
||||
|
||||
hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_low );
|
||||
Com_Memcpy( hunkgrid->heightLodError, grid->heightLodError, grid->height * 4 );
|
||||
copyFrom = grid->heightLodError;
|
||||
grid->heightLodError = ri.Hunk_Alloc(grid->height * 4, h_low);
|
||||
Com_Memcpy(grid->heightLodError, copyFrom, grid->height * 4);
|
||||
ri.Free(copyFrom);
|
||||
|
||||
hunkgrid->numIndexes = grid->numIndexes;
|
||||
hunkgrid->indexes = ri.Hunk_Alloc(grid->numIndexes * sizeof(glIndex_t), h_low);
|
||||
Com_Memcpy(hunkgrid->indexes, grid->indexes, grid->numIndexes * sizeof(glIndex_t));
|
||||
copyFrom = grid->indexes;
|
||||
grid->indexes = ri.Hunk_Alloc(grid->numIndexes * sizeof(glIndex_t), h_low);
|
||||
Com_Memcpy(grid->indexes, copyFrom, grid->numIndexes * sizeof(glIndex_t));
|
||||
ri.Free(copyFrom);
|
||||
|
||||
hunkgrid->numVerts = grid->numVerts;
|
||||
hunkgrid->verts = ri.Hunk_Alloc(grid->numVerts * sizeof(srfVert_t), h_low);
|
||||
Com_Memcpy(hunkgrid->verts, grid->verts, grid->numVerts * sizeof(srfVert_t));
|
||||
|
||||
R_FreeSurfaceGridMesh( grid );
|
||||
|
||||
s_worldData.surfaces[i].data = (void *) hunkgrid;
|
||||
copyFrom = grid->verts;
|
||||
grid->verts = ri.Hunk_Alloc(grid->numVerts * sizeof(srfVert_t), h_low);
|
||||
Com_Memcpy(grid->verts, copyFrom, grid->numVerts * sizeof(srfVert_t));
|
||||
ri.Free(copyFrom);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2276,7 +2283,7 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
|
|||
for ( i = 0 ; i < count ; i++, in++, out++ ) {
|
||||
switch ( LittleLong( in->surfaceType ) ) {
|
||||
case MST_PATCH:
|
||||
// FIXME: do this
|
||||
out->data = ri.Hunk_Alloc( sizeof(srfBspSurface_t), h_low);
|
||||
break;
|
||||
case MST_TRIANGLE_SOUP:
|
||||
out->data = ri.Hunk_Alloc( sizeof(srfBspSurface_t), h_low);
|
||||
|
|
@ -2298,15 +2305,6 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
|
|||
switch ( LittleLong( in->surfaceType ) ) {
|
||||
case MST_PATCH:
|
||||
ParseMesh ( in, dv, hdrVertColors, out );
|
||||
{
|
||||
srfBspSurface_t *surface = (srfBspSurface_t *)out->data;
|
||||
|
||||
out->cullinfo.type = CULLINFO_BOX | CULLINFO_SPHERE;
|
||||
VectorCopy(surface->cullBounds[0], out->cullinfo.bounds[0]);
|
||||
VectorCopy(surface->cullBounds[1], out->cullinfo.bounds[1]);
|
||||
VectorCopy(surface->cullOrigin, out->cullinfo.localOrigin);
|
||||
out->cullinfo.radius = surface->cullRadius;
|
||||
}
|
||||
numMeshes++;
|
||||
break;
|
||||
case MST_TRIANGLE_SOUP:
|
||||
|
|
@ -2319,9 +2317,6 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
|
|||
break;
|
||||
case MST_FLARE:
|
||||
ParseFlare( in, dv, out, indexes );
|
||||
{
|
||||
out->cullinfo.type = CULLINFO_NONE;
|
||||
}
|
||||
numFlares++;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue