Revert "examples: revise example code."

This broke gl_engine rendering, revert it.

This reverts commit 9bb1972ef9.
This commit is contained in:
Hermet Park 2020-11-06 15:37:17 +09:00
parent bb4c6b299f
commit e445b7f579
20 changed files with 4 additions and 105 deletions

View file

@ -93,7 +93,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
swCanvas->clear(); //Flush out cached resource
} }

View file

@ -76,9 +76,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -112,9 +109,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -65,9 +65,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -101,9 +98,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -135,9 +135,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -171,9 +168,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -117,9 +117,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -153,9 +150,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -59,9 +59,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -95,9 +92,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -94,9 +94,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -130,9 +127,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -79,9 +79,6 @@ void drawSwView(void* data, Eo* obj)
if (canvas->draw() == tvg::Result::Success) { if (canvas->draw() == tvg::Result::Success) {
canvas->sync(); canvas->sync();
} }
//Explicitly clear all retained resources.
canvas->clear();
} }
@ -163,9 +160,6 @@ void drawGLview(Evas_Object *obj)
if (canvas->draw() == tvg::Result::Success) { if (canvas->draw() == tvg::Result::Success) {
canvas->sync(); canvas->sync();
} }
//Explicitly clear all retained resources.
canvas->clear();
} }

View file

@ -54,9 +54,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -90,9 +87,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -83,9 +83,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -119,9 +116,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -71,9 +71,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -107,9 +104,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -108,9 +108,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -144,9 +141,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -94,9 +94,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -130,9 +127,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -101,9 +101,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -137,9 +134,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -44,9 +44,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -80,9 +77,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -102,8 +102,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -137,8 +135,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -176,8 +176,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -211,8 +209,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }
@ -241,6 +237,7 @@ int main(int argc, char **argv)
//Initialize ThorVG Engine //Initialize ThorVG Engine
if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) { if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
elm_init(argc, argv); elm_init(argc, argv);
if (tvgEngine == tvg::CanvasEngine::Sw) { if (tvgEngine == tvg::CanvasEngine::Sw) {

View file

@ -97,8 +97,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -132,8 +130,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -69,8 +69,6 @@ void drawSwView(void* data, Eo* obj)
if (swCanvas->draw() == tvg::Result::Success) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -104,8 +102,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }

View file

@ -19,6 +19,9 @@ void tvgUpdateCmds(tvg::Canvas* canvas, float progress)
{ {
if (!canvas) return; if (!canvas) return;
//Explicitly clear all retained paint nodes.
if (canvas->clear() != tvg::Result::Success) return;
//Shape //Shape
auto shape = tvg::Shape::gen(); auto shape = tvg::Shape::gen();
shape->appendRect(-100, -100, 200, 200, (100 * progress), (100 * progress)); 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) { if (swCanvas->draw() == tvg::Result::Success) {
swCanvas->sync(); swCanvas->sync();
} }
//Explicitly clear all retained resources.
swCanvas->clear();
} }
@ -100,8 +101,6 @@ void drawGLview(Evas_Object *obj)
if (glCanvas->draw() == tvg::Result::Success) { if (glCanvas->draw() == tvg::Result::Success) {
glCanvas->sync(); glCanvas->sync();
} }
//Explicitly clear all retained resources.
glCanvas->clear();
} }
void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progress) void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progress)