From f9e316c547cd0a3ed5ac0189972b8a6fbfdb46f6 Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Wed, 29 Mar 2023 17:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=BD=E5=BA=A6=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84bug=20=EF=BC=88=E5=BE=85=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Renderer/Painting/LineTree.cpp        | 60 +++++++++++++------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/ArchitectureColoredPainting/src/Renderer/Painting/LineTree.cpp b/ArchitectureColoredPainting/src/Renderer/Painting/LineTree.cpp
index db84c3c..026caea 100644
--- a/ArchitectureColoredPainting/src/Renderer/Painting/LineTree.cpp
+++ b/ArchitectureColoredPainting/src/Renderer/Painting/LineTree.cpp
@@ -8,6 +8,7 @@ using std::set;
 using std::pair;
 using std::vector;
 using std::queue;
+using std::make_shared;
 
 void LineTree::init() {
 	restOfTreeNodes.clear();
@@ -71,28 +72,51 @@ bool LineTree::isLineEqual(PointIndexVector& a, PointIndexVector& b) const {
 
 void LineTree::monotonization(vector<PointVector>& inLines, vector<std::shared_ptr<Line>>& outLines) {
 	bool isOffset = false;
-	for (PointVector& l : inLines) {
-		std::shared_ptr<Line> nowLine;
-		switch (l.size()) {
-		case 2: {
-			nowLine.reset(new StraightLine(l));
-			break;
+	vector<std::shared_ptr<Line> > tmpLines;
+	tmpLines.clear();
+	for (int i = 0; i < inLines.size(); i++) {
+		int endIndex = i;
+		double totalLength = 0;
+		while (endIndex < inLines.size() && *inLines[endIndex].rbegin() == *inLines[endIndex + 1].begin()) {
+			endIndex++;
 		}
-		case 3: case 4: nowLine.reset(new CubicBezier(l)); break;
-		default: break;
+		// 计算总长度
+		for (int j = i; j <= endIndex; j++) {
+			PointVector& l = inLines[j];
+			std::shared_ptr<Line> nowLine;
+			switch (l.size()) {
+			case 2: {
+				nowLine = make_shared<StraightLine>(l);
+				break;
+			}
+			case 4: nowLine = make_shared<CubicBezier>(l); break;
+			default: break;
+			}
+			totalLength += nowLine->getIntegralByT(1);
+			tmpLines.push_back(nowLine);
 		}
 
-		// 防止在同一直线与 X 轴平行上
-		if (isOffset) {
-			nowLine->upwardOffsetForY(true, 1e-5);
+		//单调化并求比例
+		double prefixLength = 0;
+		for (auto nowLine : tmpLines) {
+			// 防止在同一直线与 X 轴平行上
+			double nowLineLength = nowLine->getIntegralByT(1);
+			nowLine->setRate({ prefixLength / totalLength, (prefixLength + nowLineLength) / totalLength });
+			prefixLength += nowLineLength;
+
+			if (isOffset) {
+				nowLine->upwardOffsetForY(true, 1e-5);
+			}
+			isOffset = false;
+			if (nowLine->direction(true) == 0) {
+				nowLine->upwardOffsetForY(false, 1e-5);
+				isOffset = true;
+			}
+			nowLine->monotonization(outLines);
+			outLines.push_back(nowLine);
 		}
-		isOffset = false;
-		if (nowLine->direction(true) == 0) {
-			nowLine->upwardOffsetForY(false, 1e-5);
-			isOffset = true;
-		}
-		nowLine->monotonization(outLines);
-		outLines.push_back(nowLine);
+		tmpLines.clear();
+		i = endIndex;
 	}
 	// 防止在首尾直线在与 X 轴平行上
 	int siz = outLines.size();