git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-20 15:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

example stack: updated sample.

Browse source 
use paints() method instead of grabbing a manual list.

@Issue: https://github.com/thorvg/thorvg/issues/1501
This commit is contained in:
Hermet Park 2023-06-20 15:36:35 +09:00 • committed by Hermet Park
parent caa214e4db
commit be1984982e
1 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/examples/Stacking.cpp
View file

@ -26,37 +26,30 @@
/* Drawing Commands */ /* Drawing Commands */
/************************************************************************/ /************************************************************************/
static tvg::Paint* paints[4];
static int order = 0;
void tvgDrawCmds(tvg::Canvas* canvas) void tvgDrawCmds(tvg::Canvas* canvas)
{ {
if (!canvas) return; if (!canvas) return;
//Prepare Round Rectangle //Prepare Round Rectangle
auto shape1 = tvg::Shape::gen(); auto shape1 = tvg::Shape::gen();
paints[0] = shape1.get();
shape1->appendRect(0, 0, 400, 400, 50, 50); //x, y, w, h, rx, ry shape1->appendRect(0, 0, 400, 400, 50, 50); //x, y, w, h, rx, ry
shape1->fill(0, 255, 0); //r, g, b shape1->fill(0, 255, 0); //r, g, b
if (canvas->push(std::move(shape1)) != tvg::Result::Success) return; if (canvas->push(std::move(shape1)) != tvg::Result::Success) return;
//Prepare Round Rectangle2 //Prepare Round Rectangle2
auto shape2 = tvg::Shape::gen(); auto shape2 = tvg::Shape::gen();
paints[1] = shape2.get();
shape2->appendRect(100, 100, 400, 400, 50, 50); //x, y, w, h, rx, ry shape2->appendRect(100, 100, 400, 400, 50, 50); //x, y, w, h, rx, ry
shape2->fill(255, 255, 0); //r, g, b shape2->fill(255, 255, 0); //r, g, b
if (canvas->push(std::move(shape2)) != tvg::Result::Success) return; if (canvas->push(std::move(shape2)) != tvg::Result::Success) return;
//Prepare Round Rectangle3 //Prepare Round Rectangle3
auto shape3 = tvg::Shape::gen(); auto shape3 = tvg::Shape::gen();
paints[2] = shape3.get();
shape3->appendRect(200, 200, 400, 400, 50, 50); //x, y, w, h, rx, ry shape3->appendRect(200, 200, 400, 400, 50, 50); //x, y, w, h, rx, ry
shape3->fill(0, 255, 255); //r, g, b shape3->fill(0, 255, 255); //r, g, b
if (canvas->push(std::move(shape3)) != tvg::Result::Success) return; if (canvas->push(std::move(shape3)) != tvg::Result::Success) return;
//Prepare Scene //Prepare Scene
auto scene = tvg::Scene::gen(); auto scene = tvg::Scene::gen();
paints[3] = scene.get();
auto shape4 = tvg::Shape::gen(); auto shape4 = tvg::Shape::gen();
shape4->appendCircle(400, 400, 100, 100); shape4->appendCircle(400, 400, 100, 100);
@ -80,39 +73,11 @@ void tvgUpdateCmds(tvg::Canvas* canvas)
{ {
if (!canvas) return; if (!canvas) return;
//Explicitly clear all retained paint nodes from canvas but not free them. //Circular list
if (canvas->clear(false) != tvg::Result::Success) return; auto& list = canvas->paints();
auto paint = *list.begin();
switch (order) { list.pop_front();
case 0: list.push_back(paint);
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[0]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[1]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[2]));
canvas->push(unique_ptr<tvg::Scene>((tvg::Scene*)paints[3]));
break;
case 1:
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[1]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[2]));
canvas->push(unique_ptr<tvg::Scene>((tvg::Scene*)paints[3]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[0]));
break;
case 2:
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[2]));
canvas->push(unique_ptr<tvg::Scene>((tvg::Scene*)paints[3]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[0]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[1]));
break;
case 3:
canvas->push(unique_ptr<tvg::Scene>((tvg::Scene*)paints[3]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[0]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[1]));
canvas->push(unique_ptr<tvg::Shape>((tvg::Shape*)paints[2]));
break;
}
++order;
if (order > 3) order = 0;
} }