qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-02 07:12:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[model] Trim decompressed vis sets

Browse source 
I had been trimming for the solid leaf, but not the empty leafs. I had
assumed the vis tool would trim the bits, but it seems to not be
reliable (though it could be a bug in qfvis, I think the map in question
is one of my test maps).
This commit is contained in:
Bill Currie 2022-05-27 12:21:50 +09:00
parent 61178978be
commit 45b3ef79c8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/models/brush/model_brush.c
View file

@ -153,13 +153,13 @@ Mod_LeafPVS (const mleaf_t *leaf, const model_t *model)
static set_t *novis; static set_t *novis;
static set_t *decompressed; static set_t *decompressed;
unsigned numvis = model->brush.visleafs; unsigned numvis = model->brush.visleafs;
unsigned excess = SET_SIZE (numvis) - numvis;
if (leaf == model->brush.leafs) { if (leaf == model->brush.leafs) {
if (!novis) { if (!novis) {
novis = set_new_size (numvis); novis = set_new_size (numvis);
} }
if (!novis->map[0] || SET_SIZE (numvis) > novis->size) { if (!novis->map[0] || SET_SIZE (numvis) > novis->size) {
unsigned excess = SET_SIZE (numvis) - numvis;
set_expand (novis, numvis); set_expand (novis, numvis);
memset (novis->map, 0xff, memset (novis->map, 0xff,
SET_WORDS (novis) * sizeof (*novis->map)); SET_WORDS (novis) * sizeof (*novis->map));
@ -173,6 +173,7 @@ Mod_LeafPVS (const mleaf_t *leaf, const model_t *model)
set_expand (decompressed, numvis); set_expand (decompressed, numvis);
Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, 0xff, Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, 0xff,
decompressed); decompressed);
decompressed->map[SET_WORDS (decompressed) - 1] &= (~SET_ZERO) >> excess;
return decompressed; return decompressed;
} }
@ -181,14 +182,16 @@ Mod_LeafPVS_set (const mleaf_t *leaf, const model_t *model, byte defvis,
set_t *out) set_t *out)
{ {
unsigned numvis = model->brush.visleafs; unsigned numvis = model->brush.visleafs;
unsigned excess = SET_SIZE (numvis) - numvis;
set_expand (out, numvis); set_expand (out, numvis);
if (leaf == model->brush.leafs) { if (leaf == model->brush.leafs) {
unsigned excess = SET_SIZE (numvis) - numvis;
memset (out->map, defvis, SET_WORDS (out) * sizeof (*out->map)); memset (out->map, defvis, SET_WORDS (out) * sizeof (*out->map));
out->map[SET_WORDS (out) - 1] &= (~SET_ZERO) >> excess; out->map[SET_WORDS (out) - 1] &= (~SET_ZERO) >> excess;
return; return;
} }
Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, defvis, out); Mod_DecompressVis_set (leaf->compressed_vis, &model->brush, defvis, out);
out->map[SET_WORDS (out) - 1] &= (~SET_ZERO) >> excess;
} }
VISIBLE void VISIBLE void
@ -196,9 +199,10 @@ Mod_LeafPVS_mix (const mleaf_t *leaf, const model_t *model, byte defvis,
set_t *out) set_t *out)
{ {
unsigned numvis = model->brush.visleafs; unsigned numvis = model->brush.visleafs;
unsigned excess = SET_SIZE (numvis) - numvis;
set_expand (out, numvis); set_expand (out, numvis);
if (leaf == model->brush.leafs) { if (leaf == model->brush.leafs) {
unsigned excess = SET_SIZE (numvis) - numvis;
byte *o = (byte *) out->map; byte *o = (byte *) out->map;
for (int i = SET_WORDS (out) * sizeof (*out->map); i-- > 0; ) { for (int i = SET_WORDS (out) * sizeof (*out->map); i-- > 0; ) {
*o++ |= defvis; *o++ |= defvis;
@ -207,6 +211,7 @@ Mod_LeafPVS_mix (const mleaf_t *leaf, const model_t *model, byte defvis,
return; return;
} }
Mod_DecompressVis_mix (leaf->compressed_vis, &model->brush, defvis, out); Mod_DecompressVis_mix (leaf->compressed_vis, &model->brush, defvis, out);
out->map[SET_WORDS (out) - 1] &= (~SET_ZERO) >> excess;
} }
// BRUSHMODEL LOADING ========================================================= // BRUSHMODEL LOADING =========================================================