X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=71f3ed4103a7b492545bc4c3460208b84a4d72ea;hp=7c490742086327484c26a5b4bbe0b9d39dc7ba04;hb=d69b8de94411bee43edc9e16f33bfa0d5d1d6b3b;hpb=7a83af96414ff156f56455ff7a5e7af01fc403b5

diff --git a/src/document.cpp b/src/document.cpp
index 7c49074..71f3ed4 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -92,10 +92,11 @@ void Document::GenBaseQuadtree()
 {
 	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount()});
 	m_quadtree.root_id = 0;
-	GenQuadNode(0, QTC_TOP_LEFT);
+	GenQuadChild(0, QTC_TOP_LEFT);
+	GenQuadParent(0, QTC_BOTTOM_RIGHT);
 }
 
-QuadTreeIndex Document::GenQuadNode(QuadTreeIndex parent, QuadTreeNodeChildren type)
+QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
 	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0});
@@ -132,6 +133,41 @@ QuadTreeIndex Document::GenQuadNode(QuadTreeIndex parent, QuadTreeNodeChildren t
 	return new_index;
 }
 
+// Reparent a quadtree node, making it the "type" child of a new node.
+QuadTreeIndex Document::GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren type)
+{
+	QuadTreeIndex new_index = m_quadtree.nodes.size();
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0});
+
+	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
+	for (unsigned i = m_quadtree.nodes[child].object_begin; i < m_quadtree.nodes[child].object_end; ++i)
+	{
+		m_objects.bounds.push_back(TransformFromQuadChild(m_objects.bounds[i], type));
+		m_objects.types.push_back(m_objects.types[i]);
+		m_objects.data_indices.push_back(m_objects.data_indices[i]);
+		m_count++;
+	}
+	m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
+	switch (type)
+	{
+		case QTC_TOP_LEFT:
+			m_quadtree.nodes[new_index].top_left = child;
+			break;
+		case QTC_TOP_RIGHT:
+			m_quadtree.nodes[new_index].top_right = child;
+			break;
+		case QTC_BOTTOM_LEFT:
+			m_quadtree.nodes[new_index].bottom_left = child;
+			break;
+		case QTC_BOTTOM_RIGHT:
+			m_quadtree.nodes[new_index].bottom_right = child;
+			break;
+		default:
+			Fatal("Tried to add a QuadTree child of invalid type!");
+	}
+	return new_index;
+}
+
 #endif
 
 void Document::Load(const string & filename)
@@ -225,6 +261,9 @@ bool Document::operator==(const Document & equ) const
 #include "../contrib/pugixml-1.4/src/pugixml.hpp"
 #include "../contrib/pugixml-1.4/src/pugixml.cpp"
 
+/**
+ * Load an SVG into a rectangle
+ */
 void Document::LoadSVG(const string & filename, const Rect & bounds)
 {
 	using namespace pugi;
@@ -306,7 +345,7 @@ static string & GetToken(const string & d, string & token, unsigned & i)
 	
 	while (i < d.size())
 	{
-		if (d[i] == ',' || isalpha(d[i]) || iswspace(d[i]))
+		if (d[i] == ',' || (isalpha(d[i]) && d[i] != 'e') || iswspace(d[i]))
 		{
 			if (token.size() == 0 && !iswspace(d[i]))
 			{
@@ -325,17 +364,20 @@ static string & GetToken(const string & d, string & token, unsigned & i)
 // Seriously this isn't really very DOM-like at all is it?
 void Document::AddPathFromString(const string & d, const Rect & bounds)
 {
-	Real x[3] = {0,0,0};
-	Real y[3] = {0,0,0};
+	Real x[4] = {0,0,0,0};
+	Real y[4] = {0,0,0,0};
 	
 	string token("");
 	string command("m");
 	
+	Real x0(0);
+	Real y0(0);
+	
 	unsigned i = 0;
 	unsigned prev_i = 0;
-	Real x0;
-	Real y0;
-	bool started = false;
+	
+	bool start = false;
+	
 	while (i < d.size() && GetToken(d, token, i).size() > 0)
 	{
 		if (isalpha(token[0]))
@@ -344,87 +386,111 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 		{
 			i = prev_i; // hax
 			if(command == "")
-				command = "l";
+				command = "L";
 		}
+		
+		bool relative = islower(command[0]);
 			
-		if (command == "m")
+		if (command == "m" || command == "M")
 		{
 			Debug("Construct moveto command");
-			x[0] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[0] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
-			if (!started)
-			{
-				x0 = x[0];
-				y0 = y[0];
-				started = true;
-			}
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			
+			x[0] = (relative) ? x[0] + dx : dx;
+			y[0] = (relative) ? y[0] + dy : dy;
+			
+
+			
 			Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
-			command = "l";
+			command = (command == "m") ? "l" : "L";
 		}
-		else if (command == "c")
+		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
 			Debug("Construct curveto command");
-			x[0] = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[0] = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.h;
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.h;
 			
-			x[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			y[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			x[1] = (relative) ? x[0] + dx : dx;
+			y[1] = (relative) ? y[0] + dy : dy;
 			
-			x[2] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[2] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
 			
-			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2]));
-			Add(BEZIER,bounds,index);
+			x[2] = (relative) ? x[0] + dx : dx;
+			y[2] = (relative) ? y[0] + dy : dy;
 			
+			if (command != "q" && command != "Q")
+			{
+				dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+				assert(GetToken(d,token,i) == ",");
+				dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+				x[3] = (relative) ? x[0] + dx : dx;
+				y[3] = (relative) ? y[0] + dy : dy;
+			}
+			else
+			{
+				x[3] = x[2];
+				y[3] = y[2];
+			}
 			
-			Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]));
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			
+			Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]),Float(x[3]),Float(y[3]));
+			
+			x[0] = x[3];
+			y[0] = y[3];
 
 			
 		}
-		else if (command == "l")
+		else if (command == "l" || command == "L")
 		{
 			Debug("Construct lineto command");
 		
-			x[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			
+			x[1] = (relative) ? x0 + dx : dx;
+			y[1] = (relative) ? y0 + dy : dy;
 			
 			x[2] = x[1];
 			y[2] = y[1];
-
-			Rect segment_bounds(x[0], y[0], x[2] - x[0], y[2] - y[0]);
 			
-			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2]));
-			Add(BEZIER,bounds,index);
+			x[3] = x[1];
+			y[3] = y[1];
+
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
 			Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			x[0] = x[3];
+			y[0] = y[3];
 
 		}
-		else if (command == "z")
+		else if (command == "z" || command == "Z")
 		{
 			Debug("Construct returnto command");
 			x[1] = x0;
 			y[1] = y0;
 			x[2] = x0;
 			y[2] = y0;
+			x[3] = x0;
+			y[3] = y0;
 			
-			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2]));
-			Add(BEZIER,bounds,index);
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
 			Debug("[%u] returnto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			x[0] = x[3];
+			y[0] = y[3];
 			command = "m";
 		}
 		else
@@ -432,6 +498,13 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 			Warn("Unrecognised command \"%s\", set to \"m\"", command.c_str());
 			command = "m";
 		}
+		
+		if (!start)
+		{
+			x0 = x[0];
+			y0 = y[0];
+			start = true;
+		}
 		prev_i = i;
 	}
 }