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

common shape: renamed the method clear() to reset()

Browse source 
Also, added one more showcase how to update only necessary properties of a shape
while retaining other properties...

Change-Id: If165bc7f8147cad0437e3ca2f7c007614c256248
This commit is contained in:
Hermet Park 2020-05-02 18:06:06 +09:00
parent 60d104a40a
commit 1b3661a0b0
7 changed files with 155 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -9,3 +9,4 @@ testPath
testPathCopy
testBlending
testUpdate
testDirectUpdate

2
inc/tizenvg.h
View file

@ -117,7 +117,7 @@ public:
~ShapeNode();
int update(RenderMethod* engine) noexcept override;
int clear() noexcept;
int reset() noexcept;
int moveTo(float x, float y) noexcept;
int lineTo(float x, float y) noexcept;

4
src/lib/tvgShapeNode.cpp
View file

@ -103,12 +103,12 @@ int ShapeNode::update(RenderMethod* engine) noexcept
}
int ShapeNode::clear() noexcept
int ShapeNode::reset() noexcept
{
auto impl = pImpl.get();
assert(impl);
impl->path->clear();
impl->path->reset();
return 0;
}

2
src/lib/tvgShapePath.h
View file

@ -62,7 +62,7 @@ struct ShapePath
reservePts(this->ptsCnt + ptsCnt);
}
void clear()
void reset()
{
cmdCnt = 0;
ptsCnt = 0;

1
test/makefile
View file

@ -7,3 +7,4 @@ all:
gcc -o testPathCopy testPathCopy.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
gcc -o testBlending testBlending.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
gcc -o testUpdate testUpdate.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
gcc -o testDirectUpdate testDirectUpdate.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`

98
test/testDirectUpdate.cpp Normal file
View file

@ -0,0 +1,98 @@
#include <tizenvg.h>
#include <Elementary.h>
using namespace std;
#define WIDTH 800
#define HEIGHT 800
static uint32_t buffer[WIDTH * HEIGHT];
unique_ptr<tvg::SwCanvas> canvas = nullptr;
tvg::ShapeNode* pShape = nullptr;
void tvgtest()
{
//Create a Canvas
canvas = tvg::SwCanvas::gen();
canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
//Shape
auto shape = tvg::ShapeNode::gen();
/* Acquire shape pointer to access it again.
instead, you should consider not to interrupt this pointer life-cycle. */
pShape = shape.get();
shape->appendRect(-100, -100, 200, 200, 0);
shape->fill(127, 255, 255, 255);
canvas->push(move(shape));
//Draw first frame
canvas->draw();
canvas->sync();
}
void transit_cb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progress)
{
/* Update shape directly.
You can update only necessary properties of this shape,
while retaining other properties. */
pShape->reset(); //reset path
pShape->appendRect(-100 + (800 * progress), -100 + (800 * progress), 200, 200, (100 * progress));
//Update shape for drawing (this may work asynchronously)
pShape->update(canvas->engine());
//Draw Next frames
canvas->draw();
canvas->sync();
//Update Efl Canvas
Eo* img = (Eo*) effect;
evas_object_image_data_update_add(img, 0, 0, WIDTH, HEIGHT);
}
void
win_del(void *data, Evas_Object *o, void *ev)
{
elm_exit();
}
int main(int argc, char **argv)
{
//Initialize TizenVG Engine
tvg::Engine::init();
tvgtest();
//Show the result using EFL...
elm_init(argc, argv);
Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
evas_object_smart_callback_add(win, "delete,request", win_del, 0);
Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
evas_object_image_size_set(img, WIDTH, HEIGHT);
evas_object_image_data_set(img, buffer);
evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(img);
elm_win_resize_object_add(win, img);
evas_object_geometry_set(win, 0, 0, WIDTH, HEIGHT);
evas_object_show(win);
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_cb, img, nullptr);
elm_transit_duration_set(transit, 2);
elm_transit_repeat_times_set(transit, -1);
elm_transit_auto_reverse_set(transit, EINA_TRUE);
elm_transit_go(transit);
elm_run();
elm_shutdown();
//Terminate TizenVG Engine
tvg::Engine::term();
}

102
test/testUpdate.cpp
View file

@ -11,80 +11,80 @@ unique_ptr<tvg::SwCanvas> canvas = nullptr;
void tvgtest()
{
//Create a Canvas
canvas = tvg::SwCanvas::gen();
canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
//Create a Canvas
canvas = tvg::SwCanvas::gen();
canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
//Shape
auto shape = tvg::ShapeNode::gen();
shape->appendRect(-100, -100, 200, 200, 0);
shape->fill(255, 255, 255, 255);
canvas->push(move(shape));
//Shape
auto shape = tvg::ShapeNode::gen();
shape->appendRect(-100, -100, 200, 200, 0);
shape->fill(255, 255, 255, 255);
canvas->push(move(shape));
//Draw first frame
canvas->draw();
canvas->sync();
//Draw first frame
canvas->draw();
canvas->sync();
}
void transit_cb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progress)
{
//Explicitly clear all retained paint nodes.
canvas->clear();
//Explicitly clear all retained paint nodes.
canvas->clear();
//Shape
auto shape = tvg::ShapeNode::gen();
shape->appendRect(-100 + (800 * progress), -100 + (800 * progress), 200, 200, (100 * progress));
shape->fill(rand()%255, rand()%255, rand()%255, 255);
canvas->push(move(shape));
//Shape
auto shape = tvg::ShapeNode::gen();
shape->appendRect(-100 + (800 * progress), -100 + (800 * progress), 200, 200, (100 * progress));
shape->fill(rand()%255, rand()%255, rand()%255, 255);
canvas->push(move(shape));
//Draw Next frames
canvas->draw();
canvas->sync();
//Draw Next frames
canvas->draw();
canvas->sync();
//Update Efl Canvas
Eo* img = (Eo*) effect;
evas_object_image_data_update_add(img, 0, 0, WIDTH, HEIGHT);
//Update Efl Canvas
Eo* img = (Eo*) effect;
evas_object_image_data_update_add(img, 0, 0, WIDTH, HEIGHT);
}
void
win_del(void *data, Evas_Object *o, void *ev)
{
elm_exit();
elm_exit();
}
int main(int argc, char **argv)
{
//Initialize TizenVG Engine
tvg::Engine::init();
//Initialize TizenVG Engine
tvg::Engine::init();
tvgtest();
tvgtest();
//Show the result using EFL...
elm_init(argc, argv);
//Show the result using EFL...
elm_init(argc, argv);
Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
evas_object_smart_callback_add(win, "delete,request", win_del, 0);
Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
evas_object_smart_callback_add(win, "delete,request", win_del, 0);
Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
evas_object_image_size_set(img, WIDTH, HEIGHT);
evas_object_image_data_set(img, buffer);
evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(img);
Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
evas_object_image_size_set(img, WIDTH, HEIGHT);
evas_object_image_data_set(img, buffer);
evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(img);
elm_win_resize_object_add(win, img);
evas_object_geometry_set(win, 0, 0, WIDTH, HEIGHT);
evas_object_show(win);
elm_win_resize_object_add(win, img);
evas_object_geometry_set(win, 0, 0, WIDTH, HEIGHT);
evas_object_show(win);
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_cb, img, nullptr);
elm_transit_duration_set(transit, 2);
elm_transit_repeat_times_set(transit, -1);
elm_transit_auto_reverse_set(transit, EINA_TRUE);
elm_transit_go(transit);
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_cb, img, nullptr);
elm_transit_duration_set(transit, 2);
elm_transit_repeat_times_set(transit, -1);
elm_transit_auto_reverse_set(transit, EINA_TRUE);
elm_transit_go(transit);
elm_run();
elm_shutdown();
elm_run();
elm_shutdown();
//Terminate TizenVG Engine
tvg::Engine::term();
}
//Terminate TizenVG Engine
tvg::Engine::term();
}