git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-27 08:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wg_engine: stroke first

Browse source 
[issues 1479: strokes](#1479)

Introduced order setting

    auto star = tvg::Shape::gen();
    star->fill(80, 80, 80);
    star->moveTo(599, 34);
    star->lineTo(653, 143);
    star->lineTo(774, 160);
    star->lineTo(687, 244);
    star->lineTo(707, 365);
    star->lineTo(599, 309);
    star->lineTo(497, 365);
    star->lineTo(512, 245);
    star->lineTo(426, 161);
    star->lineTo(546, 143);
    star->close();
    star->strokeWidth(10);
    star->strokeJoin(tvg::StrokeJoin::Round);
    star->strokeFill(255, 255, 255);
    star->order(true); // stroke first
    if (canvas->push(std::move(star)) != tvg::Result::Success) return;
This commit is contained in:
Sergii Liebodkin 2024-03-18 12:46:54 +02:00 • committed by Hermet Park
parent dd2e7b9b4e
commit c6601d1eee
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/wg_engine/tvgWgRenderData.cpp
View file

@ -214,6 +214,7 @@ void WgRenderDataPaint::release(WgContext& context)
void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rshape) void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rshape)
{ {
releaseMeshes(context); releaseMeshes(context);
strokeFirst = false;
// update shapes geometry // update shapes geometry
WgGeometryDataGroup shapes; WgGeometryDataGroup shapes;
if(rshape.rule == tvg::FillRule::EvenOdd) { if(rshape.rule == tvg::FillRule::EvenOdd) {
@ -232,6 +233,7 @@ void WgRenderDataShape::updateMeshes(WgContext &context, const RenderShape &rsha
meshBBoxShapes.update(context, &box); meshBBoxShapes.update(context, &box);
// update strokes geometry // update strokes geometry
if (rshape.stroke) { if (rshape.stroke) {
strokeFirst = rshape.stroke->strokeFirst;
WgGeometryDataGroup strokes; WgGeometryDataGroup strokes;
strokes.stroke(rshape); strokes.stroke(rshape);
strokes.getBBox(pmin, pmax); strokes.getBBox(pmin, pmax);

1
src/renderer/wg_engine/tvgWgRenderData.h
View file

@ -81,6 +81,7 @@ struct WgRenderDataShape: public WgRenderDataPaint
WgMeshDataGroup meshGroupStrokes{}; WgMeshDataGroup meshGroupStrokes{};
WgMeshData meshBBoxShapes{}; WgMeshData meshBBoxShapes{};
WgMeshData meshBBoxStrokes{}; WgMeshData meshBBoxStrokes{};
bool strokeFirst{};
void updateMeshes(WgContext& context, const RenderShape& rshape); void updateMeshes(WgContext& context, const RenderShape& rshape);
void releaseMeshes(WgContext& context); void releaseMeshes(WgContext& context);

5
src/renderer/wg_engine/tvgWgRenderTarget.cpp
View file

@ -69,8 +69,11 @@ void WgRenderTarget::renderShape(WGPUCommandEncoder commandEncoder, WgRenderData
assert(renderData); assert(renderData);
assert(commandEncoder); assert(commandEncoder);
WGPURenderPassEncoder renderPassEncoder = beginRenderPass(commandEncoder); WGPURenderPassEncoder renderPassEncoder = beginRenderPass(commandEncoder);
if (renderData->strokeFirst)
drawStroke(renderPassEncoder, renderData);
drawShape(renderPassEncoder, renderData); drawShape(renderPassEncoder, renderData);
drawStroke(renderPassEncoder, renderData); if (!renderData->strokeFirst)
drawStroke(renderPassEncoder, renderData);
endRenderPass(renderPassEncoder); endRenderPass(renderPassEncoder);
} }