X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=b8b8ab61890d3c8be31377e317ecae2b47f6695f;hp=ce7489dc13a4b5cc8b1ebe1f7ed0b993db7bd31e;hb=eb7a30473a78452a890bd453f80d4a90aee5d364;hpb=d1f4d742e6634fda7c8a1e018b4f9c8ec0f4e51c

diff --git a/src/view.cpp b/src/view.cpp
index ce7489d..b8b8ab6 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -35,6 +35,31 @@ void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
 	m_bounds.h *= scaleAmt;
 }
 
+void View::DrawGrid()
+{
+	// Draw some grid lines at fixed pixel positions
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0.0, 1.0, 1.0, 0.0, -1.f, 1.f);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glColor4f(0.9,0.9,0.9,0.1);
+	const float num_lines = 50.0;
+	for (float i = 0; i < num_lines; ++i)
+	{
+		glBegin(GL_LINES);
+		glVertex2f(i*(1.0/num_lines), 0.0);
+		glVertex2f(i*(1.0/num_lines), 1.0);
+		glEnd();
+		glBegin(GL_LINES);
+		glVertex2f(0.0,i*(1.0/num_lines));
+		glVertex2f(1.0,i*(1.0/num_lines));
+		glEnd();
+	
+	}
+}
+
 void View::Render()
 {
 	static bool debug_output_done = false;
@@ -47,13 +72,15 @@ void View::Render()
 	glClearColor(1.f,1.f,1.f,1.f);
 	glClear(GL_COLOR_BUFFER_BIT);
 
+	//DrawGrid(); // Draw the gridlines
+
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	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();
 
-	glColor4f(0.f,0.f,0.f,1.f);
+	glColor4f(m_colour.r, m_colour.g, m_colour.b, m_colour.a);
 	glBegin(GL_QUADS);
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 	{
@@ -67,6 +94,7 @@ void View::Render()
 	}
 	glEnd();
 
+	
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 	{
 		if (m_document.m_objects.types[id] == RECT_OUTLINE)
@@ -79,4 +107,5 @@ void View::Render()
 		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y) + Float(obj_bounds.h));
 		glEnd();
 	}
+
 }