X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=1383906acd16d96c2b014393cf20882a4a72d527;hp=72a12c1ca7257d45f03ad51f9ca8cae65c78a2c8;hb=a69d8466e4ad4dd92488798582e680ae31029038;hpb=85336af25da0c613460bbeda4ff7553933e13064

diff --git a/src/document.cpp b/src/document.cpp
index 72a12c1..1383906 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -132,13 +132,24 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 		}
 	case BEZIER:
 		{
-		Rect child_node_bounds = TransformFromQuadChild({0,0,1,1}, type);
-		std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(child_node_bounds);
-		Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+		// If we're entirely within the quadtree node, no clipping need occur.
+		if (ContainedInQuadChild(m_objects.bounds[object_id], type))
+		{
+			m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[object_id], type));
+			m_objects.types.push_back(m_objects.types[object_id]);
+			m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+			return 1;
+		}
+		Rect clip_bezier_bounds = TransformRectCoordinates(m_objects.bounds[object_id], TransformFromQuadChild(Rect{0,0,1,1}, type)); 
+		std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(clip_bezier_bounds);
 		for (size_t i = 0; i < new_curves.size(); ++i)
 		{
-			unsigned index = AddBezierData(new_curves[i]);
-			m_objects.bounds.push_back(obj_bounds);
+			Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+			Bezier new_curve_data = new_curves[i].ToAbsolute(TransformToQuadChild(m_objects.bounds[object_id],type));
+			new_bounds = new_curve_data.SolveBounds();
+			new_curve_data = new_curve_data.ToRelative(new_bounds);
+			unsigned index = AddBezierData(new_curve_data);
+			m_objects.bounds.push_back(new_bounds);
 			m_objects.types.push_back(BEZIER);
 			m_objects.data_indices.push_back(index);
 		}
@@ -269,8 +280,8 @@ void Document::Load(const string & filename)
 			LoadStructVector<Bezier>(file, chunk_size/sizeof(Bezier), m_objects.beziers);
 			break;
 			
-		case CT_OBJGROUPS:
-			Debug("Group data...");
+		case CT_OBJPATHS:
+			Debug("Path data...");
 			Warn("Not handled because lazy");
 			break;
 		}
@@ -284,32 +295,12 @@ void Document::Load(const string & filename)
 #endif
 }
 
-unsigned Document::AddGroup(unsigned start_index, unsigned end_index, const Colour & fill)
+unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colour & fill)
 {
-	Real xmin = 0; Real ymin = 0; 
-	Real xmax = 0; Real ymax = 0;
-	
-	for (unsigned i = start_index; i <= end_index; ++i)
-	{
-		Rect & objb = m_objects.bounds[i];
-		
-		if (i == start_index || objb.x < xmin)
-			xmin = objb.x;
-		if (i == start_index || (objb.x+objb.w) > xmax)
-			xmax = (objb.x+objb.w);
-			
-		if (i == start_index || objb.y < ymin)
-			ymin = objb.y;
-		if (i == start_index || (objb.y+objb.h) > ymax)
-			ymax = (objb.y+objb.h);
-	}
-	
-	Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin);
-	
-	Group group(start_index, end_index, 0U, fill);
-	
-	unsigned data_index = AddGroupData(group);
-	unsigned result = Add(GROUP, bounds,data_index);
+	Path path(m_objects, start_index, end_index, fill);
+	unsigned data_index = AddPathData(path);
+	Rect bounds = path.SolveBounds(m_objects);
+	unsigned result = Add(PATH, bounds,data_index);
 	return result;
 }
 
@@ -320,6 +311,12 @@ unsigned Document::AddBezier(const Bezier & bezier)
 {
 	Rect bounds = bezier.SolveBounds();
 	Bezier data = bezier.ToRelative(bounds); // Relative
+	if (data.ToAbsolute(bounds) != bezier)
+	{
+		Error("%s != %s", data.ToAbsolute(Rect(0,0,1,1)).Str().c_str(),
+			bezier.Str().c_str());
+		Fatal("ToAbsolute on ToRelative does not give original Bezier");
+	}
 	unsigned index = AddBezierData(data);
 	return Add(BEZIER, bounds, index);
 }
@@ -338,10 +335,10 @@ unsigned Document::AddBezierData(const Bezier & bezier)
 	return m_objects.beziers.size()-1;
 }
 
-unsigned Document::AddGroupData(const Group & group)
+unsigned Document::AddPathData(const Path & path)
 {
-	m_objects.groups.push_back(group);
-	return m_objects.groups.size()-1;
+	m_objects.paths.push_back(path);
+	return m_objects.paths.size()-1;
 }
 
 void Document::DebugDumpObjects()
@@ -577,7 +574,7 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 				}
 				
 					Debug("fill-opacity is %f", Float(c.a));
-				AddGroup(range.first, range.second, c);
+				AddPath(range.first, range.second, c);
 			}
 			
 		}
@@ -982,7 +979,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 	
 	if (start_index < m_count && end_index < m_count)
 	{
-		AddGroup(start_index, end_index);
+		AddPath(start_index, end_index);
 	}
 	Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));