Merge changes I6abbe506,Ibfd12197

[framework/uifw/elementary.git] / src / bin / test_3d.c

diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c
index 70c4777..17b880b 100644 (file)
--- a/src/bin/test_3d.c
+++ b/src/bin/test_3d.c
@@ -1,4 +1,5 @@
 #include <Elementary.h>
+#include "test.h"
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
@@ -35,7 +36,7 @@ _cube_new(Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Coord d)
 {
    Cube *c;
    int i;
-   
+
    w -= (w / 2);
    h -= (h / 2);
    d -= (d / 2);
@@ -47,7 +48,7 @@ _cube_new(Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = evas_object_image_add(evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "%s/images/%s",
-                 PACKAGE_DATA_DIR, "twofish.jpg");
+                 elm_app_data_dir_get(), "twofish.jpg");
         evas_object_image_file_set(o, buf, NULL);
         evas_object_image_fill_set(o, 0, 0, 256, 256);
         evas_object_resize(o, 256, 256);
@@ -58,32 +59,32 @@ _cube_new(Evas *evas, Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(0, 1,  w, -h, -d, 256,   0);
    POINT(0, 2,  w,  h, -d, 256, 256);
    POINT(0, 3, -w,  h, -d,   0, 256);
-   
+
    POINT(1, 0,  w, -h, -d,   0,   0);
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
    POINT(2, 3,  w,  h,  d,   0, 256);
-   
+
    POINT(3, 0, -w, -h,  d,   0,   0);
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -96,14 +97,14 @@ _cube_pos(Cube *c,
    Evas_Map *m;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
-   
+
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
@@ -128,7 +129,7 @@ _cube_pos(Cube *c,
           }
         else
            evas_object_hide(c->side[i].o);
-        
+
         order[i] = i;
         for (j = 0; j < 4; j++)
            evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -150,7 +151,7 @@ _cube_pos(Cube *c,
           }
      }
    while (!sorted);
-   
+
    evas_object_raise(c->side[order[0]].o);
    for (i = 1; i < 6; i++)
       evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
@@ -162,7 +163,7 @@ static void
 _cube_free(Cube *c)
 {
    int i;
-   
+
    for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
    free(c);
 }
@@ -172,7 +173,7 @@ static void
 _cube_update(Evas_Object *win, Cube *c)
 {
    Evas_Coord w, h;
-   
+
    evas_object_geometry_get(win, NULL, NULL, &w, &h);
    _cube_pos(c,
              (w / 2), (h / 2), 512,
@@ -241,9 +242,9 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U
 {
    Evas_Object *win, *bg, *bx, *sl;
 
-   win = elm_win_add(NULL, "3d", ELM_WIN_BASIC);
-   elm_win_title_set(win, "3D");
-   elm_win_autodel_set(win, 1);
+   win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Box Vert");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
@@ -251,7 +252,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U
    evas_object_show(bg);
 
    cube = _cube_new(evas_object_evas_get(win), 240, 240, 240);
-   
+
    bx = elm_box_add(win);
    evas_object_layer_set(bx, 10);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);