同步main

ArchitectureColoredPainting/src/Editor/LayerStyle.cpp

@@ -29,7 +29,7 @@ std::vector<Renderer::BaseStyle> StrokeElementLayerStyle::toBaseStyles() const
     }
     else if (!radialStroke(strokePair.first)->materialMap.empty())
     {
-	    const auto material = std::shared_ptr(std::move(strokePair.first->clone()));
+        const auto material = std::shared_ptr(std::move(strokePair.first->clone()));
         std::static_pointer_cast<MaterialStyleStroke>(material)->strokeType = Renderer::StrokeType::kBothSides;
 
         baseStyles.push_back({ std::make_shared<Renderer::TransformStyle>(), material });
@@ -109,17 +109,17 @@ LayerStyleContainer::LayerStyleContainer(bool isClosedElement) : hash(0)
     }
     if (isClosedElement)
     {
-	    for (const auto& style : closedOnlyStyles)
+        for (const auto& style : closedOnlyStyles)
-	    {
+        {
             unusedStyles.insert(style);
-	    }
+        }
     }
     else
     {
-	    for (const auto& style : unclosedOnlyStyles)
+        for (const auto& style : unclosedOnlyStyles)
-	    {
+        {
             unusedStyles.insert(style);
-	    }
+        }
     }
 }
 
@@ -141,7 +141,7 @@ QJsonArray LayerStyleContainer::toJson() const
     QJsonArray json;
     for (const auto& style : styles | std::views::values)
     {
-	    json.append(style->toJson());
+        json.append(style->toJson());
     }
     return json;
 }
@@ -149,7 +149,7 @@ QJsonArray LayerStyleContainer::toJson() const
 QStringList LayerStyleContainer::unusedStyleNames() const
 {
     QStringList result;
-    for(const auto& name : unusedStyles | std::views::keys)
+    for (const auto& name : unusedStyles | std::views::keys)
     {
         result << name;
     }
@@ -196,13 +196,13 @@ bool LayerStyleContainer::useStyle(const std::shared_ptr<LayerStyle>& style)
 bool LayerStyleContainer::dropStyle(const QString& styleName)
 {
     auto styleNode = usedStyles.extract(styleName);
-	if (styleNode.empty())
+    if (styleNode.empty())
     {
-	    return false;
+        return false;
     }
     styles.erase(styleName);
     unusedStyles.insert(std::move(styleNode));
-	return true;
+    return true;
 }
 
 float LayerStyleContainer::boundingBoxAffectValue() const {
@@ -239,11 +239,11 @@ std::unique_ptr<StrokeElementLayerStyle> StrokeElementLayerStyle::fromJson(const
     auto ptr = std::make_unique<StrokeElementLayerStyle>(
         std::static_pointer_cast<MaterialStyleStroke>(
             std::shared_ptr(std::move(MaterialStyle::decoded(EncodeUtil::fromBase64<GLfloat>(json["left"].toString()))))
-            ),
+        ),
         std::static_pointer_cast<MaterialStyleStroke>(
             std::shared_ptr(std::move(MaterialStyle::decoded(EncodeUtil::fromBase64<GLfloat>(json["right"].toString()))))
-            )
+        )
-        );
+    );
     ptr->enableEachSideIndependent = json["enableEachSideIndependent"].toBool();
     return ptr;
 }
@@ -255,11 +255,11 @@ StrokeElementLayerStyle::StrokeElementLayerStyle(bool isClosed)
         7,
         Renderer::StrokeType::kLeftSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
-        );
+    );
 
     this->strokePair.second = std::make_shared<MaterialStyleStroke>(
-	    7,
+        7,
-	    Renderer::StrokeType::kRightSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
+        Renderer::StrokeType::kRightSide, isClosed ? Renderer::StrokeEndType::kClosed : Renderer::StrokeEndType::kFlat,
         std::make_shared<Renderer::StrokeRadialGradient>(materialMap, false)
     );
 
@@ -270,17 +270,17 @@ StrokeElementLayerStyle::StrokeElementLayerStyle(const PMaterialStyleStroke& lef
     this->strokePair.first = left;
     this->strokePair.second = right ? right : std::static_pointer_cast<MaterialStyleStroke>(
         std::shared_ptr(std::move(left->clone()))
-        );
+    );
 }
 
 StrokeElementLayerStyle::StrokeElementLayerStyle(const StrokeElementLayerStyle& other)
 {
     strokePair.first = std::static_pointer_cast<MaterialStyleStroke>(
         std::shared_ptr(std::move(other.strokePair.first->clone()))
-        );
+    );
     strokePair.second = std::static_pointer_cast<MaterialStyleStroke>(
         std::shared_ptr(std::move(other.strokePair.second->clone()))
-        );
+    );
     enableEachSideIndependent = other.enableEachSideIndependent;
 }
 
@@ -303,8 +303,8 @@ std::unique_ptr<FillElementLayerStyle> FillElementLayerStyle::fromJson(const QJs
     auto ptr = std::make_unique<FillElementLayerStyle>(
         std::static_pointer_cast<MaterialStyleFill>(
             std::shared_ptr(std::move(MaterialStyle::decoded(EncodeUtil::fromBase64<GLfloat>(json["material"].toString()))))
-            )
+        )
-        );
+    );
     return ptr;
 }
 
@@ -330,21 +330,21 @@ QWidget* FillElementLayerStyle::getListDisplayWidget() const
 }
 
 FillElementLayerStyle::FillElementLayerStyle(const PMaterialStyleFill& fillMaterialStyle)
-	: fillMaterialStyle(fillMaterialStyle)
+    : fillMaterialStyle(fillMaterialStyle)
 {
-	if (!fillMaterialStyle)
+    if (!fillMaterialStyle)
-	{
+    {
         this->fillMaterialStyle = std::make_shared<MaterialStyleFill>(
-				std::make_shared<Renderer::FillPlain>(ColorHelper::instance().getPrimary1())
+            std::make_shared<Renderer::FillPlain>(ColorHelper::instance().getPrimary1())
-            );
+        );
-	}
+    }
 }
 
 FillElementLayerStyle::FillElementLayerStyle(const FillElementLayerStyle& other)
 {
     this->fillMaterialStyle = std::static_pointer_cast<MaterialStyleFill>(
         std::shared_ptr(std::move(other.fillMaterialStyle->clone()))
-        );
+    );
 }
 
 QJsonObject FillElementLayerStyle::toJson() const
@@ -370,7 +370,7 @@ std::unique_ptr<LayerStyle> LayerStyle::fromJson(const QJsonObject& json)
     {
         return FillElementLayerStyle::fromJson(json);
     }
-	return nullptr;
+    return nullptr;
 }
 
 QJsonObject LayerStyle::toJson() const

ArchitectureColoredPainting/src/Editor/util/PaintingUtil.cpp

@@ -7,6 +7,7 @@
 using Renderer::Painting;
 using Renderer::BaseElement;
 using Renderer::ElementTransform;
+using Renderer::BaseElement;
 using glm::bvec2;
 using std::max;
 using std::shared_ptr;

ArchitectureColoredPainting/src/Renderer/Model.cpp

@@ -162,7 +162,7 @@ std::unique_ptr<Drawable> Model::processMesh(aiMesh* mesh, const aiScene* scene,
 		aiString str;
 		material->GetTexture(aiTextureType_BASE_COLOR, 0, &str);
 		return std::string(str.C_Str());
-	}()); paintingProgram != nullptr && iter != paintingMap.end())
+		}()); paintingProgram != nullptr && iter != paintingMap.end())
 	{
 		qDebug() << iter->first.c_str() << "Replaced";
 
@@ -251,120 +251,129 @@ GLuint Renderer::Model::loadPainting(std::string path)
 	{
 		qDebug() << path.c_str() << "Not Found, Using Default Painting";
 		vector<std::pair<std::shared_ptr<Contour>, float>> contours;
-
+		Painting painting;
-		QPainterPath painterPaths[3];
+		//if (auto file = QFileInfo(QString(path.c_str())); file.isFile())
-		QQuickSvgParser::parsePathDataFast("M100,100C-.5,100,0,100.5,0,0L40,.07C40,59.5,39.5,60,100,60Z",
+		if (auto file = QFileInfo(QString("../test.json")); file.isFile())
-			painterPaths[0]);
+			painting = PaintingUtil::transfromToPainting("../test.json");
-		if (!SvgFileLoader().loadSvgFile("../svg/2.svg", painterPaths[1]))
-			qCritical() << "load error";
-		/*QQuickSvgParser::parsePathDataFast("M292.82,107.78s0,0,0,0,0,3.59,0,7.62c0,3.85,0,5.78.06,6.43a19.94,19.94,0,0,0,2.87,7.58,15.85,15.85,0,0,0,6.61,6.23A14.75,14.75,0,0,0,310,137a11.69,11.69,0,0,0,7.59-2.92,11,11,0,0,0,3.2-6.84c.15-1.27.58-4.84-1.79-7.64a8.54,8.54,0,0,0-3.56-2.44c-1.32-.52-3.32-1.31-5.06-.33a5.41,5.41,0,0,0-2.14,3,3.48,3.48,0,0,0-.16,2.71c.78,1.86,3.36,2.14,3.47,2.15",
-			painterPaths[1]);*/
-		QQuickSvgParser::parsePathDataFast("M377,459.61a11.26,11.26,0,0,1,11.27-11.27H696.12a11.27,11.27,0,0,0,11-8.62A359.84,359.84,0,0,0,708,280.56a11.26,11.26,0,0,0-11-8.73H388.27A11.26,11.26,0,0,1,377,260.57h0a11.26,11.26,0,0,1,11.27-11.26H683.71A11.32,11.32,0,0,0,694.28,234C649.8,113.69,542.57,23.85,412.3,4.12a11.22,11.22,0,0,0-12.76,11.17v158.9a11.26,11.26,0,0,0,11.26,11.27H583.12a11.32,11.32,0,0,0,9.26-17.75c-31.67-46.59-78.51-75.2-109.11-90.07a11.25,11.25,0,0,0-16.13,10.17V115.2a11.24,11.24,0,0,0,6.22,10.07l7.51,3.76a11.28,11.28,0,0,1,5,15.12h0a11.27,11.27,0,0,1-15.11,5l-20-10a11.27,11.27,0,0,1-6.22-10.07V54a11.27,11.27,0,0,1,14.62-10.75c5.11,1.59,125.66,40.35,172.24,149A11.27,11.27,0,0,1,621.11,208H388.27A11.26,11.26,0,0,1,377,196.73V11.36A11.32,11.32,0,0,0,365.89.08C363.34,0,360.79,0,358.22,0s-5.11,0-7.66.08a11.32,11.32,0,0,0-11.11,11.28V196.74A11.26,11.26,0,0,1,328.18,208H95.35A11.27,11.27,0,0,1,85,192.3c46.57-108.67,167.12-147.42,172.23-149A11.26,11.26,0,0,1,271.86,54v75.11a11.25,11.25,0,0,1-6.23,10.07l-20,10a11.27,11.27,0,0,1-15.11-5h0a11.26,11.26,0,0,1,5-15.11l7.52-3.76a11.27,11.27,0,0,0,6.22-10.07V87.82a11.25,11.25,0,0,0-16.14-10.16c-30.6,14.87-77.45,43.48-109.1,90.07a11.3,11.3,0,0,0,9.25,17.74H305.66a11.26,11.26,0,0,0,11.27-11.26V15.31A11.22,11.22,0,0,0,304.17,4.14C173.88,23.86,66.66,113.71,22.17,234a11.32,11.32,0,0,0,10.56,15.29H328.18a11.26,11.26,0,0,1,11.27,11.26v0a11.26,11.26,0,0,1-11.27,11.26H19.52a11.26,11.26,0,0,0-11,8.72,359.84,359.84,0,0,0,.83,159.16,11.26,11.26,0,0,0,11,8.61H328.18a11.26,11.26,0,0,1,11.27,11.27h0a11.26,11.26,0,0,1-11.27,11.26h-294a11.32,11.32,0,0,0-10.53,15.4C69,604.65,175.3,692.78,304.16,712.3a11.21,11.21,0,0,0,12.76-11.16V542.22A11.26,11.26,0,0,0,305.66,531h-166c-9.53,0-14.89,11.22-8.69,18.47,34.09,39.77,74.45,65.66,101.77,80.18a11.25,11.25,0,0,0,16.53-10V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,271.85,591v63.85A11.27,11.27,0,0,1,256.8,665.5c-4.45-1.59-109.58-40-171-139.9a11.27,11.27,0,0,1,9.59-17.17H328.18a11.26,11.26,0,0,1,11.27,11.26V705.08a11.32,11.32,0,0,0,11.11,11.28q3.82.07,7.66.08c2.57,0,5.12,0,7.67-.08A11.32,11.32,0,0,0,377,705.08V519.69a11.25,11.25,0,0,1,11.27-11.26H621.1a11.26,11.26,0,0,1,9.59,17.16c-61.46,99.87-166.59,138.3-171,139.9a11.27,11.27,0,0,1-15-10.61V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,467.14,591v28.6a11.25,11.25,0,0,0,16.53,10c27.33-14.53,67.68-40.42,101.77-80.19,6.2-7.23.85-18.46-8.69-18.46h-166a11.26,11.26,0,0,0-11.26,11.26V701.12a11.21,11.21,0,0,0,12.76,11.17c128.86-19.51,235.14-107.66,280.48-226a11.33,11.33,0,0,0-10.53-15.41h-294A11.25,11.25,0,0,1,377,459.61ZM35.27,399.53V316.9a11.26,11.26,0,0,1,11.27-11.26H669.92a11.25,11.25,0,0,1,11.26,11.26v82.63a11.25,11.25,0,0,1-11.26,11.26H46.54a11.27,11.27,0,0,1-11.27-11.26Z",
-			painterPaths[2]);
-
-		for (auto& i : painterPaths)
-		{
-			auto [contour, ratio] = PainterPathUtil::toNormalizedLines(i);
-			contours.emplace_back(std::make_shared<Contour>(contour), ratio);
-		}
-
-		vector<std::shared_ptr<ElementStyle>> style = {
-			std::make_shared<ElementStyleFillDemo>(),
-			std::make_shared<ElementStyleStrokeDemo>(0.02),
-			std::make_shared<ElementStyleStrokeRadialGradientDemo>(0.2)
-		};
-
-		vector<std::shared_ptr<Element>> element = {
-			std::make_shared<Element>(Element{ contours[0].first, style[0], contours[0].second}),
-			std::make_shared<Element>(Element{ contours[1].first, style[2], contours[1].second}),
-			std::make_shared<Element>(Element{ contours[2].first, style[0], contours[2].second}),
-		};
-
-		if (path == "0.json")
-		{
-			//painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.45,-0.45), glm::vec2(0.5,0.5) / 2.f, 0, glm::bvec2(false), 0 });
-			//painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.45, 0.45), glm::vec2(0.5,0.5) / 2.f, 0, glm::bvec2(false), 0 });
-			//painting.addElement(*element[2], ElementTransform{ glm::vec2(0.50,-0.45), glm::vec2(0.6,0.7) / 2.f, 0, glm::bvec2(false), 0 });
-		}
-		else if (path == "1.json")
-		{
-			//painting.backgroundColor = QColor(196, 81, 35);
-			float widths[] = { 0.22, 0.22 * 0.25 / 0.15, 0.22 * 0.25 / 0.15 };
-			QPainterPath painterPaths[6];
-			for (int i = 0; i < 6; i++)
-				if (!SvgFileLoader().loadSvgFile(QString(std::format("../svg/{}.svg", i + 1).c_str()), painterPaths[i]))
-					qCritical() << "load error";
-
-			vector<std::pair<std::shared_ptr<Contour>, float>> contours;
-			for (int i = 0; i < 3; i++)
-			{
-				auto [contour, ratio] = PainterPathUtil::toNormalizedLines(painterPaths[i], widths[i]);
-				contours.emplace_back(std::make_shared<Contour>(contour), ratio);
-			}
-			class StyleStrokeRadialGradient : public Renderer::ElementStyle
-			{
-			public:
-				float width;
-				StrokeType type;
-				StyleStrokeRadialGradient(float width, StrokeType type) :width(width), type(type) {};
-				virtual std::vector<Renderer::BaseStyle> toBaseStyles() const override
-				{
-					std::map<float, Material> materialMap = {
-						{0.09, Material{QColor(255,255,255),0,0.8}},
-						{0.63, Material{QColor(165,176,207),0,0.8}},
-						{1.00, Material{QColor(58,64,151),0,0.8}}
-					};
-					return { BaseStyle(std::make_shared<TransformStyle>(),
-						std::make_shared<MaterialStyleStroke>(width, type, StrokeEndType::kFlat,
-							std::make_shared<StrokeRadialGradient>(materialMap, false))) };
-				}
-			};
-			vector<std::shared_ptr<ElementStyle>> style = {
-				std::make_shared<StyleStrokeRadialGradient>(widths[0], StrokeType::kLeftSide),
-				std::make_shared<StyleStrokeRadialGradient>(widths[1], StrokeType::kRightSide),
-				std::make_shared<StyleStrokeRadialGradient>(widths[2], StrokeType::kLeftSide),
-			};
-			std::map<float, Material> materialMap = {
-				{0.09, Material{QColor(255,255,255),0,0.8}},
-				{0.63, Material{QColor(165,176,207),0,0.8}},
-				{1.00, Material{QColor(58,64,151),0,0.8}}
-			};
-			vector<std::shared_ptr<BaseElement>> element = {
-				std::make_shared<BaseElement>(contours[0].first, std::make_shared<MaterialStyleStroke>(
-					widths[0], StrokeType::kLeftSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
-				std::make_shared<BaseElement>(contours[1].first, std::make_shared<MaterialStyleStroke>(
-					widths[1], StrokeType::kRightSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
-				std::make_shared<BaseElement>(contours[2].first, std::make_shared<MaterialStyleStroke>(
-					widths[2], StrokeType::kLeftSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
-			};
-
-			QTransform trans = QTransform::fromScale(0.3, 0.3).inverted();
-			glm::mat3x2 mat(trans.m11(), trans.m12(), trans.m21(), trans.m22(), trans.m31(), trans.m32());
-
-			trans = QTransform::fromTranslate(0.5, 0).scale(0.3, 0.3).inverted();
-			glm::mat3x2 mat2(trans.m11(), trans.m12(), trans.m21(), trans.m22(), trans.m31(), trans.m32());
-			//mat = glm::mat3x2(11, 22, 33, 44, 55, 66);
-			//mat2 = glm::mat3x2(1, 2, 3, 4, 5, 6);
-
-			qDebug() << std::format("\n{} {} {}\n {} {} {}\n{} {} {}",
-				trans.m11(), trans.m21(), trans.m31(),
-				trans.m12(), trans.m22(), trans.m32(),
-				trans.m13(), trans.m23(), trans.m33()).c_str();
-
-			//painting.addElement(*element[0], ElementTransform{ glm::vec4(-1,-1,1,1), mat, 0});
-			painting.addElement(*element[1], ElementTransform{ glm::vec4(-1,-1,0,1), mat, 0 });
-			painting.addElement(*element[2], ElementTransform{ glm::vec4(0,-1,1,1), mat2, 0 });
-			//painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.45,0.45), glm::vec2(0.25), 0, glm::bvec2(false), 0 });
-			//painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.535,0.33), glm::vec2(0.15), 0, glm::bvec2(false), 0 });
-			//painting.addElement(*element[2], ElementTransform{ glm::vec2(-0.535,0.23), glm::vec2(0.15), 0, glm::bvec2(false), 0 });
-		}
 		else
 		{
-			for (int i = 0; i < 1000; i++)
+			qDebug() << path.c_str() << "Not Found, Using Default Painting";
+			vector<std::pair<std::shared_ptr<Contour>, float>> contours;
+
+			QPainterPath painterPaths[3];
+			QQuickSvgParser::parsePathDataFast("M100,100C-.5,100,0,100.5,0,0L40,.07C40,59.5,39.5,60,100,60Z",
+				painterPaths[0]);
+			if (!SvgFileLoader().loadSvgFile("../svg/2.svg", painterPaths[1]))
+				qCritical() << "load error";
+			/*QQuickSvgParser::parsePathDataFast("M292.82,107.78s0,0,0,0,0,3.59,0,7.62c0,3.85,0,5.78.06,6.43a19.94,19.94,0,0,0,2.87,7.58,15.85,15.85,0,0,0,6.61,6.23A14.75,14.75,0,0,0,310,137a11.69,11.69,0,0,0,7.59-2.92,11,11,0,0,0,3.2-6.84c.15-1.27.58-4.84-1.79-7.64a8.54,8.54,0,0,0-3.56-2.44c-1.32-.52-3.32-1.31-5.06-.33a5.41,5.41,0,0,0-2.14,3,3.48,3.48,0,0,0-.16,2.71c.78,1.86,3.36,2.14,3.47,2.15",
+				painterPaths[1]);*/
+			QQuickSvgParser::parsePathDataFast("M377,459.61a11.26,11.26,0,0,1,11.27-11.27H696.12a11.27,11.27,0,0,0,11-8.62A359.84,359.84,0,0,0,708,280.56a11.26,11.26,0,0,0-11-8.73H388.27A11.26,11.26,0,0,1,377,260.57h0a11.26,11.26,0,0,1,11.27-11.26H683.71A11.32,11.32,0,0,0,694.28,234C649.8,113.69,542.57,23.85,412.3,4.12a11.22,11.22,0,0,0-12.76,11.17v158.9a11.26,11.26,0,0,0,11.26,11.27H583.12a11.32,11.32,0,0,0,9.26-17.75c-31.67-46.59-78.51-75.2-109.11-90.07a11.25,11.25,0,0,0-16.13,10.17V115.2a11.24,11.24,0,0,0,6.22,10.07l7.51,3.76a11.28,11.28,0,0,1,5,15.12h0a11.27,11.27,0,0,1-15.11,5l-20-10a11.27,11.27,0,0,1-6.22-10.07V54a11.27,11.27,0,0,1,14.62-10.75c5.11,1.59,125.66,40.35,172.24,149A11.27,11.27,0,0,1,621.11,208H388.27A11.26,11.26,0,0,1,377,196.73V11.36A11.32,11.32,0,0,0,365.89.08C363.34,0,360.79,0,358.22,0s-5.11,0-7.66.08a11.32,11.32,0,0,0-11.11,11.28V196.74A11.26,11.26,0,0,1,328.18,208H95.35A11.27,11.27,0,0,1,85,192.3c46.57-108.67,167.12-147.42,172.23-149A11.26,11.26,0,0,1,271.86,54v75.11a11.25,11.25,0,0,1-6.23,10.07l-20,10a11.27,11.27,0,0,1-15.11-5h0a11.26,11.26,0,0,1,5-15.11l7.52-3.76a11.27,11.27,0,0,0,6.22-10.07V87.82a11.25,11.25,0,0,0-16.14-10.16c-30.6,14.87-77.45,43.48-109.1,90.07a11.3,11.3,0,0,0,9.25,17.74H305.66a11.26,11.26,0,0,0,11.27-11.26V15.31A11.22,11.22,0,0,0,304.17,4.14C173.88,23.86,66.66,113.71,22.17,234a11.32,11.32,0,0,0,10.56,15.29H328.18a11.26,11.26,0,0,1,11.27,11.26v0a11.26,11.26,0,0,1-11.27,11.26H19.52a11.26,11.26,0,0,0-11,8.72,359.84,359.84,0,0,0,.83,159.16,11.26,11.26,0,0,0,11,8.61H328.18a11.26,11.26,0,0,1,11.27,11.27h0a11.26,11.26,0,0,1-11.27,11.26h-294a11.32,11.32,0,0,0-10.53,15.4C69,604.65,175.3,692.78,304.16,712.3a11.21,11.21,0,0,0,12.76-11.16V542.22A11.26,11.26,0,0,0,305.66,531h-166c-9.53,0-14.89,11.22-8.69,18.47,34.09,39.77,74.45,65.66,101.77,80.18a11.25,11.25,0,0,0,16.53-10V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,271.85,591v63.85A11.27,11.27,0,0,1,256.8,665.5c-4.45-1.59-109.58-40-171-139.9a11.27,11.27,0,0,1,9.59-17.17H328.18a11.26,11.26,0,0,1,11.27,11.26V705.08a11.32,11.32,0,0,0,11.11,11.28q3.82.07,7.66.08c2.57,0,5.12,0,7.67-.08A11.32,11.32,0,0,0,377,705.08V519.69a11.25,11.25,0,0,1,11.27-11.26H621.1a11.26,11.26,0,0,1,9.59,17.16c-61.46,99.87-166.59,138.3-171,139.9a11.27,11.27,0,0,1-15-10.61V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,467.14,591v28.6a11.25,11.25,0,0,0,16.53,10c27.33-14.53,67.68-40.42,101.77-80.19,6.2-7.23.85-18.46-8.69-18.46h-166a11.26,11.26,0,0,0-11.26,11.26V701.12a11.21,11.21,0,0,0,12.76,11.17c128.86-19.51,235.14-107.66,280.48-226a11.33,11.33,0,0,0-10.53-15.41h-294A11.25,11.25,0,0,1,377,459.61ZM35.27,399.53V316.9a11.26,11.26,0,0,1,11.27-11.26H669.92a11.25,11.25,0,0,1,11.26,11.26v82.63a11.25,11.25,0,0,1-11.26,11.26H46.54a11.27,11.27,0,0,1-11.27-11.26Z",
+				painterPaths[2]);
+
+			for (auto& i : painterPaths)
 			{
-				float x = (float)rand() / RAND_MAX * 2 - 1;
+				auto [contour, ratio] = PainterPathUtil::toNormalizedLines(i);
-				float y = (float)rand() / RAND_MAX * 2 - 1;
+				contours.emplace_back(std::make_shared<Contour>(contour), ratio);
-				//painting.addElement(*element[i % 3], ElementTransform{ glm::vec2(x,y), glm::vec2(0.025), (float)rand() / RAND_MAX * 360, glm::bvec2(false), 0 });
+			}
+
+			vector<std::shared_ptr<ElementStyle>> style = {
+				std::make_shared<ElementStyleFillDemo>(),
+				std::make_shared<ElementStyleStrokeDemo>(0.02),
+				std::make_shared<ElementStyleStrokeRadialGradientDemo>(0.2)
+			};
+
+			vector<std::shared_ptr<Element>> element = {
+				std::make_shared<Element>(Element{ contours[0].first, style[0], contours[0].second}),
+				std::make_shared<Element>(Element{ contours[1].first, style[2], contours[1].second}),
+				std::make_shared<Element>(Element{ contours[2].first, style[0], contours[2].second}),
+			};
+
+			if (path == "0.json")
+			{
+				//painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.45,-0.45), glm::vec2(0.5,0.5) / 2.f, 0, glm::bvec2(false), 0 });
+				//painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.45, 0.45), glm::vec2(0.5,0.5) / 2.f, 0, glm::bvec2(false), 0 });
+				//painting.addElement(*element[2], ElementTransform{ glm::vec2(0.50,-0.45), glm::vec2(0.6,0.7) / 2.f, 0, glm::bvec2(false), 0 });
+			}
+			else if (path == "1.json")
+			{
+				//painting.backgroundColor = QColor(196, 81, 35);
+				float widths[] = { 0.22, 0.22 * 0.25 / 0.15, 0.22 * 0.25 / 0.15 };
+				QPainterPath painterPaths[6];
+				for (int i = 0; i < 6; i++)
+					if (!SvgFileLoader().loadSvgFile(QString(std::format("../svg/{}.svg", i + 1).c_str()), painterPaths[i]))
+						qCritical() << "load error";
+
+				vector<std::pair<std::shared_ptr<Contour>, float>> contours;
+				for (int i = 0; i < 3; i++)
+				{
+					auto [contour, ratio] = PainterPathUtil::toNormalizedLines(painterPaths[i], widths[i]);
+					contours.emplace_back(std::make_shared<Contour>(contour), ratio);
+				}
+				class StyleStrokeRadialGradient : public Renderer::ElementStyle
+				{
+				public:
+					float width;
+					StrokeType type;
+					StyleStrokeRadialGradient(float width, StrokeType type) :width(width), type(type) {};
+					virtual std::vector<Renderer::BaseStyle> toBaseStyles() const override
+					{
+						std::map<float, Material> materialMap = {
+							{0.09, Material{QColor(255,255,255),0,0.8}},
+							{0.63, Material{QColor(165,176,207),0,0.8}},
+							{1.00, Material{QColor(58,64,151),0,0.8}}
+						};
+						return { BaseStyle(std::make_shared<TransformStyle>(),
+							std::make_shared<MaterialStyleStroke>(width, type, StrokeEndType::kFlat,
+								std::make_shared<StrokeRadialGradient>(materialMap, false))) };
+					}
+				};
+				vector<std::shared_ptr<ElementStyle>> style = {
+					std::make_shared<StyleStrokeRadialGradient>(widths[0], StrokeType::kLeftSide),
+					std::make_shared<StyleStrokeRadialGradient>(widths[1], StrokeType::kRightSide),
+					std::make_shared<StyleStrokeRadialGradient>(widths[2], StrokeType::kLeftSide),
+				};
+				std::map<float, Material> materialMap = {
+					{0.09, Material{QColor(255,255,255),0,0.8}},
+					{0.63, Material{QColor(165,176,207),0,0.8}},
+					{1.00, Material{QColor(58,64,151),0,0.8}}
+				};
+				vector<std::shared_ptr<BaseElement>> element = {
+					std::make_shared<BaseElement>(contours[0].first, std::make_shared<MaterialStyleStroke>(
+						widths[0], StrokeType::kLeftSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
+					std::make_shared<BaseElement>(contours[1].first, std::make_shared<MaterialStyleStroke>(
+						widths[1], StrokeType::kRightSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
+					std::make_shared<BaseElement>(contours[2].first, std::make_shared<MaterialStyleStroke>(
+						widths[2], StrokeType::kLeftSide, StrokeEndType::kFlat, std::make_shared<StrokeRadialGradient>(materialMap, false))),
+				};
+
+				QTransform trans = QTransform::fromScale(0.3, 0.3).inverted();
+				glm::mat3x2 mat(trans.m11(), trans.m12(), trans.m21(), trans.m22(), trans.m31(), trans.m32());
+
+				trans = QTransform::fromTranslate(0.5, 0).scale(0.3, 0.3).inverted();
+				glm::mat3x2 mat2(trans.m11(), trans.m12(), trans.m21(), trans.m22(), trans.m31(), trans.m32());
+				//mat = glm::mat3x2(11, 22, 33, 44, 55, 66);
+				//mat2 = glm::mat3x2(1, 2, 3, 4, 5, 6);
+
+				qDebug() << std::format("\n{} {} {}\n {} {} {}\n{} {} {}",
+					trans.m11(), trans.m21(), trans.m31(),
+					trans.m12(), trans.m22(), trans.m32(),
+					trans.m13(), trans.m23(), trans.m33()).c_str();
+
+				//painting.addElement(*element[0], ElementTransform{ glm::vec4(-1,-1,1,1), mat, 0});
+				painting.addElement(*element[1], ElementTransform{ glm::vec4(-1,-1,0,1), mat, 0 });
+				painting.addElement(*element[2], ElementTransform{ glm::vec4(0,-1,1,1), mat2, 0 });
+				//painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.45,0.45), glm::vec2(0.25), 0, glm::bvec2(false), 0 });
+				//painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.535,0.33), glm::vec2(0.15), 0, glm::bvec2(false), 0 });
+				//painting.addElement(*element[2], ElementTransform{ glm::vec2(-0.535,0.23), glm::vec2(0.15), 0, glm::bvec2(false), 0 });
+			}
+			else
+			{
+				for (int i = 0; i < 1000; i++)
+				{
+					float x = (float)rand() / RAND_MAX * 2 - 1;
+					float y = (float)rand() / RAND_MAX * 2 - 1;
+					//painting.addElement(*element[i % 3], ElementTransform{ glm::vec2(x,y), glm::vec2(0.025), (float)rand() / RAND_MAX * 360, glm::bvec2(false), 0 });
+				}
 			}
 		}
 	}

ArchitectureColoredPainting/src/Renderer/Painting/Line.cpp

@@ -1,5 +1,6 @@
 #include "Line.h"
 #include <glm/detail/func_packing.hpp>
+#include <qDebug>
 using namespace Renderer;
 using std::vector;
 using std::pair;
@@ -121,9 +122,10 @@ Point Line::getMinDistancePointOnSide(double xy, double l, double r, bool isY) {
 		swap(pMidr.x, pMidr.y);
 	}
 	double mid, midr;
+	//qDebug() << "Start" << xy << l << r << isY;
 	while (fabs(r - l) > eps) {
-		mid = (l + r) / 2;
+		mid = l + (r - l) / 3;
-		midr = (mid + r) / 2;
+		midr = r - (r - l) / 3;
 		if (isY) {
 			pMid.x = mid;
 			pMidr.x = midr;
@@ -139,6 +141,7 @@ Point Line::getMinDistancePointOnSide(double xy, double l, double r, bool isY) {
 			r = midr;
 		}
 	}
+	//qDebug() << " End" << xy << l << r << isY;
 	Point ans = { xy, l };
 	if (isY) swap(ans.x, ans.y);
 	return ans;
@@ -155,9 +158,9 @@ int Line::getPointSideOfLine(Point p) {
 
 bool Line::judgeOneSideIntersectionWithWidth(double xy, double l, double r, bool isY, double width, int type) {
 	Point p = getMinDistancePointOnSide(xy, l, r, isY);
-	if (type && getPointSideOfLine(p) != type) {
+	//if (type && getPointSideOfLine(p) != type) {
-		return false;
+	//	return false;
-	}
+	//}
 	return getMinDistanceFromPoint(p) <= width;	
 }
 

ArchitectureColoredPainting/src/Renderer/Painting/LineTree.cpp

@@ -2,6 +2,7 @@
 #include <queue>
 #include <set>
 #include <utility>
+#include <qDebug>
 
 using namespace Renderer;
 using std::set;
@@ -96,6 +97,7 @@ void LineTree::monotonization(vector<PointVector>& inLines, vector<std::shared_p
 	}
 	// 防止在首尾直线在与 X 轴平行上
 	int siz = outLines.size();
+	qWarning() << outLines.size();
 	if (!(outLines[0]->getBegin() == outLines[siz - 1]->getEnd())) 
 		return;
 	if (isOffset) {
@@ -141,8 +143,7 @@ bool LineTree::handleShortCutNode(LineTreeNode& fa, LineTreeNode& nowTreeNode, d
 			nowTreeNode.lineSet.push_back(lineIndex);
 		}
 	}
-	if (nowTreeNode.lineSet.size() <= requiredLineMin 
+	if (nowTreeNode.lineSet.size() <= requiredLineMin || (nowTreeNode.bound.z()-nowTreeNode.bound.x()) *sqrt(2) <= lineWidth) {
-		|| (nowTreeNode.bound.z()-nowTreeNode.bound.x())*sqrt(2) <= lineWidth) {
 		if (nowTreeNode.lineSet.empty())
 			return false;
 		restOfTreeNodes.push_back(nowTreeNode);
@@ -269,7 +270,7 @@ vector<BvhTreeData> LineTree::getPointLineAndBvhTree(vector<float>& resPoints, v
 		oneData.leftSon = resLines.size();
 		oneData.rightSon = 0;
 		oneData.bound = nowTreeNode.bound;
-		//std::cout << nowTreeNode.lineSet.size() << ' ';
+		qDebug() << nowTreeNode.bound << nowTreeNode.lineSet.size() << ' ';
 		resLines.push_back(nowTreeNode.lineSet.size());
 		for (auto& lineIndex : nowTreeNode.lineSet) {
 			resLines.push_back(lineIndex);

test.json

@@ -24,7 +24,7 @@
         }
     ],
     "height": 1080,
-    "project-name": "样例1",
+    "project-name": "ŃůŔý1",
     "root-layer": {
         "children": [
             {