X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=37f15e2b820deeb5265e8296654c918957f6b975;hp=0b72a3ea647cc89ba15b4914ca425ccc3778538d;hb=7d41c1b8d1da72ef3e238f93ee7622ae9affb9de;hpb=67fbce330b046b1f0d63222f04d83410dc1b2faa

diff --git a/src/document.cpp b/src/document.cpp
index 0b72a3e..37f15e2 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -132,37 +132,15 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 		}
 	case BEZIER:
 		{
-		Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
-		if (obj_bounds.x < 0)
-		{
-			obj_bounds.w += obj_bounds.x;
-			obj_bounds.x = 0;
-		}
-		if (obj_bounds.y < 0)
-		{
-			obj_bounds.h += obj_bounds.y;
-			obj_bounds.y = 0;
-		}
-		if (obj_bounds.x + obj_bounds.w > 1)
-		{
-			obj_bounds.w += (1 - (obj_bounds.x + obj_bounds.w));
-		}
-		if (obj_bounds.y + obj_bounds.h > 1)
-		{
-			obj_bounds.h += (1 - (obj_bounds.y + obj_bounds.h));
-		}
-		Rect child_node_bounds = TransformFromQuadChild(obj_bounds, type);
-		Rect clip_bezier_bounds;
-		clip_bezier_bounds.x = (child_node_bounds.x - m_objects.bounds[object_id].x) / m_objects.bounds[object_id].w;
-		clip_bezier_bounds.y = (child_node_bounds.y - m_objects.bounds[object_id].y) / m_objects.bounds[object_id].h;
-		clip_bezier_bounds.w = child_node_bounds.w / m_objects.bounds[object_id].w;
-		clip_bezier_bounds.h = child_node_bounds.h / m_objects.bounds[object_id].h;
-		std::vector<Bezier> new_curves = Bezier(m_objects.beziers[m_objects.data_indices[object_id]], child_node_bounds).ClipToRectangle(clip_bezier_bounds);
+//		Rect child_node_bounds = m_objects.bounds[object_id];
+		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)
 		{
 			Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
-			new_bounds = TransformToQuadChild(new_curves[i].SolveBounds(), type);
-			Bezier new_curve_data = new_curves[i].ToRelative(new_bounds);
+			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);
@@ -295,8 +273,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;
 		}
@@ -310,32 +288,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;
 }
 
@@ -346,6 +304,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);
 }
@@ -364,10 +328,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()
@@ -603,7 +567,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);
 			}
 			
 		}
@@ -1008,7 +972,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));