From: David Gow <david@ingeniumdigital.com>
Date: Wed, 26 Mar 2014 10:50:28 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:ipdf/code
X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=commitdiff_plain;h=fd8f00531c67a2a187213ca6830114ff84a8ec4f;hp=901ea3355265e7f413674a62f7c29806ae35a565

Merge branch 'master' of git.ucc.asn.au:ipdf/code
---

diff --git a/src/main.cpp b/src/main.cpp
index 273d82a..5fa94b7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,7 +10,8 @@ using namespace IPDF;
 int main(int argc, char ** argv)
 {
 	Document doc;
-	doc.Add(0.5, 0.5, 0.5, 0.5);
+	srand(time(NULL));
+	doc.Add(Random(), Random(), Random(), Random());
 
 	View view(doc);
 
diff --git a/src/view.cpp b/src/view.cpp
index bd9b2fa..5ea61f8 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -27,6 +27,21 @@ 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);
+	}
+	glEnd();
+
+	glBegin(GL_LINE_LOOP);
+	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];
 		glVertex2f(obj_bounds.x, obj_bounds.y);
 		glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);