teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-02 22:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- store sector as an index in Section2 and renamed walls to lines.

Browse source 
Now everything has the same name and type as in the old section.
This commit is contained in:
Christoph Oelckers 2021-12-15 11:12:31 +01:00
parent 208ca4f783
commit 8e01d559e8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/rendering/hw_sections2.cpp
View file

@ -567,12 +567,12 @@ static void ConstructSections(TArray<sectionbuildsector>& builders)
auto& srcsect = builder.sections[j];
sections2[cursection] = section;
sections2PerSector[i][j] = section;
section->sector = &sector[i];
section->sector = i;
section->index = cursection++;
int sectwalls = srcsect.wallcount;
auto walls = (int*)sectionArena.Calloc(sectwalls * sizeof(int));
section->walls.Set(walls, sectwalls);
section->lines.Set(walls, sectwalls);
unsigned srcloops = srcsect.loops.Size();
auto loops = (Section2Loop*)sectionArena.Calloc(srcloops * sizeof(Section2Loop));
@ -590,7 +590,7 @@ static void ConstructSections(TArray<sectionbuildsector>& builders)
{
int wall_i = srcloop[w];
auto wal = &sectionLines[wall_i];
section->walls[curwall++] = loop.walls[w] = wall_i;
section->lines[curwall++] = loop.walls[w] = wall_i;
wal->section = section->index;
}
}

4
source/core/rendering/hw_sections2.h
View file

@ -19,9 +19,9 @@ struct Section2
uint8_t dirty;
uint8_t geomflags;
unsigned index;
sectortype* sector;
int sector;
// this uses a memory arena for storage, so use TArrayView instead of TArray
TArrayView<int> walls;
TArrayView<int> lines;
TArrayView<Section2Loop> loops;
};

6
source/core/sectorgeometry.cpp
View file

@ -426,7 +426,7 @@ ETriangulateResult TriangulateOutlineNodeBuild(const FOutline& polygon, int coun
bool SectionGeometry::ValidateSection(Section2* section, int plane)
{
auto sec = section->sector;
auto sec = &sector[section->sector];
auto& sdata = data[section->index];
auto compare = &sdata.compare[plane];
@ -510,7 +510,7 @@ bool SectionGeometry::CreateMesh(Section2* section)
void SectionGeometry::CreatePlaneMesh(Section2* section, int plane, const FVector2& offset)
{
auto sectorp = section->sector;
auto sectorp = &sector[section->sector];
// calculate the rest.
auto texture = tileGetTexture(plane ? sectorp->ceilingpicnum : sectorp->floorpicnum);
auto& sdata = data[section->index];
@ -562,7 +562,7 @@ void SectionGeometry::MarkDirty(sectortype* sector)
SectionGeometryPlane* SectionGeometry::get(Section2* section, int plane, const FVector2& offset, TArray<int>** pIndices)
{
if (!section || section->index >= data.Size()) return nullptr;
auto sectp = section->sector;
auto sectp = &sector[section->sector];
if (sectp->dirty) MarkDirty(sectp);
if (section->dirty & EDirty::GeometryDirty)
{