diff options
Diffstat (limited to 'src/extantz')
-rwxr-xr-x | src/extantz/build.lua | 4 | ||||
-rw-r--r-- | src/extantz/extantz.c | 7 | ||||
-rw-r--r-- | src/extantz/extantz.h | 1 | ||||
-rw-r--r-- | src/extantz/purkle.c | 43 |
4 files changed, 6 insertions, 49 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index d15be35..1591e8a 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
@@ -18,11 +18,11 @@ LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | |||
18 | libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' | 18 | libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' |
19 | 19 | ||
20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) | 20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) |
21 | removeFiles(dir, {'../../extantz', 'camera.o', 'purkle.o', 'files.o', 'scenri.o', 'woMan.o'}) | 21 | removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) |
22 | 22 | ||
23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') | 23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') |
24 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) | 24 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) |
25 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) | 25 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) |
26 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) | 26 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) |
27 | CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' | 27 | CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' |
28 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'purkle', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') | 28 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index b8536e9..590770d 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -515,11 +515,12 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
515 | makeMainMenu(&ourGlobals); | 515 | makeMainMenu(&ourGlobals); |
516 | 516 | ||
517 | // overlay_add(&ourGlobals); | 517 | // overlay_add(&ourGlobals); |
518 | woMan_add(&ourGlobals); | ||
519 | purkleAdd(&ourGlobals); | ||
520 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); | ||
521 | char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL}; | 518 | char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL}; |
522 | GuiLuaDo(5, args, ourGlobals.mainWindow); | 519 | GuiLuaDo(5, args, ourGlobals.mainWindow); |
520 | woMan_add(&ourGlobals); | ||
521 | args[2] = "purkle"; | ||
522 | GuiLuaDo(3, args, ourGlobals.mainWindow); | ||
523 | ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); | ||
523 | 524 | ||
524 | #if USE_PHYSICS | 525 | #if USE_PHYSICS |
525 | world = ephysicsAdd(&ourGlobals); | 526 | world = ephysicsAdd(&ourGlobals); |
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index c6e3393..684b53d 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -258,7 +258,6 @@ Eina_Bool animateCamera(Scene_Data *scene); | |||
258 | 258 | ||
259 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); | 259 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); |
260 | void filesShow(winFang *me, Evas_Smart_Cb func, void *data); | 260 | void filesShow(winFang *me, Evas_Smart_Cb func, void *data); |
261 | winFang *purkleAdd(globals *ourGlobals); | ||
262 | winFang *woMan_add(globals *ourGlobals); | 261 | winFang *woMan_add(globals *ourGlobals); |
263 | 262 | ||
264 | 263 | ||
diff --git a/src/extantz/purkle.c b/src/extantz/purkle.c deleted file mode 100644 index 590a84e..0000000 --- a/src/extantz/purkle.c +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | #include "extantz.h" | ||
2 | |||
3 | |||
4 | // TODO - This is to work around a bug in Elm entry, remove it when the bug is fixed. | ||
5 | // The bug is that editable entry widgets cause the app to hang on exit. | ||
6 | static void _on_entry_del(void *data, Evas_Object *obj, void *event_info) | ||
7 | { | ||
8 | // winFang *me = data; | ||
9 | |||
10 | elm_entry_editable_set(obj, EINA_FALSE); | ||
11 | } | ||
12 | |||
13 | winFang *purkleAdd(globals *ourGlobals) | ||
14 | { | ||
15 | winFang *me; | ||
16 | Widget *wid; | ||
17 | Evas_Object *en; | ||
18 | |||
19 | me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "purkle"); | ||
20 | |||
21 | en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win, | ||
22 | elm_obj_entry_scrollable_set(EINA_TRUE), | ||
23 | elm_obj_entry_editable_set(EINA_FALSE), | ||
24 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | ||
25 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | ||
26 | evas_obj_visibility_set(EINA_TRUE) | ||
27 | ); | ||
28 | elm_object_text_set(en, "History is shown here"); | ||
29 | elm_box_pack_end(me->box, en); | ||
30 | eo_unref(en); | ||
31 | |||
32 | wid = widgetAdd(me, ELM_OBJ_ENTRY_CLASS, me->win, ""); | ||
33 | wid->on_del = _on_entry_del; | ||
34 | eo_do(wid->obj, | ||
35 | elm_obj_entry_scrollable_set(EINA_TRUE), | ||
36 | elm_obj_entry_editable_set(EINA_TRUE) | ||
37 | ); | ||
38 | elm_box_pack_end(me->box, wid->obj); | ||
39 | |||
40 | evas_object_show(me->box); | ||
41 | |||
42 | return me; | ||
43 | } | ||