X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=a7fb5243c54b72e599be6bbb820c3e7f48104243;hp=d8466ddfc90c9ca45c595699c7ccb80f4bf004f1;hb=54cbdc5600ed4280f1e33f9f1f4780e48713c352;hpb=63e9d774c858dfe79264a24ae8daa3dde3c7bb6e diff --git a/src/document.cpp b/src/document.cpp index d8466dd..a7fb524 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1,5 +1,6 @@ #include "document.h" #include "bezier.h" +#include "profiler.h" #include #include @@ -101,6 +102,7 @@ void Document::GenBaseQuadtree() int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) { + PROFILE_SCOPE("Document::ClipObjectToQuadChild"); switch (m_objects.types[object_id]) { case RECT_FILLED: @@ -168,6 +170,7 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) } QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type) { + PROFILE_SCOPE("Document::GenQuadChild()"); QuadTreeIndex new_index = m_quadtree.nodes.size(); Debug("-------------- Generating Quadtree Node %d (parent %d, type %d) ----------------------", new_index, parent, type); m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0, -1}); @@ -208,6 +211,7 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex parent, QuadTreeNodeChildren type) { + PROFILE_SCOPE("Document::OverlayQuadChildren()"); QuadTreeIndex new_index = m_quadtree.nodes.size(); Debug("-------------- Generating Quadtree Node %d (orig %d parent %d, type %d) ----------------------", new_index, orig_parent, parent, type); m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, orig_parent, type, 0, 0, -1}); @@ -225,16 +229,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 +248,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 +263,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) @@ -411,10 +417,12 @@ unsigned Document::AddBezier(const Bezier & bezier) unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index, QuadTreeIndex qti) { + PROFILE_SCOPE("Document::Add"); m_objects.types.push_back(type); m_objects.bounds.push_back(bounds); m_objects.data_indices.push_back(data_index); #ifndef QUADTREE_DISABLED + if (qti == -1) qti = m_current_insert_node; if (qti != -1) { QuadTreeIndex new_qti = qti; @@ -441,9 +449,8 @@ unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index } done: // matches is not amused, but sulix is nice and moved it inside the #ifdef for him. m_count++; - PropagateQuadChanges(qti); } - return m_count; + return m_count-1; #else // words fail me (still not amused) return (m_count++); #endif @@ -1143,28 +1150,43 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca stbtt_FreeShape(font, instructions); } -void Document::TransformObjectBounds(const SVGMatrix & transform) +void Document::TransformObjectBounds(const SVGMatrix & transform, ObjectType type) { + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.m_bounds.x = transform.a * p.m_bounds.x + transform.e; + p.m_bounds.y = transform.d * p.m_bounds.y + transform.f; + p.m_bounds.w *= transform.a; + p.m_bounds.h *= transform.d; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { - TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform); - m_objects.bounds[i].w *= transform.a; - m_objects.bounds[i].h *= transform.d; + if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type) + { + TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform); + m_objects.bounds[i].w *= transform.a; + m_objects.bounds[i].h *= transform.d; + } } } void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type) { #ifdef TRANSFORM_BEZIERS_TO_PATH - for (unsigned i = 0; i < m_objects.paths.size(); ++i) - { - Path & p = m_objects.paths[i]; - p.m_bounds.x += dx; - p.m_bounds.y += dy; - } - return; - #endif - + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.m_bounds.x += dx; + p.m_bounds.y += dy; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)