X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=b489e08ee74016f81b150bf733df13d4d59ab6c0;hp=5acd860d7adfc2272902f49abe35a1a8321b6569;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=e08b7671a4592481aa73d68b30b7bd1d96e75002

diff --git a/src/view.cpp b/src/view.cpp
index 5acd860..b489e08 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -1,6 +1,7 @@
 #include "view.h"
 #include "bufferbuilder.h"
 #include "screen.h"
+#include "profiler.h"
 #include "gl_core44.h"
 
 #ifndef CONTROLPANEL_DISABLED
@@ -25,11 +26,12 @@ using namespace std;
  * @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 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_use_gpu_transform(false), 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_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)
+		m_show_fill_points(false), m_show_fill_bounds(false), m_lazy_rendering(true),
+		m_query_gpu_bounds_on_next_frame(NULL)
 {
 	Debug("View Created - Bounds => {%s}", m_bounds.Str().c_str());
 
@@ -86,6 +88,7 @@ View::~View()
  */
 void View::Translate(Real x, Real y)
 {
+	PROFILE_SCOPE("View::Translate");	
 	if (!m_use_gpu_transform)
 		m_buffer_dirty = true;
 	m_bounds_dirty = true;
@@ -109,6 +112,14 @@ void View::Translate(Real x, Real y)
  */
 void View::SetBounds(const Rect & bounds)
 {
+	#ifdef TRANSFORM_OBJECTS_NOT_VIEW
+	ObjectType type = NUMBER_OF_OBJECT_TYPES;
+	#ifdef TRANSFORM_BEZIERS_TO_PATH
+		type = PATH;
+	#endif
+	SVGMatrix transform = {Real(m_bounds.w)/bounds.w, 0, Real(m_bounds.x) - bounds.x, 0,Real(m_bounds.h)/bounds.h, Real(m_bounds.y) - bounds.y};
+	m_document.TransformObjectBounds(transform, type);
+	#endif
 	m_bounds.x = bounds.x;
 	m_bounds.y = bounds.y;
 	m_bounds.w = bounds.w;
@@ -125,7 +136,7 @@ void View::SetBounds(const Rect & bounds)
  */
 void View::ScaleAroundPoint(Real x, Real y, Real scale_amount)
 {
-	
+	PROFILE_SCOPE("View::ScaleAroundPoint");	
 	// (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.
@@ -184,6 +195,7 @@ Rect View::TransformToViewCoords(const Rect& inp) const
  */
 void View::Render(int width, int height)
 {
+	PROFILE_SCOPE("View::Render()");
 	if (!m_screen.Valid()) return;
 	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION,42,-1, "Beginning View::Render()");
 	// View dimensions have changed (ie: Window was resized)
@@ -219,6 +231,7 @@ void View::Render(int width, int height)
 	// quadtree node).
 	if (m_bounds_dirty || !m_lazy_rendering)
 	{
+		g_profiler.BeginZone("View::Render -- Quadtree view bounds management");
 		// If we're too far zoomed out, become the parent of the current node.
 		if ( m_bounds.w > 1.0 || m_bounds.h > 1.0)
 		{
@@ -318,6 +331,7 @@ void View::Render(int width, int height)
 			m_bounds = TransformToQuadChild(m_bounds, QTC_BOTTOM_RIGHT);
 			m_current_quadtree_node = m_document.GetQuadTree().nodes[m_current_quadtree_node].bottom_right;
 		}
+		g_profiler.EndZone();
 	}
 
 	m_screen.DebugFontPrintF("Current View QuadTree");
@@ -377,7 +391,8 @@ void View::Render(int width, int height)
 	glPopDebugGroup();
 	
 #ifndef CONTROLPANEL_DISABLED
-	ControlPanel::Update();
+	// The powers that be suggest that this may be causing of the segfaults.
+	//ControlPanel::Update();
 #endif //CONTROLPANEL_DISABLED
 	//Debug("Completed Render");
 	
@@ -443,6 +458,7 @@ void View::RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int rem
 
 void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_obj)
 {
+	PROFILE_SCOPE("View::RenderRange");
 	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 43, -1, "View::RenderRange()");
 	if (m_render_dirty) // document has changed
 		PrepareRender();
@@ -511,6 +527,12 @@ void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_
 
 void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
 {
+	PROFILE_SCOPE("View::UpdateObjBoundsVBO");
+	if (m_query_gpu_bounds_on_next_frame != NULL)
+	{
+		fprintf(m_query_gpu_bounds_on_next_frame,"# View: %s\t%s\t%s\t%s", Str(m_bounds.x).c_str(), Str(m_bounds.y).c_str(), Str(m_bounds.w).c_str(), Str(m_bounds.h).c_str());
+	}	
+	
 	//m_objbounds_vbo.Invalidate();
 	m_objbounds_vbo.SetType(GraphicsBuffer::BufferTypeVertex);
 	m_objbounds_vbo.SetName("Object Bounds VBO");
@@ -542,12 +564,17 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
 			obj_bounds = TransformToViewCoords(m_document.m_objects.bounds[id]);
 		}
 		GPUObjBounds gpu_bounds = {
-			(float)Float(obj_bounds.x),
-			(float)Float(obj_bounds.y),
-			(float)Float(obj_bounds.x + obj_bounds.w),
-			(float)Float(obj_bounds.y + obj_bounds.h)
+			Float(obj_bounds.x),
+			Float(obj_bounds.y),
+			Float(obj_bounds.x + obj_bounds.w),
+			Float(obj_bounds.y + obj_bounds.h)
 		};
 
+		if (m_query_gpu_bounds_on_next_frame != NULL)
+		{	
+			fprintf(m_query_gpu_bounds_on_next_frame,"%d\t%f\t%f\t%f\t%f\n", id, Float(obj_bounds.x), Float(obj_bounds.y), Float(obj_bounds.w), Float(obj_bounds.h));
+		}
+		
 		obj_bounds_builder.Add(gpu_bounds);
 	}
 	#else
@@ -555,6 +582,10 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
 	{
 		Path & path = m_document.m_objects.paths[i];
 		Rect & pbounds = path.GetBounds(m_document.m_objects); // Not very efficient...
+		//TODO: Add clipping here
+		//if (!pbounds.Intersects(Rect(0,0,1,1)) || pbounds.w < Real(1)/Real(800))
+		//	continue;
+
 		for (unsigned id = path.m_start; id <= path.m_end; ++id)
 		{
 			if (id < first_obj || id >= last_obj)
@@ -572,23 +603,34 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
 			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)
+				ClampFloat(obj_bounds.x),
+				ClampFloat(obj_bounds.y),
+				ClampFloat(obj_bounds.x + obj_bounds.w),
+				ClampFloat(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()); 
+			
+			if (m_query_gpu_bounds_on_next_frame != NULL)
+			{
+				fprintf(m_query_gpu_bounds_on_next_frame,"%d\t%f\t%f\t%f\t%f\n", id, ClampFloat(obj_bounds.x), ClampFloat(obj_bounds.y), ClampFloat(obj_bounds.w), ClampFloat(obj_bounds.h));
+			}
 		}
 		GPUObjBounds p_gpu_bounds = {
-				Float(pbounds.x),
-				Float(pbounds.y),
-				Float(pbounds.x + pbounds.w),
-				Float(pbounds.y + pbounds.h)
+				ClampFloat(pbounds.x),
+				ClampFloat(pbounds.y),
+				ClampFloat(pbounds.x + pbounds.w),
+				ClampFloat(pbounds.y + pbounds.h)
 		};		
 		obj_bounds_builder.Add(p_gpu_bounds);
 	}
 	#endif
+	if (m_query_gpu_bounds_on_next_frame != NULL)
+	{
+		if (m_query_gpu_bounds_on_next_frame != stdout && m_query_gpu_bounds_on_next_frame != stderr)
+			fclose(m_query_gpu_bounds_on_next_frame);
+		m_query_gpu_bounds_on_next_frame = NULL;
+	}
 	m_objbounds_vbo.UnMap();
 }
 /**
@@ -598,6 +640,7 @@ void View::UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj)
  */
 void View::PrepareRender()
 {
+	PROFILE_SCOPE("View::PrepareRender()");
 	Debug("Recreate buffers with %u objects", m_document.ObjectCount());
 	// Prepare bounds vbo
 	if (UsingGPURendering())
@@ -659,3 +702,14 @@ void View::SaveGPUBMP(const char * filename)
 	m_screen.ScreenShot(filename);
 	SetGPURendering(prev);	
 }
+
+void View::QueryGPUBounds(const char * filename, const char * mode)
+{
+	m_query_gpu_bounds_on_next_frame = fopen(filename, mode); 
+	Debug("File: %s", filename);
+	if (m_query_gpu_bounds_on_next_frame == NULL)
+		Error("Couldn't open file \"%s\" : %s", filename, strerror(errno));
+	ForceBoundsDirty(); 
+	ForceBufferDirty(); 
+	ForceRenderDirty();
+}