X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fview.cpp;h=9ad633c8c370e9fcddd569655532d1aa4fb3f65e;hb=58a6719da2337b3e6e20b581885f170bbe5fc480;hp=4e031365173eea801a01a852f94ffa31734f8b9b;hpb=ea4829e265bd45b9c1b8556463d10ee1e082c6ce;p=ipdf%2Fcode.git diff --git a/src/view.cpp b/src/view.cpp index 4e03136..9ad633c 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; @@ -28,13 +35,23 @@ View::View(Document & document, Screen & screen, const Rect & bounds, const Colo 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 @@ -69,14 +86,23 @@ View::~View() */ void View::Translate(Real x, Real 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, -y, 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; + + } /** @@ -101,8 +127,22 @@ void View::SetBounds(const Rect & bounds) */ void View::ScaleAroundPoint(Real x, Real y, Real 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; @@ -119,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; + + } /** @@ -132,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); } /** @@ -149,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(); @@ -173,7 +211,7 @@ void View::Render(int width, int height) #ifndef QUADTREE_DISABLED if (m_bounds_dirty || !m_lazy_rendering) { - 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)) + 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) @@ -227,8 +265,16 @@ 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; @@ -285,7 +331,12 @@ 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))) { @@ -364,12 +415,21 @@ void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_ PrepareRender(); if (m_buffer_dirty || m_bounds_dirty || !m_lazy_rendering) // object bounds have changed - UpdateObjBoundsVBO(first_obj, last_obj); + { + 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 @@ -421,11 +481,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); } @@ -433,6 +496,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; @@ -450,9 +514,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(); } /** @@ -464,10 +567,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 @@ -490,12 +596,16 @@ 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; }