From c807010554ca9b9e4432a5b075238acdb789536a Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 22 Oct 2020 13:36:29 +0900 Subject: [PATCH] examples FillRule: added shape::fillRule() example one shape shows Winding, the other one shows EvenOdd. --- inc/thorvg.h | 2 +- src/examples/FillRule.cpp | 141 ++++++++++++++++++++++++++++++++++++++ src/examples/meson.build | 1 + 3 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 src/examples/FillRule.cpp diff --git a/inc/thorvg.h b/inc/thorvg.h index 00e0163c..d6c3c214 100644 --- a/inc/thorvg.h +++ b/inc/thorvg.h @@ -245,7 +245,7 @@ public: //Getters uint32_t pathCommands(const PathCommand** cmds) const noexcept; uint32_t pathCoords(const Point** pts) const noexcept; - Result fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept; + Result fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept; //TODO: => fillColor const Fill* fill() const noexcept; FillRule fillRule() const noexcept; diff --git a/src/examples/FillRule.cpp b/src/examples/FillRule.cpp new file mode 100644 index 00000000..57735432 --- /dev/null +++ b/src/examples/FillRule.cpp @@ -0,0 +1,141 @@ +#include "Common.h" + +/************************************************************************/ +/* Drawing Commands */ +/************************************************************************/ + +void tvgDrawCmds(tvg::Canvas* canvas) +{ + if (!canvas) return; + + //Star + auto shape1 = tvg::Shape::gen(); + shape1->moveTo(186, 34); + shape1->lineTo(307, 365); + shape1->lineTo(26, 161); + shape1->lineTo(374, 160); + shape1->lineTo(97, 365); + shape1->close(); + shape1->fill(255, 255, 255, 255); + shape1->fill(tvg::FillRule::Winding); //Fill all winding shapes + + if (canvas->push(move(shape1)) != tvg::Result::Success) return; + + //Star 2 + auto shape2 = tvg::Shape::gen(); + shape2->moveTo(536, 334); + shape2->lineTo(657, 665); + shape2->lineTo(376, 461); + shape2->lineTo(724, 460); + shape2->lineTo(447, 665); + shape2->close(); + shape2->fill(255, 255, 255, 255); + shape2->fill(tvg::FillRule::EvenOdd); //Fill polygons with even odd pattern + + if (canvas->push(move(shape2)) != tvg::Result::Success) return; +} + +/************************************************************************/ +/* Sw Engine Test Code */ +/************************************************************************/ + +static unique_ptr swCanvas; + +void tvgSwTest(uint32_t* buffer) +{ + //Create a Canvas + swCanvas = tvg::SwCanvas::gen(); + swCanvas->target(buffer, WIDTH, WIDTH, HEIGHT, tvg::SwCanvas::ARGB8888); + + /* Push the shape into the Canvas drawing list + When this shape is into the canvas list, the shape could update & prepare + internal data asynchronously for coming rendering. + Canvas keeps this shape node unless user call canvas->clear() */ + tvgDrawCmds(swCanvas.get()); +} + +void drawSwView(void* data, Eo* obj) +{ + if (swCanvas->draw() == tvg::Result::Success) { + swCanvas->sync(); + } +} + + +/************************************************************************/ +/* GL Engine Test Code */ +/************************************************************************/ + +static unique_ptr glCanvas; + +void initGLview(Evas_Object *obj) +{ + static constexpr auto BPP = 4; + + //Create a Canvas + glCanvas = tvg::GlCanvas::gen(); + glCanvas->target(nullptr, WIDTH * BPP, WIDTH, HEIGHT); + + /* Push the shape into the Canvas drawing list + When this shape is into the canvas list, the shape could update & prepare + internal data asynchronously for coming rendering. + Canvas keeps this shape node unless user call canvas->clear() */ + tvgDrawCmds(glCanvas.get()); +} + +void drawGLview(Evas_Object *obj) +{ + auto gl = elm_glview_gl_api_get(obj); + gl->glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + gl->glClear(GL_COLOR_BUFFER_BIT); + + if (glCanvas->draw() == tvg::Result::Success) { + glCanvas->sync(); + } +} + + +/************************************************************************/ +/* Main Code */ +/************************************************************************/ + +int main(int argc, char **argv) +{ + tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw; + + if (argc > 1) { + if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl; + } + + //Initialize ThorVG Engine + if (tvgEngine == tvg::CanvasEngine::Sw) { + cout << "tvg engine: software" << endl; + } else { + cout << "tvg engine: opengl" << endl; + } + + //Threads Count + auto threads = std::thread::hardware_concurrency(); + + //Initialize ThorVG Engine + if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) { + + elm_init(argc, argv); + + if (tvgEngine == tvg::CanvasEngine::Sw) { + createSwView(); + } else { + createGlView(); + } + + elm_run(); + elm_shutdown(); + + //Terminate ThorVG Engine + tvg::Initializer::term(tvgEngine); + + } else { + cout << "engine is not supported" << endl; + } + return 0; +} diff --git a/src/examples/meson.build b/src/examples/meson.build index 05639111..43ad4fa1 100644 --- a/src/examples/meson.build +++ b/src/examples/meson.build @@ -9,6 +9,7 @@ source_file = [ 'CustomTransform.cpp', 'DirectUpdate.cpp', 'Duplicate.cpp', + 'FillRule.cpp', 'GradientTransform.cpp', 'LinearGradient.cpp', 'MultiCanvas.cpp',