From e445b7f579666134199c535d9b839fca64f9d88f Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 6 Nov 2020 15:37:17 +0900 Subject: [PATCH] Revert "examples: revise example code." This broke gl_engine rendering, revert it. This reverts commit 9bb1972ef97e1ae3c83fe9e48c16262d9f246a4a. --- src/examples/Arc.cpp | 1 - src/examples/Blending.cpp | 6 ------ src/examples/Boundary.cpp | 6 ------ src/examples/ClipPath.cpp | 6 ------ src/examples/Duplicate.cpp | 6 ------ src/examples/FillRule.cpp | 6 ------ src/examples/LinearGradient.cpp | 6 ------ src/examples/MultiCanvas.cpp | 6 ------ src/examples/MultiShapes.cpp | 6 ------ src/examples/Opacity.cpp | 6 ------ src/examples/Path.cpp | 6 ------ src/examples/PathCopy.cpp | 6 ------ src/examples/RadialGradient.cpp | 6 ------ src/examples/Scene.cpp | 6 ------ src/examples/Shape.cpp | 6 ------ src/examples/Stroke.cpp | 4 ---- src/examples/StrokeLine.cpp | 5 +---- src/examples/Svg.cpp | 4 ---- src/examples/Svg2.cpp | 4 ---- src/examples/Update.cpp | 7 +++---- 20 files changed, 4 insertions(+), 105 deletions(-) diff --git a/src/examples/Arc.cpp b/src/examples/Arc.cpp index 4bedced9..ccd75fb9 100644 --- a/src/examples/Arc.cpp +++ b/src/examples/Arc.cpp @@ -93,7 +93,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - swCanvas->clear(); //Flush out cached resource } diff --git a/src/examples/Blending.cpp b/src/examples/Blending.cpp index a821d66c..81f3e012 100644 --- a/src/examples/Blending.cpp +++ b/src/examples/Blending.cpp @@ -76,9 +76,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -112,9 +109,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Boundary.cpp b/src/examples/Boundary.cpp index cc89f28c..e39e1cb5 100644 --- a/src/examples/Boundary.cpp +++ b/src/examples/Boundary.cpp @@ -65,9 +65,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -101,9 +98,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/ClipPath.cpp b/src/examples/ClipPath.cpp index 2b246676..f695fe1a 100644 --- a/src/examples/ClipPath.cpp +++ b/src/examples/ClipPath.cpp @@ -135,9 +135,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -171,9 +168,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Duplicate.cpp b/src/examples/Duplicate.cpp index 799248a3..2c94642b 100644 --- a/src/examples/Duplicate.cpp +++ b/src/examples/Duplicate.cpp @@ -117,9 +117,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -153,9 +150,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/FillRule.cpp b/src/examples/FillRule.cpp index ce5bd34d..dd6728e4 100644 --- a/src/examples/FillRule.cpp +++ b/src/examples/FillRule.cpp @@ -59,9 +59,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -95,9 +92,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/LinearGradient.cpp b/src/examples/LinearGradient.cpp index 0e87e520..8d255430 100644 --- a/src/examples/LinearGradient.cpp +++ b/src/examples/LinearGradient.cpp @@ -94,9 +94,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -130,9 +127,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/MultiCanvas.cpp b/src/examples/MultiCanvas.cpp index 42ea2148..e8739af7 100644 --- a/src/examples/MultiCanvas.cpp +++ b/src/examples/MultiCanvas.cpp @@ -79,9 +79,6 @@ void drawSwView(void* data, Eo* obj) if (canvas->draw() == tvg::Result::Success) { canvas->sync(); } - - //Explicitly clear all retained resources. - canvas->clear(); } @@ -163,9 +160,6 @@ void drawGLview(Evas_Object *obj) if (canvas->draw() == tvg::Result::Success) { canvas->sync(); } - - //Explicitly clear all retained resources. - canvas->clear(); } diff --git a/src/examples/MultiShapes.cpp b/src/examples/MultiShapes.cpp index a629a669..c7b88a04 100644 --- a/src/examples/MultiShapes.cpp +++ b/src/examples/MultiShapes.cpp @@ -54,9 +54,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -90,9 +87,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Opacity.cpp b/src/examples/Opacity.cpp index afc7309b..3b9dd44e 100644 --- a/src/examples/Opacity.cpp +++ b/src/examples/Opacity.cpp @@ -83,9 +83,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -119,9 +116,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Path.cpp b/src/examples/Path.cpp index 5d22adc7..3b4241ef 100644 --- a/src/examples/Path.cpp +++ b/src/examples/Path.cpp @@ -71,9 +71,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -107,9 +104,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/PathCopy.cpp b/src/examples/PathCopy.cpp index 13747f30..fca78bea 100644 --- a/src/examples/PathCopy.cpp +++ b/src/examples/PathCopy.cpp @@ -108,9 +108,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -144,9 +141,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/RadialGradient.cpp b/src/examples/RadialGradient.cpp index e778ffe9..c33ba432 100644 --- a/src/examples/RadialGradient.cpp +++ b/src/examples/RadialGradient.cpp @@ -94,9 +94,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -130,9 +127,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Scene.cpp b/src/examples/Scene.cpp index 3e809082..4760b949 100644 --- a/src/examples/Scene.cpp +++ b/src/examples/Scene.cpp @@ -101,9 +101,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -137,9 +134,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Shape.cpp b/src/examples/Shape.cpp index 200ad2d2..235e82ed 100644 --- a/src/examples/Shape.cpp +++ b/src/examples/Shape.cpp @@ -44,9 +44,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -80,9 +77,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Stroke.cpp b/src/examples/Stroke.cpp index 707b21d5..a1beeee4 100644 --- a/src/examples/Stroke.cpp +++ b/src/examples/Stroke.cpp @@ -102,8 +102,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -137,8 +135,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/StrokeLine.cpp b/src/examples/StrokeLine.cpp index 33acccf1..6c8cc7ba 100644 --- a/src/examples/StrokeLine.cpp +++ b/src/examples/StrokeLine.cpp @@ -176,8 +176,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -211,8 +209,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - //Explicitly clear all retained resources. - glCanvas->clear(); } @@ -241,6 +237,7 @@ int main(int argc, char **argv) //Initialize ThorVG Engine if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) { + elm_init(argc, argv); if (tvgEngine == tvg::CanvasEngine::Sw) { diff --git a/src/examples/Svg.cpp b/src/examples/Svg.cpp index 548ece55..d1ef9e73 100644 --- a/src/examples/Svg.cpp +++ b/src/examples/Svg.cpp @@ -97,8 +97,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -132,8 +130,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Svg2.cpp b/src/examples/Svg2.cpp index b9cf5c0c..4cf61141 100644 --- a/src/examples/Svg2.cpp +++ b/src/examples/Svg2.cpp @@ -69,8 +69,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -104,8 +102,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - //Explicitly clear all retained resources. - glCanvas->clear(); } diff --git a/src/examples/Update.cpp b/src/examples/Update.cpp index fdd00454..8ebe428a 100644 --- a/src/examples/Update.cpp +++ b/src/examples/Update.cpp @@ -19,6 +19,9 @@ void tvgUpdateCmds(tvg::Canvas* canvas, float progress) { if (!canvas) return; + //Explicitly clear all retained paint nodes. + if (canvas->clear() != tvg::Result::Success) return; + //Shape auto shape = tvg::Shape::gen(); shape->appendRect(-100, -100, 200, 200, (100 * progress), (100 * progress)); @@ -65,8 +68,6 @@ void drawSwView(void* data, Eo* obj) if (swCanvas->draw() == tvg::Result::Success) { swCanvas->sync(); } - //Explicitly clear all retained resources. - swCanvas->clear(); } @@ -100,8 +101,6 @@ void drawGLview(Evas_Object *obj) if (glCanvas->draw() == tvg::Result::Success) { glCanvas->sync(); } - //Explicitly clear all retained resources. - glCanvas->clear(); } void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progress)