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

diff --git a/src/view.cpp b/src/view.cpp
index 1fe0728..4bbe5f0 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -183,7 +183,7 @@ void View::RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int rem
 	Rect old_bounds = m_bounds;
 	if (node == QUADTREE_EMPTY) return;
 	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);
+	//Debug("Rendering QT node %d, (objs: %d -- %d)\n", node, m_document.GetQuadTree().nodes[node].object_begin, m_document.GetQuadTree().nodes[node].object_end);
 	RenderRange(width, height, m_document.GetQuadTree().nodes[node].object_begin, m_document.GetQuadTree().nodes[node].object_end);
 
 	m_bounds = TransformToQuadChild(old_bounds, QTC_TOP_LEFT);
@@ -215,13 +215,13 @@ void View::RenderRange(int width, int height, unsigned first_obj, unsigned last_
 	if (m_use_gpu_transform)
 	{
 		GLfloat glbounds[] = {static_cast<GLfloat>(Float(m_bounds.x)), static_cast<GLfloat>(Float(m_bounds.y)), static_cast<GLfloat>(Float(m_bounds.w)), static_cast<GLfloat>(Float(m_bounds.h)),
-					0.0, 0.0, 640.0, 480.0};
+					0.0, 0.0, static_cast<GLfloat>(width), static_cast<GLfloat>(height)};
 		m_bounds_ubo.Upload(sizeof(float)*8, glbounds);
 	}
 	else
 	{
 		GLfloat glbounds[] = {0.0f, 0.0f, 1.0f, 1.0f,
-					0.0f, 0.0f, 640.0f, 480.0f};
+					0.0f, 0.0f, float(width), float(height)};
 		m_bounds_ubo.Upload(sizeof(float)*8, glbounds);
 	}
 	m_bounds_dirty = false;
@@ -330,7 +330,7 @@ void View::PrepareRender()
 		m_object_renderers.at(type)->AddObjectToBuffers(id); // Use at() in case the document is corrupt TODO: Better error handling?
 		// (Also, Wow I just actually used std::vector::at())
 		// (Also, I just managed to make it throw an exception because I'm a moron)
-		Debug("Object of type %d", type);
+		//Debug("Object of type %d", type);
 	}
 
 	// Finish the buffers