elm_demo: updated the vg_shape api changetizen_4.0.m1_releasesubmit/tizen_unified/20170309.100418submit/tizen_unified/20170308.100419submit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170828.100008submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen_3.0/20161028.092323submit/tizen_3.0/20161028.062323submit/tizen_3.0.m2/20170104.093756submit/tizen/20161013.015447submit/tizen/20161012.131550accepted/tizen/unified/20170309.074918accepted/tizen/mobile/20161013.034958accepted/tizen/4.0/unified/20170828.222059accepted/tizen/4.0/unified/20170816.014822accepted/tizen/3.0/mobile/20161028.150537accepted/tizen/3.0.m2/mobile/20170105.025917tizen_3.0.m2accepted/tizen_unifiedaccepted/tizen_mobileaccepted/tizen_4.0_unifiedaccepted/tizen_3.0_mobileaccepted/tizen_3.0.m2_mobile

Change-Id: Ia6bfcd1b416565c299bce759c86466401c455a8a

1 files changed, 65 insertions, 65 deletions

diff --git a/src/vector.c b/src/vector.c
index bbd4039..cf967ef 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -89,8 +89,8 @@ transit_round_rect_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double p
 
    
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_rect(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_rect(vd->shape[0],
                                            vd->center.x - (SHAPE_SIZE[0] / 2) - ((SHAPE_SIZE_DIFF[0] / 2) * progress),
                                            vd->center.y - (SHAPE_SIZE[1] / 2) - (SHAPE_SIZE_DIFF[1] * progress),
                                            SHAPE_SIZE[0] + (progress * SHAPE_SIZE_DIFF[0]),
@@ -176,8 +176,8 @@ transit_circle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double progr
    vg_data *vd = effect;
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE_RADIUS + (CIRCLE_RADIUS_DIFF * progress));
@@ -266,8 +266,8 @@ transit_circle_touch_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    //Set Shape Attributes
    if (vd->dirty) {
     vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE_RADIUS);
@@ -276,8 +276,8 @@ transit_circle_touch_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    /* 2. Touch Effect Shape */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_circle(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_circle(vd->shape[1],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE2_RADIUS + (CIRCLE2_RADIUS_DIFF * progress));
@@ -339,8 +339,8 @@ transit_round_rect_touch_op(Elm_Transit_Effect *effect, Elm_Transit *transit, do
    //Set Shape Attributes
    if (vd->dirty) {
    vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_rect(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_rect(vd->shape[0],
                                            vd->center.x - (SHAPE_SIZE[0] / 2),
                                            vd->center.y - (SHAPE_SIZE[1] / 2),
                                            SHAPE_SIZE[0],
@@ -354,8 +354,8 @@ transit_round_rect_touch_op(Elm_Transit_Effect *effect, Elm_Transit *transit, do
    /* 2. Inner Touch Effect Shape */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_rect(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_rect(vd->shape[1],
                                            vd->center.x - (SHAPE2_SIZE[0] / 2) - ((SHAPE2_SIZE_DIFF[0] / 2) * progress),
                                            vd->center.y - (SHAPE2_SIZE[1] / 2) - ((SHAPE2_SIZE_DIFF[1] / 2) * progress),
                                            SHAPE2_SIZE[0] + (SHAPE2_SIZE_DIFF[0] * progress),
@@ -419,8 +419,8 @@ transit_rect_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    //Set Shape Attributes
    if (vd->dirty) {
    vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_rect(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_rect(vd->shape[0],
                                             vd->center.x - (SHAPE_SIZE[0] / 2),
                                             vd->center.y - (SHAPE_SIZE[1] / 2),
                                             SHAPE_SIZE[0],
@@ -433,8 +433,8 @@ transit_rect_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
 
 
    /* Inner Touch Effect Shape */
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_rect(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_rect(vd->shape[1],
                                            vd->center.x - (SHAPE2_SIZE[0] / 2) - ((SHAPE2_SIZE_DIFF[0] / 2) * progress) + 0.5,
                                            vd->center.y - (SHAPE2_SIZE[1] / 2) - ((SHAPE2_SIZE_DIFF[1] / 2) * progress) + 0.5,
                                            SHAPE2_SIZE[0] + (SHAPE2_SIZE_DIFF[0] * progress),
@@ -459,11 +459,11 @@ transit_rect_toggle_op2(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    /* Left Line */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_move_to(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_move_to(vd->shape[2],
                                       vd->center.x + LINE_MOVE_TO[0],
                                       vd->center.y + LINE_MOVE_TO[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[2],
+   evas_vg_shape_append_line_to(vd->shape[2],
                                       (vd->center.x + LINE_MOVE_TO[0]) + (LINE_LINE_TO[0] * progress),
                                       (vd->center.y + LINE_MOVE_TO[1]) + (LINE_LINE_TO[1] * progress));
    evas_vg_shape_stroke_width_set(vd->shape[2], 1.5);
@@ -473,11 +473,11 @@ transit_rect_toggle_op2(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    /* Right Line */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[3]);
-   evas_vg_shape_shape_append_move_to(vd->shape[3],
+   evas_vg_shape_reset(vd->shape[3]);
+   evas_vg_shape_append_move_to(vd->shape[3],
                                       vd->center.x + LINE2_MOVE_TO[0],
                                       vd->center.y + LINE2_MOVE_TO[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[3],
+   evas_vg_shape_append_line_to(vd->shape[3],
                                       (vd->center.x + LINE2_MOVE_TO[0]) + (LINE2_LINE_TO[0] * progress),
                                       (vd->center.y + LINE2_MOVE_TO[1]) + (LINE2_LINE_TO[1] * progress));
    evas_vg_shape_stroke_width_set(vd->shape[3], 1.5);
@@ -499,20 +499,20 @@ transit_rect_toggle_op3(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    /* Left Line */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_move_to(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_move_to(vd->shape[2],
                                       vd->center.x + LINE_MOVE_TO[0],
                                       vd->center.y + LINE_MOVE_TO[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[2],
+   evas_vg_shape_append_line_to(vd->shape[2],
                                       (vd->center.x + LINE_MOVE_TO[0]) + (LINE_LINE_TO[0] - LINE_LINE_TO[0] * progress),
                                       (vd->center.y + LINE_MOVE_TO[1]) + (LINE_LINE_TO[1] - LINE_LINE_TO[1] * progress));
 
    /* Right Line */
-   evas_vg_shape_shape_reset(vd->shape[3]);
-   evas_vg_shape_shape_append_move_to(vd->shape[3],
+   evas_vg_shape_reset(vd->shape[3]);
+   evas_vg_shape_append_move_to(vd->shape[3],
                                       vd->center.x + LINE2_MOVE_TO[0],
                                       vd->center.y + LINE2_MOVE_TO[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[3],
+   evas_vg_shape_append_line_to(vd->shape[3],
                                       (vd->center.x + LINE2_MOVE_TO[0]) + (LINE2_LINE_TO[0] - LINE2_LINE_TO[0] * progress),
                                       (vd->center.y + LINE2_MOVE_TO[1]) + (LINE2_LINE_TO[1] - LINE2_LINE_TO[1] * progress));
 }
@@ -623,8 +623,8 @@ transit_circle_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, doubl
    /* Outer Circle */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE_RADIUS);
@@ -636,8 +636,8 @@ transit_circle_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, doubl
    /* Middle Circle */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_circle(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_circle(vd->shape[1],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE2_RADIUS + (CIRCLE2_RADIUS_DIFF * progress));
@@ -647,8 +647,8 @@ transit_circle_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, doubl
    /* Inner Circle */
 
    //Set Shape Attribute
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_circle(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_circle(vd->shape[2],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE3_RADIUS + (CIRCLE3_RADIUS_DIFF * progress));
@@ -710,8 +710,8 @@ transit_circle_toggle2_op(Elm_Transit_Effect *effect, Elm_Transit *transit, doub
    //Set Shape Attributes
    if (vd->dirty) {
    vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE_RADIUS);
@@ -736,11 +736,11 @@ transit_circle_toggle2_op2(Elm_Transit_Effect *effect, Elm_Transit *transit, dou
    /* Inner Line */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_move_to(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_move_to(vd->shape[1],
                                       vd->center.x,
                                       vd->center.y - LINE_Y_HALF + (LINE_Y_HALF * progress));
-   evas_vg_shape_shape_append_line_to(vd->shape[1],
+   evas_vg_shape_append_line_to(vd->shape[1],
                                       vd->center.x,
                                       vd->center.y + LINE_Y_HALF - (LINE_Y_HALF * progress));
 
@@ -761,8 +761,8 @@ transit_circle_toggle2_op3(Elm_Transit_Effect *effect, Elm_Transit *transit, dou
    /* Inner Circle */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_circle(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_circle(vd->shape[2],
                                      vd->center.x,
                                      vd->center.y,
                                      CIRCLE_RADIUS + (CIRCLE_RADIUS_DIFF * progress));
@@ -781,11 +781,11 @@ transit_circle_toggle2_op4(Elm_Transit_Effect *effect, Elm_Transit *transit, dou
    /* Inner Line */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_move_to(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_move_to(vd->shape[1],
                                       vd->center.x,
                                       vd->center.y - LINE_Y_HALF + (LINE_Y_HALF * (1 - progress)));
-   evas_vg_shape_shape_append_line_to(vd->shape[1],
+   evas_vg_shape_append_line_to(vd->shape[1],
                                       vd->center.x,
                                       vd->center.y + LINE_Y_HALF - (LINE_Y_HALF * (1 - progress)));
 }
@@ -890,16 +890,16 @@ transit_star_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    /* Outer Shape */
    if (vd->dirty) {
    vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_move_to(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_move_to(vd->shape[0],
                                       vd->center.x + STAR_PT[0][0],
                                       vd->center.y + STAR_PT[0][1]);
    for (i = 1; i < PT_CNT; i++) {
-     evas_vg_shape_shape_append_line_to(vd->shape[0],
+     evas_vg_shape_append_line_to(vd->shape[0],
                                         vd->center.x + STAR_PT[i][0],
                                         vd->center.y + STAR_PT[i][1]);
    }
-   evas_vg_shape_shape_append_close(vd->shape[0]);
+   evas_vg_shape_append_close(vd->shape[0]);
 
    //Set Shape Attributes
    evas_vg_shape_stroke_color_set(vd->shape[0], 247, 178, 26, 255);
@@ -935,19 +935,19 @@ transit_star_toggle_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double
    //Set Shape Attributes
    diff[0] = (STAR_PT[0][0] * (progress * 0.65 + 0.35));
    diff[1] = (STAR_PT[0][1]) * (progress * 0.65 + 0.35);
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_move_to(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_move_to(vd->shape[1],
                                       vd->center.x + diff[0] + 0.5,
                                       vd->center.y + diff[1] + 0.5);
    for (i = 1; i < PT_CNT; i++)
      {
         diff[0] = (STAR_PT[i][0] * (progress * 0.65 + 0.35));
         diff[1] = (STAR_PT[i][1]) * (progress * 0.65 + 0.35);
-        evas_vg_shape_shape_append_line_to(vd->shape[1],
+        evas_vg_shape_append_line_to(vd->shape[1],
                                            vd->center.x + diff[0] + 0.5,
                                            vd->center.y + diff[1] + 0.5);
      }
-   evas_vg_shape_shape_append_close(vd->shape[1]);
+   evas_vg_shape_append_close(vd->shape[1]);
 
    evas_vg_node_color_set(vd->shape[1], 247 * progress, 178 * progress, 26 * progress, 255 * progress);
    evas_vg_shape_stroke_color_set(vd->shape[1], 247 * progress, 178 * progress, 26 * progress, 255 * progress);
@@ -1012,11 +1012,11 @@ transit_progress_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double pro
    //Set Shape Attributes
    if (vd->dirty) {
    vd->dirty = EINA_FALSE;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_move_to(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_move_to(vd->shape[0],
                                       vd->center.x - LINE_HALF_SIZE,
                                       vd->center.y);
-   evas_vg_shape_shape_append_line_to(vd->shape[0],
+   evas_vg_shape_append_line_to(vd->shape[0],
                                       vd->center.x + LINE_HALF_SIZE,
                                       vd->center.y);
    evas_vg_shape_stroke_color_set(vd->shape[0], 203, 205, 206, 255);
@@ -1028,8 +1028,8 @@ transit_progress_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double pro
    /* Fill Line Shape */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_move_to(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_move_to(vd->shape[1],
                                       vd->center.x - LINE_HALF_SIZE,
                                       vd->center.y);
    v[0] = 0.15;
@@ -1038,7 +1038,7 @@ transit_progress_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double pro
    v[3] = 0.96;
    pos = ecore_animator_pos_map_n(progress, ECORE_POS_MAP_CUBIC_BEZIER, 4, v);
 
-   evas_vg_shape_shape_append_line_to(vd->shape[1],
+   evas_vg_shape_append_line_to(vd->shape[1],
                                       vd->center.x - LINE_HALF_SIZE + (LINE_HALF_SIZE * 2 * pos),
                                       vd->center.y);
    evas_vg_shape_stroke_color_set(vd->shape[1], 181, 225, 236, 255);
@@ -1054,8 +1054,8 @@ transit_progress_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double pro
    v[2] = 0.76;
    v[3] = 0.8;
    pos = ecore_animator_pos_map_n(progress, ECORE_POS_MAP_CUBIC_BEZIER, 4, v);
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_move_to(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_move_to(vd->shape[2],
                                       vd->center.x - LINE_HALF_SIZE + (LINE_HALF_SIZE * 2 * pos),
                                       vd->center.y);
    v[0] = 0.15;
@@ -1064,7 +1064,7 @@ transit_progress_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double pro
    v[3] = 0.96;
    pos = ecore_animator_pos_map_n(progress, ECORE_POS_MAP_CUBIC_BEZIER, 4, v);
 
-   evas_vg_shape_shape_append_line_to(vd->shape[2],
+   evas_vg_shape_append_line_to(vd->shape[2],
                                       vd->center.x - LINE_HALF_SIZE + (LINE_HALF_SIZE * 2 * pos),
                                       vd->center.y);
    //Set Shape Attributes
@@ -1139,7 +1139,7 @@ example_progress(Evas_Object *grid)
 //    // v2[3] = 0.94;
 //    // pos2 = ecore_animator_pos_map_n(progress, ECORE_POS_MAP_CUBIC_BEZIER, 4, v2);
 
-//    // // evas_vg_shape_shape_append_arc(vd->shape[0],
+//    // // evas_vg_shape_append_arc(vd->shape[0],
 //    // //                                10,
 //    // //                                50,
 //    // //                                2 * CIRCLE_RADIUS,
@@ -1167,7 +1167,7 @@ example_progress(Evas_Object *grid)
 //    // v2[3] = 0.94;
 //    // pos2 = ecore_animator_pos_map_n(progress, ECORE_POS_MAP_CUBIC_BEZIER, 4, v2);
 
-//    // evas_vg_shape_shape_append_arc(vd->shape[1],
+//    // evas_vg_shape_append_arc(vd->shape[1],
 //    //                                10,
 //    //                                50,
 //    //                                2 * CIRCLE_RADIUS,
@@ -1233,8 +1233,8 @@ transit_index_op(Elm_Transit_Effect *effect, Elm_Transit *transit, double progre
    /* Outer Shape */
 
    //Set Shape Attributes
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0],
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0],
                                      vd->center.x,
                                      vd->center.y - (MOVE_Y * progress),
                                      CIRCLE_RADIUS + (CIRCLE_RADIUS_DIFF * progress));