X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=48e0a5ac5777e8eca013bde71cdc6be4d8b2d178;hp=749df66d107f22f7dd1cfd51b6e1e590979dd39c;hb=d83560835237d360f6d12776435e91676c8ab45f;hpb=4f60a4a972fa76800580f8731aba54a8fe94e1fb diff --git a/src/view.cpp b/src/view.cpp index 749df66..48e0a5a 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -3,6 +3,10 @@ #include "screen.h" #include "gl_core44.h" +#ifndef CONTROLPANEL_DISABLED + #include "controlpanel.h" +#endif //CONTROLPANEL_DISABLED + using namespace IPDF; using namespace std; @@ -16,7 +20,8 @@ using namespace std; View::View(Document & document, Screen & screen, const Rect & bounds, const Colour & colour) : m_use_gpu_transform(USE_GPU_TRANSFORM), m_use_gpu_rendering(USE_GPU_RENDERING), m_bounds_dirty(true), m_buffer_dirty(true), m_render_dirty(true), m_document(document), m_screen(screen), m_cached_display(), m_bounds(bounds), m_colour(colour), m_bounds_ubo(), - m_objbounds_vbo(), m_object_renderers(NUMBER_OF_OBJECT_TYPES), m_cpu_rendering_pixels(NULL) + m_objbounds_vbo(), m_object_renderers(NUMBER_OF_OBJECT_TYPES), m_cpu_rendering_pixels(NULL), + m_show_object_bounds(false), m_perform_shading(USE_SHADING) { Debug("View Created - Bounds => {%s}", m_bounds.Str().c_str()); @@ -28,6 +33,7 @@ View::View(Document & document, Screen & screen, const Rect & bounds, const Colo m_object_renderers[RECT_OUTLINE] = new RectOutlineRenderer(); m_object_renderers[CIRCLE_FILLED] = new CircleFilledRenderer(); m_object_renderers[BEZIER] = new BezierRenderer(); + m_object_renderers[GROUP] = new GroupRenderer(); // To add rendering for a new type of object; // 1. Add enum to ObjectType in ipdf.h @@ -37,7 +43,7 @@ View::View(Document & document, Screen & screen, const Rect & bounds, const Colo #ifndef QUADTREE_DISABLED - m_quadtree_max_depth = 2; + m_quadtree_max_depth = 1; m_current_quadtree_node = document.GetQuadTree().root_id; #endif } @@ -66,7 +72,22 @@ void View::Translate(Real x, Real y) y *= m_bounds.h; m_bounds.x += x; m_bounds.y += y; - Debug("View Bounds => %s", m_bounds.Str().c_str()); + //Debug("View Bounds => %s", m_bounds.Str().c_str()); + if (!m_use_gpu_transform) + m_buffer_dirty = true; + m_bounds_dirty = true; +} + +/** + * Set View bounds + * @param bounds - New bounds + */ +void View::SetBounds(const Rect & bounds) +{ + m_bounds.x = bounds.x; + m_bounds.y = bounds.y; + m_bounds.w = bounds.w; + m_bounds.h = bounds.h; if (!m_use_gpu_transform) m_buffer_dirty = true; m_bounds_dirty = true; @@ -151,18 +172,62 @@ void View::Render(int width, int height) #ifndef QUADTREE_DISABLED if (m_bounds_dirty) { - if (ContainedInQuadChild(m_bounds, QTC_TOP_LEFT) && m_document.GetQuadTree().nodes[m_current_quadtree_node].top_left != QUADTREE_EMPTY) + if (m_bounds.x > 1.0 || m_bounds.x < 0.0 || m_bounds.y > 1.0 || m_bounds.y < 0.0 || m_bounds.w > 1.0 || m_bounds.h > 1.0) { + //TODO: Generate a new parent node. + if (m_document.GetQuadTree().nodes[m_current_quadtree_node].parent != QUADTREE_EMPTY) + { + m_bounds = TransformFromQuadChild(m_bounds, m_document.GetQuadTree().nodes[m_current_quadtree_node].child_type); + m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].parent; + } + } + if (ContainedInQuadChild(m_bounds, QTC_TOP_LEFT)) + { + if (m_document.GetQuadTree().nodes[m_current_quadtree_node].top_left == QUADTREE_EMPTY) + { + // We want to reparent into a child node, but none exist. Get the document to create one. + m_document.GenQuadChild(m_current_quadtree_node, QTC_TOP_LEFT); + m_render_dirty = true; + } m_bounds = TransformToQuadChild(m_bounds, QTC_TOP_LEFT); m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].top_left; } - if ((m_bounds.w > 1 || m_bounds.h > 1) && m_document.GetQuadTree().nodes[m_current_quadtree_node].parent != QUADTREE_EMPTY) + if (ContainedInQuadChild(m_bounds, QTC_TOP_RIGHT)) + { + if (m_document.GetQuadTree().nodes[m_current_quadtree_node].top_right == QUADTREE_EMPTY) + { + // We want to reparent into a child node, but none exist. Get the document to create one. + m_document.GenQuadChild(m_current_quadtree_node, QTC_TOP_RIGHT); + m_render_dirty = true; + } + m_bounds = TransformToQuadChild(m_bounds, QTC_TOP_RIGHT); + m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].top_right; + } + if (ContainedInQuadChild(m_bounds, QTC_BOTTOM_LEFT)) { - m_bounds = TransformFromQuadChild(m_bounds, m_document.GetQuadTree().nodes[m_current_quadtree_node].child_type); - m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].parent; + if (m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_left == QUADTREE_EMPTY) + { + // We want to reparent into a child node, but none exist. Get the document to create one. + m_document.GenQuadChild(m_current_quadtree_node, QTC_BOTTOM_LEFT); + m_render_dirty = true; + } + m_bounds = TransformToQuadChild(m_bounds, QTC_BOTTOM_LEFT); + m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_left; + } + if (ContainedInQuadChild(m_bounds, QTC_BOTTOM_RIGHT)) + { + if (m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_right == QUADTREE_EMPTY) + { + // We want to reparent into a child node, but none exist. Get the document to create one. + m_document.GenQuadChild(m_current_quadtree_node, QTC_BOTTOM_RIGHT); + m_render_dirty = true; + } + m_bounds = TransformToQuadChild(m_bounds, QTC_BOTTOM_RIGHT); + m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_right; } } - m_screen.DebugFontPrintF("Current View QuadTree Node: %d\n", m_current_quadtree_node); + m_screen.DebugFontPrintF("Current View QuadTree Node: %d (objs: %d -> %d)\n", m_current_quadtree_node, m_document.GetQuadTree().nodes[m_current_quadtree_node].object_begin, + m_document.GetQuadTree().nodes[m_current_quadtree_node].object_end); #endif if (!m_use_gpu_rendering) @@ -194,6 +259,11 @@ void View::Render(int width, int height) m_cached_display.Blit(); // blit FrameBuffer to screen m_buffer_dirty = false; glPopDebugGroup(); + +#ifndef CONTROLPANEL_DISABLED + ControlPanel::Update(); +#endif //CONTROLPANEL_DISABLED + } #ifndef QUADTREE_DISABLED @@ -293,11 +363,11 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj) } else { - m_objbounds_vbo.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw); + m_objbounds_vbo.SetUsage(GraphicsBuffer::BufferUsageDynamicCopy); } m_objbounds_vbo.Resize(m_document.ObjectCount()*sizeof(GPUObjBounds)); - BufferBuilder obj_bounds_builder(m_objbounds_vbo.MapRange(first_obj*sizeof(GPUObjBounds), (last_obj-first_obj)*sizeof(GPUObjBounds), false, true, false), m_objbounds_vbo.GetSize()); + BufferBuilder obj_bounds_builder(m_objbounds_vbo.MapRange(first_obj*sizeof(GPUObjBounds), (last_obj-first_obj)*sizeof(GPUObjBounds), false, true, true), m_objbounds_vbo.GetSize()); for (unsigned id = first_obj; id < last_obj; ++id) {