zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 17:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made several arrays holding sector related data dynamic.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-06 20:08:32 +01:00
parent 2a07159c8d
commit 1a3b9f8ac0
11 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/build.h
View file

@ -235,7 +235,7 @@ extern int16_t pskybits_override;
EXTERN int16_t tailspritefree; EXTERN int16_t tailspritefree;
EXTERN uint8_t gotpic[(MAXTILES+7)>>3]; EXTERN uint8_t gotpic[(MAXTILES+7)>>3];
extern FixedBitArray<MAXSECTORS> gotsector; extern BitArray gotsector;
extern uint32_t drawlinepat; extern uint32_t drawlinepat;

29
source/build/src/clip.cpp
View file

@ -20,15 +20,11 @@ static linetype clipit[MAXCLIPNUM];
static int32_t clipsectnum, origclipsectnum, clipspritenum; static int32_t clipsectnum, origclipsectnum, clipspritenum;
int clipsectorlist[MAXCLIPSECTORS]; int clipsectorlist[MAXCLIPSECTORS];
static int origclipsectorlist[MAXCLIPSECTORS]; static int origclipsectorlist[MAXCLIPSECTORS];
static uint8_t clipsectormap[(MAXSECTORS+7)>>3];
static uint8_t origclipsectormap[(MAXSECTORS+7)>>3];
static CollisionBase clipobjectval[MAXCLIPNUM]; static CollisionBase clipobjectval[MAXCLIPNUM];
static uint8_t clipignore[(MAXCLIPNUM+7)>>3]; static uint8_t clipignore[(MAXCLIPNUM+7)>>3];
static int32_t rxi[8], ryi[8]; static int32_t rxi[8], ryi[8];
inline void bitmap_set(uint8_t* const ptr, int const n) { ptr[n >> 3] |= 1 << (n & 7); } BitArray clipsectormap;
inline char bitmap_test(uint8_t const* const ptr, int const n) { return ptr[n >> 3] & (1 << (n & 7)); }
int32_t quickloadboard=0; int32_t quickloadboard=0;
@ -36,6 +32,7 @@ vec2_t hitscangoal = { (1<<29)-1, (1<<29)-1 };
int32_t hitallsprites = 0; int32_t hitallsprites = 0;
////////// CLIPMOVE ////////// ////////// CLIPMOVE //////////
inline char bitmap_test(uint8_t const* const ptr, int const n) { return ptr[n >> 3] & (1 << (n & 7)); }
// x1, y1: in/out // x1, y1: in/out
@ -175,7 +172,7 @@ static inline void addclipsect(int const sectnum)
{ {
if (clipsectnum < MAXCLIPSECTORS) if (clipsectnum < MAXCLIPSECTORS)
{ {
bitmap_set(clipsectormap, sectnum); clipsectormap.Set(sectnum);
clipsectorlist[clipsectnum++] = sectnum; clipsectorlist[clipsectnum++] = sectnum;
} }
else else
@ -413,7 +410,7 @@ static void clipupdatesector(vec2_t const pos, int * const sectnum, int walldist
for (auto& wal : wallsofsector(listsectnum)) for (auto& wal : wallsofsector(listsectnum))
{ {
if (wal.nextsector >= 0 && bitmap_test(clipsectormap, wal.nextsector)) if (wal.nextsector >= 0 && clipsectormap[wal.nextsector])
search.Add(wal.nextsector); search.Add(wal.nextsector);
} }
} }
@ -478,8 +475,8 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
clipmove_warned = 0; clipmove_warned = 0;
memset(clipsectormap, 0, (numsectors+7)>>3); clipsectormap.Zero();
bitmap_set(clipsectormap, *sectnum); clipsectormap.Set(*sectnum);
do do
{ {
@ -563,7 +560,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
} }
else if (wal->nextsector>=0) else if (wal->nextsector>=0)
{ {
if (bitmap_test(clipsectormap, wal->nextsector) == 0) if (!clipsectormap[wal->nextsector])
addclipsect(wal->nextsector); addclipsect(wal->nextsector);
} }
} }
@ -858,8 +855,8 @@ int pushmove_(vec3_t *const vect, int *const sectnum,
clipsectorlist[0] = *sectnum; clipsectorlist[0] = *sectnum;
clipsectnum = 1; clipsectnum = 1;
memset(clipsectormap, 0, (numsectors + 7) >> 3); clipsectormap.Zero();
bitmap_set(clipsectormap, *sectnum); clipsectormap.Set(*sectnum);
} }
do do
@ -926,7 +923,7 @@ int pushmove_(vec3_t *const vect, int *const sectnum,
clipupdatesector(vect->vec2, sectnum, walldist); clipupdatesector(vect->vec2, sectnum, walldist);
if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE && *sectnum < 0) return -1; if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE && *sectnum < 0) return -1;
} }
else if (bitmap_test(clipsectormap, wal->nextsector) == 0) else if (!clipsectormap[wal->nextsector])
addclipsect(wal->nextsector); addclipsect(wal->nextsector);
} }
@ -975,8 +972,8 @@ void getzrange(const vec3_t& pos, sectortype* sect, int32_t* ceilz, CollisionBas
clipsectorlist[0] = sectnum; clipsectorlist[0] = sectnum;
clipsectnum = 1; clipsectnum = 1;
clipspritenum = 0; clipspritenum = 0;
memset(clipsectormap, 0, (numsectors+7)>>3); clipsectormap.Zero();
bitmap_set(clipsectormap, sectnum); clipsectormap.Set(sectnum);
do //Collect sectors inside your square first do //Collect sectors inside your square first
{ {
@ -1011,7 +1008,7 @@ void getzrange(const vec3_t& pos, sectortype* sect, int32_t* ceilz, CollisionBas
if (((nextsect->floorstat&1) == 0) && (pos.z >= nextsect->floorz-(3<<8))) continue; if (((nextsect->floorstat&1) == 0) && (pos.z >= nextsect->floorz-(3<<8))) continue;
int nextsectno = ::sectnum(nextsect); int nextsectno = ::sectnum(nextsect);
if (bitmap_test(clipsectormap, nextsectno) == 0) if (!clipsectormap[nextsectno])
addclipsect(nextsectno); addclipsect(nextsectno);
if (((v1.x < xmin + MAXCLIPDIST) && (v2.x < xmin + MAXCLIPDIST)) || if (((v1.x < xmin + MAXCLIPDIST) && (v2.x < xmin + MAXCLIPDIST)) ||

6
source/core/maploader.cpp
View file

@ -49,6 +49,8 @@
#include "interpolate.h" #include "interpolate.h"
#include "games/blood/src/mapstructs.h" #include "games/blood/src/mapstructs.h"
extern BitArray clipsectormap;
// needed for skipping over to get the map size first. // needed for skipping over to get the map size first.
enum enum
{ {
@ -371,6 +373,8 @@ void allocateMapArrays(int numsprites)
show2dsector.Resize(numsectors); show2dsector.Resize(numsectors);
show2dwall.Resize(numwalls); show2dwall.Resize(numwalls);
gotsector.Resize(numsectors);
clipsectormap.Resize(numsectors);
mapDataArena.FreeAll(); mapDataArena.FreeAll();
sector.Resize(numsectors); sector.Resize(numsectors);
@ -469,7 +473,7 @@ void engineLoadBoard(const char* filename, int flags, vec3_t* pos, int16_t* ang,
G_LoadMapHack(filename, md4, sprites); G_LoadMapHack(filename, md4, sprites);
setWallSectors(); setWallSectors();
hw_BuildSections(); hw_BuildSections();
sectorGeometry.SetSize(numsections); sectorGeometry.SetSize(Sections.Size());
wallbackup = wall; wallbackup = wall;

39
source/core/rendering/hw_sections.cpp
View file

@ -43,9 +43,8 @@
SectionLine sectionLines[MAXWALLS + (MAXWALLS >> 2)]; SectionLine sectionLines[MAXWALLS + (MAXWALLS >> 2)];
Section sections[MAXSECTORS + (MAXSECTORS >> 2)]; TArray<Section> Sections;
TArray<int> sectionspersector[MAXSECTORS]; // reverse map, mainly for the automap TArray<int> sectionspersector[MAXSECTORS]; // reverse map, mainly for the automap
int numsections;
int numsectionlines; int numsectionlines;
void hw_SplitSector(int sector, int startpos, int endpos); void hw_SplitSector(int sector, int startpos, int endpos);
@ -55,6 +54,7 @@ TArray<int> splits;
void hw_BuildSections() void hw_BuildSections()
{ {
Sections.Resize(numsectors);
for (int i = 0; i < numsectors; i++) for (int i = 0; i < numsectors; i++)
{ {
// Fix maps which do not set their wallptr to the first wall. Lo Wang In Time's map 11 is such a case. // Fix maps which do not set their wallptr to the first wall. Lo Wang In Time's map 11 is such a case.
@ -65,16 +65,15 @@ void hw_BuildSections()
sector[i].wallnum++; sector[i].wallnum++;
wp--; wp--;
} }
sections[i].sector = i; Sections[i].sector = i;
sections[i].lines.Resize(sector[i].wallnum); Sections[i].lines.Resize(sector[i].wallnum);
for (int j = 0; j < sector[i].wallnum; j++) sections[i].lines[j] = sector[i].wallptr + j; for (int j = 0; j < sector[i].wallnum; j++) Sections[i].lines[j] = sector[i].wallptr + j;
sectionspersector[i].Resize(1); sectionspersector[i].Resize(1);
sectionspersector[i][0] = i; sectionspersector[i][0] = i;
} }
// Initial setup just creates a 1:1 mapping of walls to section lines and sectors to sections. // Initial setup just creates a 1:1 mapping of walls to section lines and sectors to sections.
numsectionlines = numwalls; numsectionlines = numwalls;
numsections = numsectors;
for (int i = 0; i < numwalls; i++) for (int i = 0; i < numwalls; i++)
{ {
auto& wal = wall[i]; auto& wal = wall[i];
@ -95,12 +94,12 @@ static void SplitSection(int section, int start, int end)
{ {
// note: to do this, the sector's lines must be well ordered and there must only be one outline and no holes. // note: to do this, the sector's lines must be well ordered and there must only be one outline and no holes.
// This also can only apply a single split to a given sector. // This also can only apply a single split to a given sector.
int firstsection = numsections++; int firstsection = Sections.Reserve(2);
int secondsection = numsections++; int secondsection = firstsection+1;
auto& sect = sections[section]; auto& sect = Sections[section];
Section* sect1 = &sections[firstsection]; Section* sect1 = &Sections[firstsection];
Section* sect2 = &sections[secondsection]; Section* sect2 = &Sections[secondsection];
sect1->sector = sect.sector; sect1->sector = sect.sector;
sect2->sector = sect.sector; sect2->sector = sect.sector;
sect1->lines.Clear(); sect1->lines.Clear();
@ -135,7 +134,7 @@ static void SplitSection(int section, int start, int end)
{ {
SectionLine& newline = sectionLines[thisline]; SectionLine& newline = sectionLines[thisline];
newline = sectionLines[sline]; newline = sectionLines[sline];
newline.section = int(sect1 - sections); newline.section = Sections.IndexOf(sect1);
if (i != sect1->lines.Size() - 1) newline.point2index = thisline + 1 - firstnewline; if (i != sect1->lines.Size() - 1) newline.point2index = thisline + 1 - firstnewline;
else newline.point2index = 0; else newline.point2index = 0;
assert(newline.point2index >= 0); assert(newline.point2index >= 0);
@ -153,8 +152,8 @@ static void SplitSection(int section, int start, int end)
{ {
splitline1 = thisline++; splitline1 = thisline++;
sectionLines[splitline1].wall = -1; sectionLines[splitline1].wall = -1;
sectionLines[splitline1].section = int(sect1 - sections); sectionLines[splitline1].section = Sections.IndexOf(sect1);
sectionLines[splitline1].partnersection = int(sect2 - sections); sectionLines[splitline1].partnersection = Sections.IndexOf(sect2);
sectionLines[splitline1].startpoint = start; sectionLines[splitline1].startpoint = start;
sectionLines[splitline1].endpoint = end; sectionLines[splitline1].endpoint = end;
sectionLines[splitline1].point2index = splitline1 + 1 - firstnewline; sectionLines[splitline1].point2index = splitline1 + 1 - firstnewline;
@ -170,7 +169,7 @@ static void SplitSection(int section, int start, int end)
{ {
SectionLine& newline = sectionLines[thisline]; SectionLine& newline = sectionLines[thisline];
newline = sectionLines[sline]; newline = sectionLines[sline];
newline.section = int(sect2 - sections); newline.section = Sections.IndexOf(sect1);
if (i != sect2->lines.Size() - 1) newline.point2index = thisline + 1 - firstnewline; if (i != sect2->lines.Size() - 1) newline.point2index = thisline + 1 - firstnewline;
else newline.point2index = 0; else newline.point2index = 0;
assert(newline.point2index >= 0); assert(newline.point2index >= 0);
@ -188,8 +187,8 @@ static void SplitSection(int section, int start, int end)
{ {
splitline2 = thisline++; splitline2 = thisline++;
sectionLines[splitline2].wall = -1; sectionLines[splitline2].wall = -1;
sectionLines[splitline2].section = int(sect2 - sections); sectionLines[splitline2].section = Sections.IndexOf(sect2);
sectionLines[splitline2].partnersection = int(sect1 - sections); sectionLines[splitline2].partnersection = Sections.IndexOf(sect1);
sectionLines[splitline2].startpoint = end; sectionLines[splitline2].startpoint = end;
sectionLines[splitline2].endpoint = start; sectionLines[splitline2].endpoint = start;
sectionLines[splitline2].point2index = splitline2 + 1 - firstnewline; sectionLines[splitline2].point2index = splitline2 + 1 - firstnewline;
@ -199,8 +198,8 @@ static void SplitSection(int section, int start, int end)
sectionLines[splitline2].partner = splitline1; sectionLines[splitline2].partner = splitline1;
sectionspersector[sect.sector].Resize(2); sectionspersector[sect.sector].Resize(2);
sectionspersector[sect.sector][0] = int(sect1 - sections); sectionspersector[sect.sector][0] = Sections.IndexOf(sect1);
sectionspersector[sect.sector][1] = int(sect2 - sections); sectionspersector[sect.sector][1] = Sections.IndexOf(sect2);
} }
void hw_SplitSector(int sectnum, int start, int end) void hw_SplitSector(int sectnum, int start, int end)
@ -213,7 +212,7 @@ void hw_SplitSector(int sectnum, int start, int end)
{ {
int sect = sectionspersector[sectnum][i]; int sect = sectionspersector[sectnum][i];
bool foundstart = false, foundend = false; bool foundstart = false, foundend = false;
for (int aline : sections[sect].lines) for (int aline : Sections[sect].lines)
{ {
int line = sectionLines[aline].wall; int line = sectionLines[aline].wall;
if (line == start) foundstart = true; if (line == start) foundstart = true;

3
source/core/rendering/hw_sections.h
View file

@ -22,9 +22,8 @@ struct Section
// giving 25% more may be a bit high as normally this should be small numbers only. // giving 25% more may be a bit high as normally this should be small numbers only.
extern SectionLine sectionLines[MAXWALLS + (MAXWALLS >> 2)]; extern SectionLine sectionLines[MAXWALLS + (MAXWALLS >> 2)];
extern Section sections[MAXSECTORS + (MAXSECTORS >> 2)]; extern TArray<Section> Sections;
extern TArray<int> sectionspersector[MAXSECTORS]; // reverse map, mainly for the automap extern TArray<int> sectionspersector[MAXSECTORS]; // reverse map, mainly for the automap
extern int numsections;
extern int numsectionlines; extern int numsectionlines;

5
source/core/rendering/scene/hw_bunchdrawer.cpp
View file

@ -92,6 +92,7 @@ void BunchDrawer::StartScene()
StartTime = I_msTime(); StartTime = I_msTime();
Bunches.Clear(); Bunches.Clear();
CompareData.Clear(); CompareData.Clear();
gotsector.Resize(numsectors);
gotsector.Zero(); gotsector.Zero();
gotsection2.Zero(); gotsection2.Zero();
gotwall.Zero(); gotwall.Zero();
@ -560,7 +561,7 @@ void BunchDrawer::ProcessSection(int sectionnum, bool portal)
SetupSprite.Clock(); SetupSprite.Clock();
int sectnum = sections[sectionnum].sector; int sectnum = Sections[sectionnum].sector;
if (!gotsector[sectnum]) if (!gotsector[sectnum])
{ {
gotsector.Set(sectnum); gotsector.Set(sectnum);
@ -598,7 +599,7 @@ void BunchDrawer::ProcessSection(int sectionnum, bool portal)
//Todo: process subsectors //Todo: process subsectors
inbunch = false; inbunch = false;
auto section = &sections[sectionnum]; auto section = &Sections[sectionnum];
for (unsigned i = 0; i < section->lines.Size(); i++) for (unsigned i = 0; i < section->lines.Size(); i++)
{ {
auto thisline = &sectionLines[section->lines[i]]; auto thisline = &sectionLines[section->lines[i]];

4
source/core/rendering/scene/hw_bunchdrawer.h
View file

@ -27,7 +27,7 @@ class BunchDrawer
double viewx, viewy; double viewx, viewy;
vec2_t iview; vec2_t iview;
float gcosang, gsinang; float gcosang, gsinang;
FixedBitArray<MAXSECTORS> gotsector; BitArray gotsector;
FixedBitArray<MAXSECTORS*5/4> gotsection2; FixedBitArray<MAXSECTORS*5/4> gotsection2;
BitArray gotwall; BitArray gotwall;
BitArray blockwall; BitArray blockwall;
@ -61,5 +61,5 @@ private:
public: public:
void Init(HWDrawInfo* _di, Clipper* c, vec2_t& view, binangle a1, binangle a2); void Init(HWDrawInfo* _di, Clipper* c, vec2_t& view, binangle a1, binangle a2);
void RenderScene(const int* viewsectors, unsigned sectcount, bool portal); void RenderScene(const int* viewsectors, unsigned sectcount, bool portal);
const FixedBitArray<MAXSECTORS>& GotSector() const { return gotsector; } const BitArray& GotSector() const { return gotsector; }
}; };

2
source/core/rendering/scene/hw_drawinfo.cpp
View file

@ -51,7 +51,7 @@ CVAR(Bool, gl_texture, true, 0)
CVAR(Float, gl_mask_threshold, 0.5f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Float, gl_mask_threshold, 0.5f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Float, gl_mask_sprite_threshold, 0.5f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Float, gl_mask_sprite_threshold, 0.5f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
FixedBitArray<MAXSECTORS> gotsector; BitArray gotsector;
//========================================================================== //==========================================================================
// //

2
source/core/savegamehelp.cpp
View file

@ -705,7 +705,7 @@ void SerializeMap(FSerializer& arc)
{ {
setWallSectors(); setWallSectors();
hw_BuildSections(); hw_BuildSections();
sectorGeometry.SetSize(numsections); sectorGeometry.SetSize(Sections.Size());
} }
} }

6
source/core/sectorgeometry.cpp
View file

@ -218,7 +218,7 @@ public:
bool SectorGeometry::MakeVertices(unsigned int secnum, int plane, const FVector2& offset) bool SectorGeometry::MakeVertices(unsigned int secnum, int plane, const FVector2& offset)
{ {
auto sec = &sections[secnum]; auto sec = &Sections[secnum];
auto sectorp = &sector[sec->sector]; auto sectorp = &sector[sec->sector];
int numvertices = sec->lines.Size(); int numvertices = sec->lines.Size();
@ -333,7 +333,7 @@ bool SectorGeometry::MakeVertices(unsigned int secnum, int plane, const FVector2
bool SectorGeometry::MakeVertices2(unsigned int secnum, int plane, const FVector2& offset) bool SectorGeometry::MakeVertices2(unsigned int secnum, int plane, const FVector2& offset)
{ {
auto sec = &sections[secnum]; auto sec = &Sections[secnum];
auto sectorp = &sector[sec->sector]; auto sectorp = &sector[sec->sector];
int numvertices = sec->lines.Size(); int numvertices = sec->lines.Size();
@ -544,7 +544,7 @@ nexti:;
void SectorGeometry::ValidateSector(unsigned int secnum, int plane, const FVector2& offset) void SectorGeometry::ValidateSector(unsigned int secnum, int plane, const FVector2& offset)
{ {
auto sec = &sector[sections[secnum].sector]; auto sec = &sector[Sections[secnum].sector];
auto compare = &data[secnum].compare[plane]; auto compare = &data[secnum].compare[plane];
if (plane == 0) if (plane == 0)

2
source/games/blood/src/db.cpp
View file

@ -726,7 +726,7 @@ void dbLoadMap(const char* pPath, int* pX, int* pY, int* pZ, short* pAngle, sect
setWallSectors(); setWallSectors();
hw_BuildSections(); hw_BuildSections();
sectorGeometry.SetSize(numsections); sectorGeometry.SetSize(Sections.Size());
wallbackup = wall; wallbackup = wall;
sectorbackup = sector; sectorbackup = sector;
} }