olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vis: migrate CalcPHS from DecompressRow to Mod_Q1BSP_DecompressVis

This commit is contained in:
Eric Wasylishen 2023-01-08 15:27:07 -07:00
parent 52fcb7a234
commit dc0ea62a0e
3 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/bsputils.cc
View File

@ -594,37 +594,6 @@ void CompressRow(const uint8_t *vis, const size_t numbytes, std::back_insert_ite
} }
} }
/*
===================
DecompressRow
===================
*/
void DecompressRow(const uint8_t *in, const int numbytes, uint8_t *decompressed)
{
int c;
uint8_t *out;
int row;
row = numbytes;
out = decompressed;
do {
if (*in) {
*out++ = *in++;
continue;
}
c = in[1];
if (!c)
FError("0 repeat");
in += 2;
while (c) {
*out++ = 0;
c--;
}
} while (out - decompressed < row);
}
size_t DecompressedVisSize(const mbsp_t *bsp) size_t DecompressedVisSize(const mbsp_t *bsp)
{ {
if (bsp->loadversion->game->id == GAME_QUAKE_II) { if (bsp->loadversion->game->id == GAME_QUAKE_II) {

1
include/common/bsputils.hh
View File

@ -106,7 +106,6 @@ qvec3f Face_Centroid(const mbsp_t *bsp, const mface_t *face);
void Face_DebugPrint(const mbsp_t *bsp, const mface_t *face); void Face_DebugPrint(const mbsp_t *bsp, const mface_t *face);
void CompressRow(const uint8_t *vis, const size_t numbytes, std::back_insert_iterator<std::vector<uint8_t>> it); void CompressRow(const uint8_t *vis, const size_t numbytes, std::back_insert_iterator<std::vector<uint8_t>> it);
void DecompressRow(const uint8_t *in, const int numbytes, uint8_t *decompressed);
size_t DecompressedVisSize(const mbsp_t *bsp); size_t DecompressedVisSize(const mbsp_t *bsp);
void Mod_Q1BSP_DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend); void Mod_Q1BSP_DecompressVis(const uint8_t *in, const uint8_t *inend, uint8_t *out, uint8_t *outend);

17
vis/soundpvs.cc
View File

@ -168,21 +168,15 @@ void CalcPHS(mbsp_t *bsp)
std::vector<uint8_t> compressed(leafbytes * 2); std::vector<uint8_t> compressed(leafbytes * 2);
std::vector<uint8_t> uncompressed_orig(leafbytes); std::vector<uint8_t> uncompressed_orig(leafbytes);
std::vector<uint8_t> uncompressed_test(leafbytes);
int32_t count = 0; int32_t count = 0;
for (int32_t i = 0; i < portalleafs; i++) { for (int32_t i = 0; i < portalleafs; i++) {
const uint8_t *scan = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, i); const uint8_t *scan = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, i);
DecompressRow(scan, leafbytes, uncompressed.data());
std::copy(uncompressed.begin(), uncompressed.end(), uncompressed_orig.begin());
// migrating to this... for now, just check it produces the same value as the legacy function
Mod_Q1BSP_DecompressVis(scan, Mod_Q1BSP_DecompressVis(scan,
bsp->dvis.bits.data() + bsp->dvis.bits.size(), bsp->dvis.bits.data() + bsp->dvis.bits.size(),
uncompressed_test.data(), uncompressed.data(),
uncompressed_test.data() + uncompressed_test.size()); uncompressed.data() + uncompressed.size());
Q_assert(uncompressed_test == uncompressed); std::copy(uncompressed.begin(), uncompressed.end(), uncompressed_orig.begin());
scan = uncompressed_orig.data(); scan = uncompressed_orig.data();
@ -198,7 +192,10 @@ void CalcPHS(mbsp_t *bsp)
if (index >= portalleafs) if (index >= portalleafs)
FError("Bad bit in PVS"); // pad bits should be 0 FError("Bad bit in PVS"); // pad bits should be 0
const uint8_t *src_compressed = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, index); const uint8_t *src_compressed = bsp->dvis.bits.data() + bsp->dvis.get_bit_offset(VIS_PVS, index);
DecompressRow(src_compressed, leafbytes, uncompressed_2.data()); Mod_Q1BSP_DecompressVis(src_compressed,
bsp->dvis.bits.data() + bsp->dvis.bits.size(),
uncompressed_2.data(),
uncompressed_2.data() + uncompressed_2.size());
const long *src = reinterpret_cast<long *>(uncompressed_2.data()); const long *src = reinterpret_cast<long *>(uncompressed_2.data());
long *dest = reinterpret_cast<long *>(uncompressed.data()); long *dest = reinterpret_cast<long *>(uncompressed.data());
for (int32_t l = 0; l < leaflongs; l++) for (int32_t l = 0; l < leaflongs; l++)