test: updated test samples.

1. added testTransform
2. replaced testShape with testMergeShapes

Change-Id: I1f7b25a1d2f62ac682f7a19e75fc3a44db7c52f0

diff --git a/.gitignore b/.gitignore
index a5643f4..e5a2d6e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@ build
 *.swp
 testShape
 testMultiShapes
-testMergeShapes
 testBoundary
 testPath
 testPathCopy
 testBlending
 testUpdate
 testDirectUpdate
+testTransform

diff --git a/test/makefile b/test/makefile
index 23fd51a..4c78068 100644 (file)
--- a/test/makefile
+++ b/test/makefile
@@ -1,10 +1,10 @@
 all:
        gcc -o testShape testShape.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
        gcc -o testMultiShapes testMultiShapes.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
-       gcc -o testMergeShapes testMergeShapes.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
        gcc -o testBoundary testBoundary.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
        gcc -o testPath testPath.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`
        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`
+       gcc -o testTransform testTransform.cpp -g -lstdc++ `pkg-config --cflags --libs elementary tizenvg`

diff --git a/test/testDirectUpdate.cpp b/test/testDirectUpdate.cpp
index 9a6152c..723222b 100644 (file)
--- a/test/testDirectUpdate.cpp
+++ b/test/testDirectUpdate.cpp
@@ -44,7 +44,6 @@ void transit_cb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progres
     pShape->reset();    //reset path
 
     pShape->appendRect(-100 + (800 * progress), -100 + (800 * progress), 200, 200, (100 * progress));
-    pShape->scale(1 - 0.75 * progress);
 
     //Update shape for drawing (this may work asynchronously)
     pShape->update(canvas->engine());

diff --git a/test/testMergeShapes.cpp b/test/testMergeShapes.cpp
deleted file mode 100644 (file)
index 8cff17d..0000000
--- a/test/testMergeShapes.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <tizenvg.h>
-#include <Elementary.h>
-
-using namespace std;
-
-#define WIDTH 800
-#define HEIGHT 800
-
-static uint32_t buffer[WIDTH * HEIGHT];
-
-void tvgtest()
-{
-    //Initialize TizenVG Engine
-    tvg::Engine::init();
-
-    //Create a Canvas
-    auto canvas = tvg::SwCanvas::gen();
-    canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
-
-    //Prepare a Shape (Rectangle + Rectangle + Circle + Circle)
-    auto shape1 = tvg::Shape::gen();
-    shape1->appendRect(0, 0, 200, 200, 0);          //x, y, w, h, cornerRadius
-    shape1->appendRect(100, 100, 300, 300, 100);    //x, y, w, h, cornerRadius
-    shape1->appendCircle(400, 400, 100, 100);       //cx, cy, radiusW, radiusH
-    shape1->appendCircle(400, 500, 170, 100);       //cx, cy, radiusW, radiusH
-    shape1->fill(255, 255, 0, 255);                 //r, g, b, a
-
-    /* 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() */
-    canvas->push(move(shape1));
-
-    canvas->draw();
-    canvas->sync();
-
-    //Terminate TizenVG Engine
-    tvg::Engine::term();
-}
-
-void
-win_del(void *data, Evas_Object *o, void *ev)
-{
-   elm_exit();
-}
-
-
-int main(int argc, char **argv)
-{
-    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_run();
-    elm_shutdown();
-}

diff --git a/test/testShape.cpp b/test/testShape.cpp
index 8f60263..8cff17d 100644 (file)
--- a/test/testShape.cpp
+++ b/test/testShape.cpp
@@ -17,10 +17,13 @@ void tvgtest()
     auto canvas = tvg::SwCanvas::gen();
     canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
 
-    //Prepare a Shape (Rectangle)
+    //Prepare a Shape (Rectangle + Rectangle + Circle + Circle)
     auto shape1 = tvg::Shape::gen();
-    shape1->appendRect(100, 100, 400, 400, 0);  //x, y, w, h, cornerRadius
-    shape1->fill(255, 0, 0, 255);               //r, g, b, a
+    shape1->appendRect(0, 0, 200, 200, 0);          //x, y, w, h, cornerRadius
+    shape1->appendRect(100, 100, 300, 300, 100);    //x, y, w, h, cornerRadius
+    shape1->appendCircle(400, 400, 100, 100);       //cx, cy, radiusW, radiusH
+    shape1->appendCircle(400, 500, 170, 100);       //cx, cy, radiusW, radiusH
+    shape1->fill(255, 255, 0, 255);                 //r, g, b, a
 
     /* Push the shape into the Canvas drawing list
        When this shape is into the canvas list, the shape could update & prepare
@@ -41,6 +44,7 @@ win_del(void *data, Evas_Object *o, void *ev)
    elm_exit();
 }
 
+
 int main(int argc, char **argv)
 {
     tvgtest();

diff --git a/test/testTransform.cpp b/test/testTransform.cpp
new file mode 100644 (file)
index 0000000..9cf5e37
--- /dev/null
+++ b/test/testTransform.cpp
@@ -0,0 +1,101 @@
+#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::Shape* pShape = nullptr;
+
+void tvgtest()
+{
+    //Create a Canvas
+    canvas = tvg::SwCanvas::gen();
+    canvas->target(buffer, WIDTH, WIDTH, HEIGHT);
+
+    //Shape
+    auto shape = tvg::Shape::gen();
+
+    /* Acquire shape pointer to access it again.
+       instead, you should consider not to interrupt this pointer life-cycle. */
+    pShape = shape.get();
+
+    shape->appendRect(0, 0, 200, 200, 0);
+    shape->appendRect(100, 100, 300, 300, 100);
+    shape->appendCircle(400, 400, 100, 100);
+    shape->appendCircle(400, 500, 170, 100);
+    shape->fill(255, 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->scale(1 - 0.75 * progress);
+    pShape->rotate(360 * 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();
+}