Fixed gaps between triangles in brush stroke accurate draw
This commit is contained in:
parent
af32fd46c1
commit
994301c294
1 changed files with 51 additions and 13 deletions
|
|
@ -77,12 +77,12 @@ void BrushStrokeCanvasComponent::draw(SkCanvas* canvas, const DrawData& drawData
|
||||||
std::shared_ptr<void> BrushStrokeCanvasComponent::get_predraw_data_accurate(const DrawData& drawData, const CoordSpaceHelper& coords) const {
|
std::shared_ptr<void> BrushStrokeCanvasComponent::get_predraw_data_accurate(const DrawData& drawData, const CoordSpaceHelper& coords) const {
|
||||||
std::vector<BrushStrokeCanvasComponentPoint> points = smooth_points(0, d.points->size() - 1, DEFAULT_SMOOTHNESS);
|
std::vector<BrushStrokeCanvasComponentPoint> points = smooth_points(0, d.points->size() - 1, DEFAULT_SMOOTHNESS);
|
||||||
|
|
||||||
auto pathsToDraw = std::make_shared<std::vector<SkPath>>();
|
|
||||||
|
|
||||||
SCollision::AABB<float> viewGenerousColliderInObjSpace = coords.world_collider_to_coords<SCollision::AABB<float>>(drawData.cam.viewingAreaGenerousCollider);
|
SCollision::AABB<float> viewGenerousColliderInObjSpace = coords.world_collider_to_coords<SCollision::AABB<float>>(drawData.cam.viewingAreaGenerousCollider);
|
||||||
viewGenerousColliderInObjSpace.min -= Vector2f{1.0f, 1.0f};
|
viewGenerousColliderInObjSpace.min -= Vector2f{1.0f, 1.0f};
|
||||||
viewGenerousColliderInObjSpace.max += Vector2f{1.0f, 1.0f};
|
viewGenerousColliderInObjSpace.max += Vector2f{1.0f, 1.0f};
|
||||||
|
|
||||||
|
std::vector<std::array<SkPoint, 3>> finalTrianglePoints;
|
||||||
|
|
||||||
auto triangleFunc = [&](Vector2f a, Vector2f b, Vector2f c) {
|
auto triangleFunc = [&](Vector2f a, Vector2f b, Vector2f c) {
|
||||||
SCollision::Triangle<float> triCollider = {a, b, c};
|
SCollision::Triangle<float> triCollider = {a, b, c};
|
||||||
|
|
||||||
|
|
@ -110,10 +110,7 @@ std::shared_ptr<void> BrushStrokeCanvasComponent::get_predraw_data_accurate(cons
|
||||||
});
|
});
|
||||||
for(auto& tri : clipList) {
|
for(auto& tri : clipList) {
|
||||||
auto& c = drawData.cam.c;
|
auto& c = drawData.cam.c;
|
||||||
SkPathBuilder pathBuilder;
|
finalTrianglePoints.emplace_back(std::array<SkPoint, 3>{convert_vec2<SkPoint>(c.to_space(tri[0])), convert_vec2<SkPoint>(c.to_space(tri[1])), convert_vec2<SkPoint>(c.to_space(tri[2]))});
|
||||||
std::vector<SkPoint> triSkPoints = {convert_vec2<SkPoint>(c.to_space(tri[0])), convert_vec2<SkPoint>(c.to_space(tri[1])), convert_vec2<SkPoint>(c.to_space(tri[2]))};
|
|
||||||
pathBuilder.addPolygon({triSkPoints.data(), triSkPoints.size()}, true);
|
|
||||||
pathsToDraw->emplace_back(pathBuilder.detach());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -121,25 +118,66 @@ std::shared_ptr<void> BrushStrokeCanvasComponent::get_predraw_data_accurate(cons
|
||||||
|
|
||||||
create_triangles(triangleFunc, points, 0, nullptr);
|
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<std::vector<SkPath>>();
|
||||||
|
for(auto& finalTriangle : finalTrianglePoints) {
|
||||||
|
SkPathBuilder pathBuilder;
|
||||||
|
pathBuilder.addPolygon({finalTriangle.data(), finalTriangle.size()}, true);
|
||||||
|
pathsToDraw->emplace_back(pathBuilder.detach());
|
||||||
|
}
|
||||||
|
return pathsToDraw;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::vector<SkPoint> 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<sk_sp<SkVertices>>();
|
||||||
|
*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<void>& predrawData) const {
|
bool BrushStrokeCanvasComponent::accurate_draw(SkCanvas* canvas, const DrawData& drawData, const CoordSpaceHelper& coords, const std::shared_ptr<void>& predrawData) const {
|
||||||
auto pathsToDraw = std::static_pointer_cast<std::vector<SkPath>>(predrawData);
|
if(predrawData) {
|
||||||
|
if(drawData.isSVGRender) { // SVG renders can't use saveLayer, so use this despite it being buggy in some scenarios
|
||||||
if(!pathsToDraw->empty()) {
|
auto pathsToDraw = std::static_pointer_cast<std::vector<SkPath>>(predrawData);
|
||||||
if(d.color.w() == 1.0f) {
|
|
||||||
SkPaint paint;
|
SkPaint paint;
|
||||||
paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), d.color.w()});
|
paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), d.color.w()});
|
||||||
for(const SkPath& p : *pathsToDraw)
|
for(const SkPath& p : *pathsToDraw)
|
||||||
canvas->drawPath(p, paint);
|
canvas->drawPath(p, paint);
|
||||||
}
|
}
|
||||||
|
else if(d.color.w() == 1.0f) {
|
||||||
|
auto verticesToDraw = std::static_pointer_cast<sk_sp<SkVertices>>(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 {
|
else {
|
||||||
canvas->saveLayerAlphaf(nullptr, d.color.w());
|
canvas->saveLayerAlphaf(nullptr, d.color.w());
|
||||||
|
auto verticesToDraw = std::static_pointer_cast<sk_sp<SkVertices>>(predrawData);
|
||||||
SkPaint paint;
|
SkPaint paint;
|
||||||
paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), 1.0f});
|
paint.setColor4f(SkColor4f{d.color.x(), d.color.y(), d.color.z(), 1.0f});
|
||||||
for(const SkPath& p : *pathsToDraw)
|
canvas->drawVertices(*verticesToDraw, SkBlendMode::kSrcOver, paint);
|
||||||
canvas->drawPath(p, paint);
|
|
||||||
canvas->restore();
|
canvas->restore();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue