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

diff --git a/src/view.cpp b/src/view.cpp
index 40262ac..80f4986 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -5,17 +5,42 @@
 using namespace IPDF;
 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::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 +49,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 +57,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();
+	}
+
 }