diff options
Diffstat (limited to '')
-rwxr-xr-x | ClientHamr/extantz/build.lua | 4 | ||||
-rw-r--r-- | ClientHamr/extantz/extantz.c | 4 | ||||
-rw-r--r-- | ClientHamr/extantz/images/bubble.png | bin | 4878 -> 0 bytes | |||
-rw-r--r-- | images/animated_logo.gif (renamed from ClientHamr/extantz/images/animated_logo.gif) | bin | 81411 -> 81411 bytes | |||
-rw-r--r-- | images/bubble_sh.png (renamed from ClientHamr/extantz/images/bubble_sh.png) | bin | 1600 -> 1600 bytes | |||
-rw-r--r-- | images/cube-blue.png (renamed from ClientHamr/extantz/images/cube-blue.png) | bin | 3734 -> 3734 bytes | |||
-rw-r--r-- | images/cube-purple.png (renamed from ClientHamr/extantz/images/cube-purple.png) | bin | 5835 -> 5835 bytes | |||
-rw-r--r-- | images/logo.png (renamed from ClientHamr/extantz/images/logo.png) | bin | 81162 -> 81162 bytes | |||
-rw-r--r-- | images/logo_small.png (renamed from ClientHamr/extantz/images/logo_small.png) | bin | 5655 -> 5655 bytes | |||
-rw-r--r-- | images/plant_01.jpg (renamed from ClientHamr/extantz/images/plant_01.jpg) | bin | 165867 -> 165867 bytes | |||
-rw-r--r-- | images/pt.png (renamed from ClientHamr/extantz/images/pt.png) | bin | 875 -> 875 bytes | |||
-rw-r--r-- | images/rock_01.jpg (renamed from ClientHamr/extantz/images/rock_01.jpg) | bin | 330094 -> 330094 bytes | |||
-rw-r--r-- | images/rock_02.jpg (renamed from ClientHamr/extantz/images/rock_02.jpg) | bin | 285555 -> 285555 bytes | |||
-rw-r--r-- | images/sky_01.jpg (renamed from ClientHamr/extantz/images/sky_01.jpg) | bin | 134813 -> 134813 bytes | |||
-rw-r--r-- | images/sky_02.jpg (renamed from ClientHamr/extantz/images/sky_02.jpg) | bin | 31413 -> 31413 bytes | |||
-rw-r--r-- | images/sky_03.jpg (renamed from ClientHamr/extantz/images/sky_03.jpg) | bin | 73364 -> 73364 bytes | |||
-rw-r--r-- | images/sky_04.jpg (renamed from ClientHamr/extantz/images/sky_04.jpg) | bin | 25078 -> 25078 bytes | |||
-rw-r--r-- | images/wood_01.jpg (renamed from ClientHamr/extantz/images/wood_01.jpg) | bin | 96136 -> 96136 bytes |
18 files changed, 4 insertions, 4 deletions
diff --git a/ClientHamr/extantz/build.lua b/ClientHamr/extantz/build.lua index 096c5ff..baddae6 100755 --- a/ClientHamr/extantz/build.lua +++ b/ClientHamr/extantz/build.lua | |||
@@ -17,9 +17,9 @@ CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/inc | |||
17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | 17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' |
18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' | 18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' |
19 | 19 | ||
20 | removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'extantz.edj'}) | 20 | removeFiles(dir, {'extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../images/extantz.edj'}) |
21 | 21 | ||
22 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc extantz.edj') | 22 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../images/extantz.edj') |
23 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) | 23 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) |
24 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) | 24 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) |
25 | runCommand('extantz', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) | 25 | runCommand('extantz', dir, 'g++ ' .. CFLAGS .. ' -O3 -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) |
diff --git a/ClientHamr/extantz/extantz.c b/ClientHamr/extantz/extantz.c index 7cdf799..cb8b323 100644 --- a/ClientHamr/extantz/extantz.c +++ b/ClientHamr/extantz/extantz.c | |||
@@ -1538,7 +1538,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1538 | ephysics_body_friction_set(boundary, 0); | 1538 | ephysics_body_friction_set(boundary, 0); |
1539 | 1539 | ||
1540 | box1 = elm_image_add(gld->win); | 1540 | box1 = elm_image_add(gld->win); |
1541 | elm_image_file_set(box1, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "blue-cube"); | 1541 | elm_image_file_set(box1, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "blue-cube"); |
1542 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); | 1542 | evas_object_move(box1, gld->win_w / 2 - 80, gld->win_h - 200); |
1543 | evas_object_resize(box1, 70, 70); | 1543 | evas_object_resize(box1, 70, 70); |
1544 | evas_object_show(box1); | 1544 | evas_object_show(box1); |
@@ -1552,7 +1552,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
1552 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); | 1552 | ephysics_body_sleeping_threshold_set(box_body1, 0.1, 0.1); |
1553 | 1553 | ||
1554 | box2 = elm_image_add(gld->win); | 1554 | box2 = elm_image_add(gld->win); |
1555 | elm_image_file_set(box2, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "purple-cube"); | 1555 | elm_image_file_set(box2, PACKAGE_DATA_DIR "/images/" EPHYSICS_TEST_THEME ".edj", "purple-cube"); |
1556 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); | 1556 | evas_object_move(box2, gld->win_w / 2 + 10, gld->win_h - 200); |
1557 | evas_object_resize(box2, 70, 70); | 1557 | evas_object_resize(box2, 70, 70); |
1558 | evas_object_show(box2); | 1558 | evas_object_show(box2); |
diff --git a/ClientHamr/extantz/images/bubble.png b/ClientHamr/extantz/images/bubble.png deleted file mode 100644 index dfb71b7..0000000 --- a/ClientHamr/extantz/images/bubble.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/animated_logo.gif b/images/animated_logo.gif index ef201af..ef201af 100644 --- a/ClientHamr/extantz/images/animated_logo.gif +++ b/images/animated_logo.gif | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/bubble_sh.png b/images/bubble_sh.png index b66c1e6..b66c1e6 100644 --- a/ClientHamr/extantz/images/bubble_sh.png +++ b/images/bubble_sh.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/cube-blue.png b/images/cube-blue.png index e848d2b..e848d2b 100644 --- a/ClientHamr/extantz/images/cube-blue.png +++ b/images/cube-blue.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/cube-purple.png b/images/cube-purple.png index 096cdbb..096cdbb 100644 --- a/ClientHamr/extantz/images/cube-purple.png +++ b/images/cube-purple.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/logo.png b/images/logo.png index 7dbae67..7dbae67 100644 --- a/ClientHamr/extantz/images/logo.png +++ b/images/logo.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/logo_small.png b/images/logo_small.png index c7dc665..c7dc665 100644 --- a/ClientHamr/extantz/images/logo_small.png +++ b/images/logo_small.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/plant_01.jpg b/images/plant_01.jpg index f1714dd..f1714dd 100644 --- a/ClientHamr/extantz/images/plant_01.jpg +++ b/images/plant_01.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/pt.png b/images/pt.png index 612d117..612d117 100644 --- a/ClientHamr/extantz/images/pt.png +++ b/images/pt.png | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/rock_01.jpg b/images/rock_01.jpg index c50ccb3..c50ccb3 100644 --- a/ClientHamr/extantz/images/rock_01.jpg +++ b/images/rock_01.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/rock_02.jpg b/images/rock_02.jpg index 04aea8a..04aea8a 100644 --- a/ClientHamr/extantz/images/rock_02.jpg +++ b/images/rock_02.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/sky_01.jpg b/images/sky_01.jpg index 22f3050..22f3050 100644 --- a/ClientHamr/extantz/images/sky_01.jpg +++ b/images/sky_01.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/sky_02.jpg b/images/sky_02.jpg index d0d7448..d0d7448 100644 --- a/ClientHamr/extantz/images/sky_02.jpg +++ b/images/sky_02.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/sky_03.jpg b/images/sky_03.jpg index cbad02a..cbad02a 100644 --- a/ClientHamr/extantz/images/sky_03.jpg +++ b/images/sky_03.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/sky_04.jpg b/images/sky_04.jpg index c5cbc18..c5cbc18 100644 --- a/ClientHamr/extantz/images/sky_04.jpg +++ b/images/sky_04.jpg | |||
Binary files differ | |||
diff --git a/ClientHamr/extantz/images/wood_01.jpg b/images/wood_01.jpg index 89f1006..89f1006 100644 --- a/ClientHamr/extantz/images/wood_01.jpg +++ b/images/wood_01.jpg | |||
Binary files differ | |||