X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=2b6641af6273d7664275856d1a6e00cbbb502b4e;hp=f78ec40e4c5c8d6648d0d9400878420cd8cb2de8;hb=709efed7bb1d5e028e6b6b0a1e82f7fbae297329;hpb=e6c66a8e58f1dda071e6fc4abed39afe49d348f8

diff --git a/src/view.cpp b/src/view.cpp
index f78ec40..2b6641a 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -7,10 +7,59 @@ using namespace std;
 
 void View::Translate(Real x, Real y)
 {
+	x *= m_bounds.w;
+	y *= m_bounds.h;
 	m_bounds.x += x;
 	m_bounds.y += y;
 }
 
+void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
+{
+	// 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));
+	
+	Real top = y - m_bounds.y;
+	Real left = x - m_bounds.x;
+	
+	top *= scaleAmt;
+	left *= scaleAmt;
+	
+	m_bounds.x = x - left;
+	m_bounds.y = y - top;
+	m_bounds.w *= 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;
@@ -23,12 +72,17 @@ 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);
 	glBegin(GL_QUADS);
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
@@ -43,6 +97,7 @@ void View::Render()
 	}
 	glEnd();
 
+	
 	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
 	{
 		if (m_document.m_objects.types[id] == RECT_OUTLINE)