X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=d8a875bdc2ec680639641353fc06d628c1415810;hp=80f49861b116db216258cf96e9349370704460eb;hb=e164c93218ed4599614f4f6e5e815429a3fedbf7;hpb=a269b3e29535918a390f448829a3459e4853425b

diff --git a/src/view.cpp b/src/view.cpp
index 80f4986..d8a875b 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -11,17 +11,19 @@ void View::Translate(Real x, Real y)
 	y *= m_bounds.h;
 	m_bounds.x += x;
 	m_bounds.y += y;
+	Debug("View Bounds => %s", m_bounds.Str().c_str());
 }
 
 void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
 {
+	// x and y are coordinates in the window
 	// Convert to local coords.
 	x *= m_bounds.w;
 	y *= m_bounds.h;
 	x += m_bounds.x;
 	y += m_bounds.y;
 	
-	Debug("Mouse wheel event %f %f %f\n", Float(x), Float(y), Float(scaleAmt));
+	//Debug("Mouse wheel event %f %f %f\n", Float(x), Float(y), Float(scaleAmt));
 	
 	Real top = y - m_bounds.y;
 	Real left = x - m_bounds.x;
@@ -33,6 +35,32 @@ void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
 	m_bounds.y = y - top;
 	m_bounds.w *= scaleAmt;
 	m_bounds.h *= scaleAmt;
+	Debug("View Bounds => %s", m_bounds.Str().c_str());
+}
+
+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()
@@ -44,8 +72,8 @@ void View::Render()
 		debug_output_done = true;
 	}
 
-	glClearColor(1.f,1.f,1.f,1.f);
-	glClear(GL_COLOR_BUFFER_BIT);
+
+	//DrawGrid(); // Draw the gridlines
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
@@ -53,11 +81,16 @@ void View::Render()
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
-	glColor4f(0.f,0.f,0.f,1.f);
+	if (m_colour.a < 1.0f)
+	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	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)
 	{
-		if (m_document.m_objects.types[id] == RECT_FILLED)
+		if (m_document.m_objects.types[id] != RECT_FILLED)
 			continue;
 		Rect obj_bounds = m_document.m_objects.bounds[id];
 		glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
@@ -67,9 +100,10 @@ void View::Render()
 	}
 	glEnd();
 
+	
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 	{
-		if (m_document.m_objects.types[id] == RECT_OUTLINE)
+		if (m_document.m_objects.types[id] != RECT_OUTLINE)
 			continue;
 		Rect obj_bounds = m_document.m_objects.bounds[id];
 		glBegin(GL_LINE_LOOP);
@@ -80,4 +114,9 @@ void View::Render()
 		glEnd();
 	}
 
+	if (m_colour.a < 1.0f)
+	{
+		glDisable(GL_BLEND);
+	}
+
 }