diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.h | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index a4001c7..046f099 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <Evas_GL.h> | 10 | #include <Evas_GL.h> |
11 | #include <EPhysics.h> | 11 | #include <EPhysics.h> |
12 | #include "extantzCamera.h" | 12 | #include "extantzCamera.h" |
13 | #include "winFang.h" | ||
13 | 14 | ||
14 | 15 | ||
15 | #ifdef GL_GLES | 16 | #ifdef GL_GLES |
@@ -123,27 +124,7 @@ typedef struct | |||
123 | short x, y, z; | 124 | short x, y, z; |
124 | } ezLandmark; | 125 | } ezLandmark; |
125 | 126 | ||
126 | typedef struct _fangWin | ||
127 | { | ||
128 | Evas_Object *win; | ||
129 | Eina_Clist widgets; | ||
130 | void *data; | ||
131 | Evas_Smart_Cb on_del; | ||
132 | } fangWin; | ||
133 | 127 | ||
134 | typedef struct _Widget | ||
135 | { | ||
136 | char magic[8]; | ||
137 | Evas_Object *obj; | ||
138 | Eina_Clist node; | ||
139 | char *label, *look, *action, *help; | ||
140 | // foreground / background colour | ||
141 | // thing | ||
142 | // types {} | ||
143 | // skangCoord x, y, w, h | ||
144 | void *data; | ||
145 | Evas_Smart_Cb on_del; | ||
146 | } Widget; | ||
147 | 128 | ||
148 | typedef struct _Scene_Data | 129 | typedef struct _Scene_Data |
149 | { | 130 | { |
@@ -244,7 +225,7 @@ typedef struct _globals | |||
244 | 225 | ||
245 | Eina_Clist windows; | 226 | Eina_Clist windows; |
246 | 227 | ||
247 | fangWin *files; | 228 | winFang *files; |
248 | } globals; | 229 | } globals; |
249 | 230 | ||
250 | extern globals ourGlobals; | 231 | extern globals ourGlobals; |
@@ -265,22 +246,18 @@ EAPI void drawIrr_end(globals *ourGlobals); | |||
265 | EAPI void finishIrr(globals *ourGlobals); | 246 | EAPI void finishIrr(globals *ourGlobals); |
266 | #endif | 247 | #endif |
267 | 248 | ||
249 | void overlay_add(globals *ourGlobals); | ||
250 | |||
268 | EAPI void Evas_3D_Demo_add(globals *ourGlobals); | 251 | EAPI void Evas_3D_Demo_add(globals *ourGlobals); |
269 | Eina_Bool _animate_scene(globals *ourGlobals); | 252 | Eina_Bool _animate_scene(globals *ourGlobals); |
270 | void Evas_3D_Demo_fini(globals *ourGlobals); | 253 | void Evas_3D_Demo_fini(globals *ourGlobals); |
271 | 254 | ||
272 | void cameraAdd(globals *ourGlobals, Evas_Object *win); | 255 | void cameraAdd(globals *ourGlobals, Evas_Object *win); |
273 | 256 | ||
274 | fangWin *fang_win_add(globals *ourGlobals); | 257 | winFang *chat_add(globals *ourGlobals); |
275 | void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, int h); | 258 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); |
276 | void fang_win_del(globals *ourGlobals, fangWin *win); | 259 | void filesShow(winFang *me, Evas_Smart_Cb func, void *data); |
277 | void overlay_add(globals *ourGlobals); | 260 | winFang *woMan_add(globals *ourGlobals); |
278 | Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title); | ||
279 | |||
280 | fangWin *chat_add(globals *ourGlobals); | ||
281 | fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); | ||
282 | void filesShow(fangWin *me, Evas_Smart_Cb func, void *data); | ||
283 | fangWin *woMan_add(globals *ourGlobals); | ||
284 | 261 | ||
285 | 262 | ||
286 | #ifdef __cplusplus | 263 | #ifdef __cplusplus |