X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=f8a17964cd24b1b5173e733d1207ed5d14efd99f;hp=d8466ddfc90c9ca45c595699c7ccb80f4bf004f1;hb=c4f8f7c6c7e43fc9fd5358197ca866b4186f636c;hpb=63e9d774c858dfe79264a24ae8daa3dde3c7bb6e diff --git a/src/document.cpp b/src/document.cpp index d8466dd..f8a1796 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -225,16 +225,16 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare switch (type) { case QTC_TOP_LEFT: - orig_node = m_quadtree.nodes[orig_parent].top_left = new_index; + orig_node = m_quadtree.nodes[orig_parent].top_left; break; case QTC_TOP_RIGHT: - orig_node = m_quadtree.nodes[orig_parent].top_right = new_index; + orig_node = m_quadtree.nodes[orig_parent].top_right; break; case QTC_BOTTOM_LEFT: - orig_node = m_quadtree.nodes[orig_parent].bottom_left = new_index; + orig_node = m_quadtree.nodes[orig_parent].bottom_left; break; case QTC_BOTTOM_RIGHT: - orig_node = m_quadtree.nodes[orig_parent].bottom_right = new_index; + orig_node = m_quadtree.nodes[orig_parent].bottom_right; break; default: Fatal("Tried to overlay a QuadTree child of invalid type!"); @@ -244,7 +244,8 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare // Add us to the node's overlay linked list. QuadTreeIndex prev_overlay = orig_node; - while (m_quadtree.nodes[prev_overlay].next_overlay != -1); + while (m_quadtree.nodes[prev_overlay].next_overlay != -1) prev_overlay = m_quadtree.nodes[prev_overlay].next_overlay; + Debug("- Original node %d, Previous overlay %d, new overlay %d", orig_node, prev_overlay, new_index); m_quadtree.nodes[prev_overlay].next_overlay = new_index; // Recurse into any extant children. @@ -258,6 +259,7 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare OverlayQuadChildren(orig_node, new_index, QTC_BOTTOM_RIGHT); m_quadtree.nodes[new_index].object_dirty = m_quadtree.nodes[new_index].object_end; + m_quadtree.nodes[new_index].next_overlay = -1; } void Document::PropagateQuadChanges(QuadTreeIndex node)