X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=1fe072817c7c9e9bead4aa2a141d1d8f042c22d2;hp=ffcee5676d11358160f43522e33baf4f897a791b;hb=f71f97f4fd251d02882ace4be3ead033ced434c4;hpb=8e97d741cf713296c96b53f4ebb1615e8d443391

diff --git a/src/view.cpp b/src/view.cpp
index ffcee56..1fe0728 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -20,6 +20,8 @@ View::View(Document & document, Screen & screen, const Rect & bounds, const Colo
 {
 	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();
@@ -172,6 +174,7 @@ void View::Render(int width, int height)
 	}
 	m_cached_display.UnBind(); // resets render target to the screen
 	m_cached_display.Blit(); // blit FrameBuffer to screen
+	m_buffer_dirty = false;
 }
 
 #ifndef QUADTREE_DISABLED
@@ -206,8 +209,8 @@ 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 && !m_use_gpu_transform)) // object bounds have changed
-		UpdateObjBoundsVBO();
+	if (m_buffer_dirty) // object bounds have changed
+		UpdateObjBoundsVBO(first_obj, last_obj);
 
 	if (m_use_gpu_transform)
 	{
@@ -258,9 +261,9 @@ void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_
 	}
 }
 
-void View::UpdateObjBoundsVBO()
+void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
 {
-	m_objbounds_vbo.Invalidate();
+	//m_objbounds_vbo.Invalidate();
 	m_objbounds_vbo.SetType(GraphicsBuffer::BufferTypeVertex);
 	if (m_use_gpu_transform)
 	{
@@ -272,9 +275,9 @@ void View::UpdateObjBoundsVBO()
 	}
 	m_objbounds_vbo.Resize(m_document.ObjectCount()*sizeof(GPUObjBounds));
 
-	BufferBuilder<GPUObjBounds> obj_bounds_builder(m_objbounds_vbo.Map(false, true, true), m_objbounds_vbo.GetSize());
+	BufferBuilder<GPUObjBounds> 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 = 0; id < m_document.ObjectCount(); ++id)
+	for (unsigned id = first_obj; id < last_obj; ++id)
 	{
 		Rect obj_bounds;
 		if (m_use_gpu_transform)
@@ -295,7 +298,6 @@ void View::UpdateObjBoundsVBO()
 
 	}
 	m_objbounds_vbo.UnMap();
-	m_buffer_dirty = false;
 }
 /**
  * Prepare the document for rendering