Commit 2ff2bfb7 authored by David Flynn's avatar David Flynn
Browse files

geom: dont updateGeometryOccupancyAtlasOccChild() when atlas disabled

This commit fixes the ability to code with neighbourAvailBoundaryLog2=0,
which correctly disabled the contextualisation based on externally
adjacent child neighbours, but failed to disable the atlas update.
parent f8e001ae
...@@ -476,8 +476,10 @@ decodeGeometryOctree( ...@@ -476,8 +476,10 @@ decodeGeometryOctree(
assert(occupancy > 0); assert(occupancy > 0);
// update atlas for advanced neighbours // update atlas for advanced neighbours
updateGeometryOccupancyAtlasOccChild( if (gps.neighbour_avail_boundary_log2) {
node0.pos, nodeSizeLog2, occupancy, &occupancyAtlas); updateGeometryOccupancyAtlasOccChild(
node0.pos, nodeSizeLog2, occupancy, &occupancyAtlas);
}
// population count of occupancy for IDCM // population count of occupancy for IDCM
int numOccupied = popcnt(occupancy); int numOccupied = popcnt(occupancy);
......
...@@ -497,8 +497,10 @@ encodeGeometryOctree( ...@@ -497,8 +497,10 @@ encodeGeometryOctree(
} }
// update atlas for advanced neighbours // update atlas for advanced neighbours
updateGeometryOccupancyAtlasOccChild( if (gps.neighbour_avail_boundary_log2) {
node0.pos, nodeSizeLog2, occupancy, &occupancyAtlas); updateGeometryOccupancyAtlasOccChild(
node0.pos, nodeSizeLog2, occupancy, &occupancyAtlas);
}
// encode child occupancy map // encode child occupancy map
assert(occupancy > 0); assert(occupancy > 0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment