X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=ed62704fd66b5864c071d769973b7aeb72fe43d4;hp=40262ac92e24f05964cb7b7656963f649c1e8a37;hb=fdc6f69d40cf7e872218ec48493534cc3b85c852;hpb=245ccc8576d4bd29ab04d506ddb0c44b04a67e39

diff --git a/src/view.cpp b/src/view.cpp
index 40262ac..ed62704 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -10,12 +10,7 @@ void View::Render()
 	static bool debug_output_done = false;
 	if (!debug_output_done)
 	{
-		Debug("Bounds are %s", m_bounds.Str().c_str());
-		Debug("Objects are:");
-		for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
-		{
-			Debug("%u\t%s", id, m_document.m_objects.bounds[id].Str().c_str());
-		}
+		m_document.DebugDumpObjects();
 		debug_output_done = true;
 	}
 
@@ -24,7 +19,7 @@ void View::Render()
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-	glOrtho(m_bounds.x, m_bounds.x+m_bounds.w, m_bounds.y + m_bounds.h, m_bounds.y, -1.f, 1.f);
+	glOrtho(Float(m_bounds.x), Float(m_bounds.x)+Float(m_bounds.w), Float(m_bounds.y) + Float(m_bounds.h), Float(m_bounds.y), -1.f, 1.f);
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
@@ -32,12 +27,27 @@ void View::Render()
 	glBegin(GL_QUADS);
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 	{
+		if (m_document.m_objects.types[id] == RECT_FILLED)
+			continue;
 		Rect obj_bounds = m_document.m_objects.bounds[id];
-		glVertex2f(obj_bounds.x, obj_bounds.y);
-		glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);
-		glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y + obj_bounds.h);
-		glVertex2f(obj_bounds.x, obj_bounds.y + obj_bounds.h);
+		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
+		glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
+		glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y) + Float(obj_bounds.h));
+		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y) + Float(obj_bounds.h));
 	}
 	glEnd();
 
+	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
+	{
+		if (m_document.m_objects.types[id] == RECT_OUTLINE)
+			continue;
+		Rect obj_bounds = m_document.m_objects.bounds[id];
+		glBegin(GL_LINE_LOOP);
+		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
+		glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
+		glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y) + Float(obj_bounds.h));
+		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y) + Float(obj_bounds.h));
+		glEnd();
+	}
+
 }