X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=0807643b03d066e4abb701f932a28ac15537544a;hp=2caaadc0709cc7acfdfac032c704cc8439c45f7b;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=35f1190c8c8036ed11180656769cf0c1cbf7c2b3 diff --git a/src/view.cpp b/src/view.cpp index 2caaadc..0807643 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -7,6 +7,13 @@ #include "controlpanel.h" #endif //CONTROLPANEL_DISABLED + +#ifdef TRANSFORM_BEZIERS_TO_PATH + #ifndef TRANSFORM_OBJECTS_NOT_VIEW + //#error Cannot TRANSFORM_BEZIERS_TO_PATH _without_ TRANSFORM_OBJECTS_NOT_VIEW + #endif +#endif + using namespace IPDF; using namespace std; @@ -17,23 +24,34 @@ using namespace std; * @param bounds - Initial bounds of the View * @param colour - Colour to use for rendering this view. TODO: Make sure this actually works, or just remove it */ -View::View(Document & document, Screen & screen, const Rect & bounds, const Colour & colour) +View::View(Document & document, Screen & screen, const VRect & 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_show_object_bounds(false), m_perform_shading(USE_SHADING) + 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()); screen.SetView(this); // oh dear... + + // Create ObjectRenderers - new's match delete's in View::~View //TODO: Don't forget to put new renderers here or things will be segfaultastic - m_object_renderers[RECT_FILLED] = new RectFilledRenderer(); - m_object_renderers[RECT_OUTLINE] = new RectOutlineRenderer(); - m_object_renderers[CIRCLE_FILLED] = new CircleFilledRenderer(); - m_object_renderers[BEZIER] = new BezierRenderer(); - m_object_renderers[PATH] = new PathRenderer(); + if (screen.Valid()) + { + m_object_renderers[RECT_FILLED] = new RectFilledRenderer(); + m_object_renderers[RECT_OUTLINE] = new RectOutlineRenderer(); + m_object_renderers[CIRCLE_FILLED] = new CircleFilledRenderer(); + m_object_renderers[BEZIER] = new BezierRenderer(); + m_object_renderers[PATH] = new PathRenderer(); + } + else + { + for (int i = RECT_FILLED; i <= PATH; ++i) + m_object_renderers[i] = new FakeRenderer(); + } // To add rendering for a new type of object; // 1. Add enum to ObjectType in ipdf.h @@ -43,7 +61,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 } @@ -66,16 +84,25 @@ View::~View() * Translate the view * @param x, y - Amount to translate */ -void View::Translate(Real x, Real y) +void View::Translate(VReal x, VReal y) { + if (!m_use_gpu_transform) + m_buffer_dirty = true; + m_bounds_dirty = true; + #ifdef TRANSFORM_OBJECTS_NOT_VIEW + ObjectType type = NUMBER_OF_OBJECT_TYPES; + #ifdef TRANSFORM_BEZIERS_TO_PATH + type = PATH; + #endif + m_document.TranslateObjects(-x.ToDouble(), -y.ToDouble(), type); + #endif x *= m_bounds.w; y *= m_bounds.h; m_bounds.x += x; m_bounds.y += y; //Debug("View Bounds => %s", m_bounds.Str().c_str()); - if (!m_use_gpu_transform) - m_buffer_dirty = true; - m_bounds_dirty = true; + + } /** @@ -98,17 +125,31 @@ void View::SetBounds(const Rect & bounds) * @param x, y - Coordinates to scale at (eg: Mouse cursor position) * @param scale_amount - Amount to scale by */ -void View::ScaleAroundPoint(Real x, Real y, Real scale_amount) +void View::ScaleAroundPoint(VReal x, VReal y, VReal scale_amount) { + + // (x0, y0, w, h) -> (x*w - (x*w - x0)*s, y*h - (y*h - y0)*s, w*s, h*s) // x and y are coordinates in the window // Convert to local coords. + if (!m_use_gpu_transform) + m_buffer_dirty = true; + m_bounds_dirty = true; + + + #ifdef TRANSFORM_OBJECTS_NOT_VIEW + ObjectType type = NUMBER_OF_OBJECT_TYPES; + #ifdef TRANSFORM_BEZIERS_TO_PATH + type = PATH; + #endif + m_document.ScaleObjectsAboutPoint(x, y, scale_amount, type); + #endif x *= m_bounds.w; y *= m_bounds.h; x += m_bounds.x; y += m_bounds.y; - Real top = y - m_bounds.y; - Real left = x - m_bounds.x; + VReal top = y - m_bounds.y; + VReal left = x - m_bounds.x; top *= scale_amount; left *= scale_amount; @@ -118,9 +159,8 @@ void View::ScaleAroundPoint(Real x, Real y, Real scale_amount) m_bounds.w *= scale_amount; m_bounds.h *= scale_amount; //Debug("Scale at {%s, %s} by %s View Bounds => %s", x.Str().c_str(), y.Str().c_str(), scale_amount.Str().c_str(), m_bounds.Str().c_str()); - if (!m_use_gpu_transform) - m_buffer_dirty = true; - m_bounds_dirty = true; + + } /** @@ -131,12 +171,10 @@ void View::ScaleAroundPoint(Real x, Real y, Real scale_amount) */ Rect View::TransformToViewCoords(const Rect& inp) const { - Rect out; - out.x = (inp.x - m_bounds.x) / m_bounds.w; - out.y = (inp.y - m_bounds.y) / m_bounds.h; - out.w = inp.w / m_bounds.w; - out.h = inp.h / m_bounds.h; - return out; + #ifdef TRANSFORM_OBJECTS_NOT_VIEW + return inp; + #endif + return TransformRectCoordinates(m_bounds, inp); } /** @@ -148,6 +186,7 @@ Rect View::TransformToViewCoords(const Rect& inp) const */ void View::Render(int width, int height) { + if (!m_screen.Valid()) return; glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION,42,-1, "Beginning View::Render()"); // View dimensions have changed (ie: Window was resized) int prev_width = m_cached_display.GetWidth(); @@ -159,7 +198,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(); @@ -170,9 +209,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 ( 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) @@ -181,6 +220,32 @@ void View::Render(int width, int height) m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].parent; } } + + // TODO: Support generating new parent nodes. + if (false && m_document.GetQuadTree().nodes[m_current_quadtree_node].parent != QUADTREE_EMPTY) + { + if (m_bounds.x < -0.5) + { + m_bounds = Rect(m_bounds.x + 1, m_bounds.y, m_bounds.w, m_bounds.h); + m_current_quadtree_node = m_document.GetQuadTree().GetNeighbour(m_current_quadtree_node, -1, 0, &m_document); + } + if (m_bounds.y < -0.5) + { + m_bounds = Rect(m_bounds.x, m_bounds.y + 1, m_bounds.w, m_bounds.h); + m_current_quadtree_node = m_document.GetQuadTree().GetNeighbour(m_current_quadtree_node, 0, -1, &m_document); + } + if (m_bounds.w + m_bounds.x > 0.5) + { + m_bounds = Rect(m_bounds.x - 1, m_bounds.y, m_bounds.w, m_bounds.h); + m_current_quadtree_node = m_document.GetQuadTree().GetNeighbour(m_current_quadtree_node, 1, 0, &m_document); + } + if (m_bounds.h + m_bounds.y > 0.5) + { + m_bounds = Rect(m_bounds.x, m_bounds.y - 1, m_bounds.w, m_bounds.h); + m_current_quadtree_node = m_document.GetQuadTree().GetNeighbour(m_current_quadtree_node, 0, 1, &m_document); + } + } + if (ContainedInQuadChild(m_bounds, QTC_TOP_LEFT)) { if (m_document.GetQuadTree().nodes[m_current_quadtree_node].top_left == QUADTREE_EMPTY) @@ -226,8 +291,25 @@ void View::Render(int width, int height) m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_right; } } - 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); + + m_screen.DebugFontPrintF("Current View QuadTree"); + QuadTreeIndex overlay = m_current_quadtree_node; + while (overlay != -1) + { + m_screen.DebugFontPrintF(" Node: %d (objs: %d -> %d)", overlay, m_document.GetQuadTree().nodes[overlay].object_begin, + m_document.GetQuadTree().nodes[overlay].object_end); + overlay = m_document.GetQuadTree().nodes[overlay].next_overlay; + } + m_screen.DebugFontPrintF("\n"); + + 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) @@ -263,6 +345,7 @@ void View::Render(int width, int height) #ifndef CONTROLPANEL_DISABLED ControlPanel::Update(); #endif //CONTROLPANEL_DISABLED + //Debug("Completed Render"); } @@ -274,8 +357,72 @@ void View::RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int rem if (!remaining_depth) return; //Debug("Rendering QT node %d, (objs: %d -- %d)\n", node, m_document.GetQuadTree().nodes[node].object_begin, m_document.GetQuadTree().nodes[node].object_end); m_bounds_dirty = true; - RenderRange(width, height, m_document.GetQuadTree().nodes[node].object_begin, m_document.GetQuadTree().nodes[node].object_end); + QuadTreeIndex overlay = node; + while(overlay != -1) + { + RenderRange(width, height, m_document.GetQuadTree().nodes[overlay].object_begin, m_document.GetQuadTree().nodes[overlay].object_end); + overlay = m_document.GetQuadTree().nodes[overlay].next_overlay; + } + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), remaining_depth - 1); + } + m_bounds = old_bounds; + 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, &m_document), 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); @@ -290,6 +437,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 @@ -299,13 +447,22 @@ 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) { + #ifdef TRANSFORM_OBJECTS_NOT_VIEW + //Debug("Transform objects, not view"); + GLfloat glbounds[] = {0.0f, 0.0f, 1.0f, 1.0f, + 0.0f, 0.0f, float(width), float(height)}; + #else GLfloat glbounds[] = {static_cast(Float(m_bounds.x)), static_cast(Float(m_bounds.y)), static_cast(Float(m_bounds.w)), static_cast(Float(m_bounds.h)), 0.0, 0.0, static_cast(width), static_cast(height)}; + #endif m_bounds_ubo.Upload(sizeof(float)*8, glbounds); } else @@ -357,11 +514,14 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj) //m_objbounds_vbo.Invalidate(); m_objbounds_vbo.SetType(GraphicsBuffer::BufferTypeVertex); m_objbounds_vbo.SetName("Object Bounds VBO"); + + #ifndef TRANSFORM_OBJECTS_NOT_VIEW if (m_use_gpu_transform) { m_objbounds_vbo.SetUsage(GraphicsBuffer::BufferUsageStaticDraw); } else + #endif //TRANSFORM_OBJECTS_NOT_VIEW { m_objbounds_vbo.SetUsage(GraphicsBuffer::BufferUsageDynamicCopy); } @@ -369,6 +529,7 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj) 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()); + #ifndef TRANSFORM_BEZIERS_TO_PATH for (unsigned id = first_obj; id < last_obj; ++id) { Rect obj_bounds; @@ -386,9 +547,48 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj) (float)Float(obj_bounds.x + obj_bounds.w), (float)Float(obj_bounds.y + obj_bounds.h) }; - obj_bounds_builder.Add(gpu_bounds); + obj_bounds_builder.Add(gpu_bounds); + } + #else + for (unsigned i = 0; i < m_document.m_objects.paths.size(); ++i) + { + Path & path = m_document.m_objects.paths[i]; + Rect & pbounds = path.GetBounds(m_document.m_objects); // Not very efficient... + for (unsigned id = path.m_start; id <= path.m_end; ++id) + { + if (id < first_obj || id >= last_obj) + continue; + + Rect obj_bounds = m_document.m_objects.bounds[id]; + + obj_bounds.x *= pbounds.w; + obj_bounds.x += pbounds.x; + obj_bounds.y *= pbounds.h; + obj_bounds.y += pbounds.y; + obj_bounds.w *= pbounds.w; + obj_bounds.h *= pbounds.h; + + if (!m_use_gpu_transform) + obj_bounds = TransformToViewCoords(obj_bounds); + GPUObjBounds gpu_bounds = { + Float(obj_bounds.x), + Float(obj_bounds.y), + Float(obj_bounds.x + obj_bounds.w), + Float(obj_bounds.y + obj_bounds.h) + }; + obj_bounds_builder.Add(gpu_bounds); + //Debug("Path %d %s -> %s via %s", id, m_document.m_objects.bounds[id].Str().c_str(), obj_bounds.Str().c_str(), pbounds.Str().c_str()); + } + GPUObjBounds p_gpu_bounds = { + Float(pbounds.x), + Float(pbounds.y), + Float(pbounds.x + pbounds.w), + Float(pbounds.y + pbounds.h) + }; + obj_bounds_builder.Add(p_gpu_bounds); } + #endif m_objbounds_vbo.UnMap(); } /** @@ -400,10 +600,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 @@ -426,11 +629,33 @@ 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); +}