FIX: painting渲染bug

ArchitectureColoredPainting/res/Shaders/painting.comp

@@ -1149,7 +1149,7 @@ bool strokeElement(vec2 localUV, uint contourIndex, uint linesOffset, uint point
         p[2] *= ratio;
         p[3] *= ratio;
 
-        vec2 tangentBeginNext;
+        vec2 tangentBeginNext = vec2(0);
         if (contourIterator + 1 < contourIndex + 1 + lineCount)
         {
             uint lineIndex = elementIndexs[contourIterator + 1];
@@ -1217,10 +1217,10 @@ bool strokeElement(vec2 localUV, uint contourIndex, uint linesOffset, uint point
             bool hit = d < minDistance;
             if (onBegin)
                 hit =
-                    hit && shouldFillBeginCap(localUV, percent[0] < 1e-5, endType, p[0], tangentBegin, p3Last - p2Last);
+                    hit && shouldFillBeginCap(localUV, contourIterator == contourIndex + 1, endType, p[0], tangentBegin, p3Last - p2Last);
             if (onEnd)
                 hit = hit &&
-                      shouldFillEndCap(localUV, percent[1] > 1 - 1e-5, endType, p[3], tangentEnd, tangentBeginNext);
+                      shouldFillEndCap(localUV, tangentBeginNext==vec2(0), endType, p[3], tangentEnd, tangentBeginNext);
             if (hit)
             {
 

ArchitectureColoredPainting/res/Shaders/painting.frag

@@ -36,11 +36,6 @@ void main()
         lod++;
     gMetallicRoughness = mt.rg;
     
-//    int pageSize = textureSize(texture_basecolor, levels-1).x;
-
-//    uint pageId = 0;
-//    for(uint i = 0; i < lodExpect; i++)
-//        pageId += 1<<(2*(levels-1-i));
     uint w = 1<<(levels-1-lodExpect);
     ivec2 page = ivec2(TexCoords * vec2(w));
     page = clamp(page, ivec2(0), ivec2(w-1));
@@ -49,7 +44,6 @@ void main()
         gPaintingIndex = uvec2(0);
     else
         gPaintingIndex = uvec2((paintingId<<4)+lodExpect, (page.y<<8)+page.x);
-    gPaintingTexCoord = vec2(1., 1.) - TexCoords * 2;
     return;
 
 }

ArchitectureColoredPainting/res/Shaders/painting.vert

@@ -14,7 +14,6 @@ uniform mat4 projection;
 void main()
 {
     TexCoords = aTexCoords;
-    TexCoords.y = -TexCoords.y;
     WorldPos = vec3(model * vec4(aPos, 1.0));
     Normal = mat3(model) * aNormal;   
 

ArchitectureColoredPainting/src/Renderer/Model.cpp

@@ -52,7 +52,7 @@ void Renderer::Model::loadModel(QString path)
 	directory = modelFile.dir();
 
 	Assimp::Importer importer;
-	const aiScene* scene = importer.ReadFile(modelFile.absoluteFilePath().toUtf8(), aiProcess_Triangulate /*| aiProcess_FlipUVs*/);
+	const aiScene* scene = importer.ReadFile(modelFile.absoluteFilePath().toUtf8(), aiProcess_Triangulate);
 	if (!scene || scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE || !scene->mRootNode)
 	{
 		qCritical() << "ERROR::ASSIMP::" << importer.GetErrorString() << endl;
@@ -229,8 +229,104 @@ GLuint Renderer::Model::loadPainting(std::string path)
 	if (iter != paintingLoaded.end())
 		return iter->second;
 
-	Painting painting = PaintingUtil::transfromToPainting("../data.json");
+	Painting painting;
+	if (auto file = QFileInfo(QString(path.c_str())); file.isFile())
+		painting = PaintingUtil::transfromToPainting(file.path());
+	else
+	{
+		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)
+		{
+			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")
+		{
+			float widths[] = { 0.43, 0.43 * 0.25 / 0.15, 0.43 * 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),
+			};
+			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[1], contours[1].second}),
+				std::make_shared<Element>(Element{ contours[2].first, style[2], contours[2].second}),
+			};
+			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 });
+			}
+		}
+	}
 	painting.generateBuffers(glFunc);
 
 	auto index = vtManager->createVirtualTexture(painting);