X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=b8e101973a97c13b7254d32110f3e035ddc1aff9;hp=a953579e1ef307b4639cc0c2424c4f5b3d455102;hb=ae6af9f5e166d675a7139ec6dffee4ccab4347bc;hpb=6dd539966821debd18e0b86ed126742cd81d7fc9 diff --git a/src/view.cpp b/src/view.cpp index a953579..b8e1019 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -20,7 +20,9 @@ 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_perform_shading(USE_SHADING), m_show_bezier_bounds(false), m_show_bezier_type(false), + m_show_fill_points(false), m_show_fill_bounds(false), m_lazy_rendering(true) { Debug("View Created - Bounds => {%s}", m_bounds.Str().c_str()); @@ -32,7 +34,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(); + m_object_renderers[PATH] = new PathRenderer(); // To add rendering for a new type of object; // 1. Add enum to ObjectType in ipdf.h @@ -42,7 +44,7 @@ View::View(Document & document, Screen & screen, const Rect & bounds, const Colo #ifndef QUADTREE_DISABLED - m_quadtree_max_depth = 1; + m_quadtree_max_depth = 2; m_current_quadtree_node = document.GetQuadTree().root_id; #endif } @@ -71,7 +73,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; @@ -143,7 +160,7 @@ void View::Render(int width, int height) } // View bounds have not changed; blit the FrameBuffer as it is - if (!m_bounds_dirty) + if (!m_bounds_dirty && m_lazy_rendering) { m_cached_display.UnBind(); m_cached_display.Blit(); @@ -154,9 +171,9 @@ void View::Render(int width, int height) m_cached_display.Clear(); #ifndef QUADTREE_DISABLED - if (m_bounds_dirty) + if (m_bounds_dirty || !m_lazy_rendering) { - 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) + if ( false && (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) @@ -212,6 +229,15 @@ void View::Render(int width, int height) } 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); + + Rect view_top_bounds = m_bounds; + QuadTreeIndex tmp = m_current_quadtree_node; + while (tmp != -1) + { + view_top_bounds = TransformFromQuadChild(view_top_bounds, m_document.GetQuadTree().nodes[tmp].child_type); + tmp = m_document.GetQuadTree().nodes[tmp].parent; + } + m_screen.DebugFontPrintF("Equivalent View Bounds: %s\n", view_top_bounds.Str().c_str()); #endif if (!m_use_gpu_rendering) @@ -237,7 +263,7 @@ void View::Render(int width, int height) { m_screen.RenderPixels(0,0,width, height, m_cpu_rendering_pixels); //TODO: Make this work :( // Debug for great victory (do something similar for GPU and compare?) - ObjectRenderer::SaveBMP({m_cpu_rendering_pixels, width, height}, "cpu_rendering_last_frame.bmp"); + //ObjectRenderer::SaveBMP({m_cpu_rendering_pixels, width, height}, "cpu_rendering_last_frame.bmp"); } m_cached_display.UnBind(); // resets render target to the screen m_cached_display.Blit(); // blit FrameBuffer to screen @@ -247,6 +273,7 @@ void View::Render(int width, int height) #ifndef CONTROLPANEL_DISABLED ControlPanel::Update(); #endif //CONTROLPANEL_DISABLED + //Debug("Completed Render"); } @@ -260,6 +287,58 @@ void View::RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int rem m_bounds_dirty = true; RenderRange(width, height, m_document.GetQuadTree().nodes[node].object_begin, m_document.GetQuadTree().nodes[node].object_end); + if (m_bounds.Intersects(Rect(-1,-1,1,1))) + { + m_bounds = Rect(m_bounds.x - 1, m_bounds.y - 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, -1, -1), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(-1,0,1,1))) + { + m_bounds = Rect(m_bounds.x - 1, m_bounds.y, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, -1, 0), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(-1,1,1,1))) + { + m_bounds = Rect(m_bounds.x - 1, m_bounds.y + 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, -1, 1), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(0,-1,1,1))) + { + m_bounds = Rect(m_bounds.x, m_bounds.y - 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, 0, -1), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(0,1,1,1))) + { + m_bounds = Rect(m_bounds.x, m_bounds.y + 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, 0, 1), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(1,-1,1,1))) + { + m_bounds = Rect(m_bounds.x + 1, m_bounds.y - 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, 1, -1), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(1,0,1,1))) + { + m_bounds = Rect(m_bounds.x + 1, m_bounds.y, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, 1, 0), remaining_depth - 1); + } + if (m_bounds.Intersects(Rect(1,1,1,1))) + { + m_bounds = Rect(m_bounds.x + 1, m_bounds.y + 1, m_bounds.w, m_bounds.h); + m_bounds_dirty = true; + RenderQuadtreeNode(width, height, m_document.GetQuadTree().GetNeighbour(node, 1, 1), remaining_depth - 1); + } + m_bounds = old_bounds; + m_bounds_dirty = true; + +#if 0 m_bounds = TransformToQuadChild(old_bounds, QTC_TOP_LEFT); m_bounds_dirty = true; RenderQuadtreeNode(width, height, m_document.GetQuadTree().nodes[node].top_left, remaining_depth-1); @@ -274,6 +353,7 @@ void View::RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int rem RenderQuadtreeNode(width, height, m_document.GetQuadTree().nodes[node].bottom_right, remaining_depth-1); m_bounds = old_bounds; m_bounds_dirty = true; +#endif } #endif @@ -283,8 +363,11 @@ void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_ if (m_render_dirty) // document has changed PrepareRender(); - if (m_buffer_dirty || m_bounds_dirty) // object bounds have changed - UpdateObjBoundsVBO(first_obj, last_obj); + if (m_buffer_dirty || m_bounds_dirty || !m_lazy_rendering) // object bounds have changed + { + if (m_use_gpu_rendering) + UpdateObjBoundsVBO(first_obj, last_obj); + } if (m_use_gpu_transform) { @@ -384,10 +467,13 @@ void View::PrepareRender() { Debug("Recreate buffers with %u objects", m_document.ObjectCount()); // Prepare bounds vbo - m_bounds_ubo.Invalidate(); - m_bounds_ubo.SetType(GraphicsBuffer::BufferTypeUniform); - m_bounds_ubo.SetUsage(GraphicsBuffer::BufferUsageStreamDraw); - m_bounds_ubo.SetName("m_bounds_ubo: Screen bounds."); + if (UsingGPURendering()) + { + m_bounds_ubo.Invalidate(); + m_bounds_ubo.SetType(GraphicsBuffer::BufferTypeUniform); + m_bounds_ubo.SetUsage(GraphicsBuffer::BufferUsageStreamDraw); + m_bounds_ubo.SetName("m_bounds_ubo: Screen bounds."); + } // Instead of having each ObjectRenderer go through the whole document // we initialise them, go through the document once adding to the appropriate Renderers @@ -410,11 +496,31 @@ void View::PrepareRender() //Debug("Object of type %d", type); } + // Finish the buffers for (unsigned i = 0; i < m_object_renderers.size(); ++i) { m_object_renderers[i]->FinaliseBuffers(); } - dynamic_cast(m_object_renderers[BEZIER])->PrepareBezierGPUBuffer(m_document.m_objects); + if (UsingGPURendering()) + dynamic_cast(m_object_renderers[BEZIER])->PrepareBezierGPUBuffer(m_document.m_objects); m_render_dirty = false; } + +void View::SaveCPUBMP(const char * filename) +{ + bool prev = UsingGPURendering(); + SetGPURendering(false); + Render(800, 600); + ObjectRenderer::SaveBMP({m_cpu_rendering_pixels, 800, 600}, filename); + SetGPURendering(prev); +} + +void View::SaveGPUBMP(const char * filename) +{ + bool prev = UsingGPURendering(); + SetGPURendering(true); + Render(800,600); + m_screen.ScreenShot(filename); + SetGPURendering(prev); +}