Skip to content

Revert changes that break material system renderer #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 14, 2025
Merged

Revert changes that break material system renderer #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb18554
Revert "Fix incorrect index in deform shader lookup"
slipher Apr 14, 2025
ab8e82b
Revert "Fix memory leaks in material system portals"
slipher Apr 14, 2025
5456e79
Revert "Rework material system material and surface generation"
slipher Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 8 additions & 27 deletions src/engine/renderer/GeometryOptimiser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,13 @@ void MergeDuplicateVertices( bspSurface_t** rendererSurfaces, int numSurfaces, s
srfVert_t& vert = face->verts[triangle->indexes[j]];
uint32_t index = verts[vert];

ASSERT_LT( idx, ( uint32_t ) numIndicesIn );
ASSERT_LT( idx, numIndicesIn );
if ( !index ) {
verts[vert] = vertIdx + 1;
vertices[vertIdx] = vert;
indices[idx] = vertIdx;

ASSERT_LT( vertIdx, ( uint32_t ) numVerticesIn );
ASSERT_LT( vertIdx, numVerticesIn );

vertIdx++;
} else {
Expand Down Expand Up @@ -356,7 +356,7 @@ void MergeDuplicateVertices( bspSurface_t** rendererSurfaces, int numSurfaces, s
}
} */

std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** rendererSurfaces, int numSurfaces ) {
std::vector<MaterialSurface> OptimiseMapGeometryMaterial( world_t* world, int numSurfaces ) {
std::vector<MaterialSurface> materialSurfaces;
materialSurfaces.reserve( numSurfaces );

Expand All @@ -365,43 +365,24 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer

// std::unordered_map<TriEdge, TriIndex> triEdges;

vec3_t worldBounds[2] = {};
for ( int i = 0; i < numSurfaces; i++ ) {
bspSurface_t* surface = rendererSurfaces[i];

if ( surface->BSPModel ) {
// Not implemented yet
continue;
}
int surfaceIndex = 0;
for ( int k = 0; k < world->numSurfaces; k++ ) {
bspSurface_t* surface = &world->surfaces[k];

MaterialSurface srf {};

srf.shader = surface->shader;
srf.bspSurface = true;
srf.lightMapNum = surface->lightmapNum;
srf.fog = surface->fogIndex;
srf.portalNum = surface->portalNum;

srf.firstIndex = ( ( srfGeneric_t* ) surface->data )->firstIndex;
srf.count = ( ( srfGeneric_t* ) surface->data )->numTriangles * 3;
srf.count = ( ( srfGeneric_t* ) surface->data )->numTriangles;
srf.verts = ( ( srfGeneric_t* ) surface->data )->verts;
srf.tris = ( ( srfGeneric_t* ) surface->data )->triangles;

VectorCopy( ( ( srfGeneric_t* ) surface->data )->origin, srf.origin );
srf.radius = ( ( srfGeneric_t* ) surface->data )->radius;

BoundsAdd( worldBounds[0], worldBounds[1],
( ( srfGeneric_t* ) surface->data )->bounds[0], ( ( srfGeneric_t* ) surface->data )->bounds[1] );

materialSystem.GenerateMaterial( &srf );

materialSurfaces.emplace_back( srf );
surfaceIndex++;
}

materialSystem.GenerateWorldMaterialsBuffer();
materialSystem.GeneratePortalBoundingSpheres();
materialSystem.SetWorldBounds( worldBounds );
materialSystem.GenerateWorldCommandBuffer( materialSurfaces );

return materialSurfaces;
}
2 changes: 1 addition & 1 deletion src/engine/renderer/GeometryOptimiser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ void OptimiseMapGeometryCore( world_t* world, bspSurface_t** rendererSurfaces, i
void MergeLeafSurfacesCore( world_t* world, bspSurface_t** rendererSurfaces, int numSurfaces );
void MergeDuplicateVertices( bspSurface_t** rendererSurfaces, int numSurfaces, srfVert_t* vertices, int numVerticesIn,
glIndex_t* indices, int numIndicesIn, int& numVerticesOut, int& numIndicesOut );
std::vector<MaterialSurface> OptimiseMapGeometryMaterial( bspSurface_t** rendererSurfaces, int numSurfaces );
std::vector<MaterialSurface> OptimiseMapGeometryMaterial( world_t* world, int numSurfaces );

#endif // GEOMETRY_OPTIMISER_H
Loading
Loading