From 994301c294a6c77b20dd055e213370280c733311 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Sun, 8 Feb 2026 20:24:23 +0300 Subject: [PATCH] Fixed gaps between triangles in brush stroke accurate draw --- .../BrushStrokeCanvasComponent.cpp | 64 +++++++++++++++---- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/src/CanvasComponents/BrushStrokeCanvasComponent.cpp b/src/CanvasComponents/BrushStrokeCanvasComponent.cpp index 11a1eb3..d800ca7 100644 --- a/src/CanvasComponents/BrushStrokeCanvasComponent.cpp +++ b/src/CanvasComponents/BrushStrokeCanvasComponent.cpp @@ -77,12 +77,12 @@ void BrushStrokeCanvasComponent::draw(SkCanvas* canvas, const DrawData& drawData std::shared_ptr BrushStrokeCanvasComponent::get_predraw_data_accurate(const DrawData& drawData, const CoordSpaceHelper& coords) const { std::vector points = smooth_points(0, d.points->size() - 1, DEFAULT_SMOOTHNESS); - auto pathsToDraw = std::make_shared>(); - SCollision::AABB viewGenerousColliderInObjSpace = coords.world_collider_to_coords>(drawData.cam.viewingAreaGenerousCollider); viewGenerousColliderInObjSpace.min -= Vector2f{1.0f, 1.0f}; viewGenerousColliderInObjSpace.max += Vector2f{1.0f, 1.0f}; + std::vector> finalTrianglePoints; + auto triangleFunc = [&](Vector2f a, Vector2f b, Vector2f c) { SCollision::Triangle triCollider = {a, b, c}; @@ -110,10 +110,7 @@ std::shared_ptr BrushStrokeCanvasComponent::get_predraw_data_accurate(cons }); for(auto& tri : clipList) { auto& c = drawData.cam.c; - SkPathBuilder pathBuilder; - std::vector triSkPoints = {convert_vec2(c.to_space(tri[0])), convert_vec2(c.to_space(tri[1])), convert_vec2(c.to_space(tri[2]))}; - pathBuilder.addPolygon({triSkPoints.data(), triSkPoints.size()}, true); - pathsToDraw->emplace_back(pathBuilder.detach()); + finalTrianglePoints.emplace_back(std::array{convert_vec2(c.to_space(tri[0])), convert_vec2(c.to_space(tri[1])), convert_vec2(c.to_space(tri[2]))}); } } return false; @@ -121,25 +118,66 @@ std::shared_ptr BrushStrokeCanvasComponent::get_predraw_data_accurate(cons create_triangles(triangleFunc, points, 0, nullptr); - return pathsToDraw; + // Match points that are close enough. I don't think this is required. + //if(!finalTrianglePoints.empty()) { + // for(size_t i = 0; i < finalTrianglePoints.size() - 1; i++) { + // for(size_t j = 0; j < 3; j++) { + // for(size_t k = i + 1; k < finalTrianglePoints.size(); k++) { + // for(size_t l = 0; l < 3; l++) { + // if(std::fabs(finalTrianglePoints[i][j].fX - finalTrianglePoints[k][l].fX) < 0.0001f && std::fabs(finalTrianglePoints[i][j].fY - finalTrianglePoints[k][l].fY) < 0.0001f && finalTrianglePoints[k][l] != finalTrianglePoints[i][j]) + // finalTrianglePoints[k][l] = finalTrianglePoints[i][j]; + // } + // } + // } + // } + //} + + if(finalTrianglePoints.empty()) + return nullptr; + else if(drawData.isSVGRender) { + auto pathsToDraw = std::make_shared>(); + for(auto& finalTriangle : finalTrianglePoints) { + SkPathBuilder pathBuilder; + pathBuilder.addPolygon({finalTriangle.data(), finalTriangle.size()}, true); + pathsToDraw->emplace_back(pathBuilder.detach()); + } + return pathsToDraw; + } + else { + std::vector pointVec(finalTrianglePoints.size() * 3); + for(size_t i = 0; i < finalTrianglePoints.size(); i++) { + pointVec[i * 3 + 0] = finalTrianglePoints[i][0]; + pointVec[i * 3 + 1] = finalTrianglePoints[i][1]; + pointVec[i * 3 + 2] = finalTrianglePoints[i][2]; + } + auto verticesToDraw = std::make_shared>(); + *verticesToDraw = SkVertices::MakeCopy(SkVertices::kTriangles_VertexMode, pointVec.size(), pointVec.data(), nullptr, nullptr); + return verticesToDraw; + } + return nullptr; } bool BrushStrokeCanvasComponent::accurate_draw(SkCanvas* canvas, const DrawData& drawData, const CoordSpaceHelper& coords, const std::shared_ptr& predrawData) const { - auto pathsToDraw = std::static_pointer_cast>(predrawData); - - if(!pathsToDraw->empty()) { - if(d.color.w() == 1.0f) { + if(predrawData) { + if(drawData.isSVGRender) { // SVG renders can't use saveLayer, so use this despite it being buggy in some scenarios + auto pathsToDraw = std::static_pointer_cast>(predrawData); SkPaint paint; paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), d.color.w()}); for(const SkPath& p : *pathsToDraw) canvas->drawPath(p, paint); } + else if(d.color.w() == 1.0f) { + auto verticesToDraw = std::static_pointer_cast>(predrawData); + SkPaint paint; + paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), d.color.w()}); + canvas->drawVertices(*verticesToDraw, SkBlendMode::kSrcOver, paint); + } else { canvas->saveLayerAlphaf(nullptr, d.color.w()); + auto verticesToDraw = std::static_pointer_cast>(predrawData); SkPaint paint; paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), 1.0f}); - for(const SkPath& p : *pathsToDraw) - canvas->drawPath(p, paint); + canvas->drawVertices(*verticesToDraw, SkBlendMode::kSrcOver, paint); canvas->restore(); } }