aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/extantz.h
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-03 01:47:19 +1000
committerDavid Walter Seikel2014-05-03 01:47:19 +1000
commite8678fdfe62bf62113baef2948874c0adfc82045 (patch)
treee2f0e4a14126fb5e9637802a42db9205be2897cf /src/extantz/extantz.h
parentMajor cleanup of extantz, part one. (diff)
downloadSledjHamr-e8678fdfe62bf62113baef2948874c0adfc82045.zip
SledjHamr-e8678fdfe62bf62113baef2948874c0adfc82045.tar.gz
SledjHamr-e8678fdfe62bf62113baef2948874c0adfc82045.tar.bz2
SledjHamr-e8678fdfe62bf62113baef2948874c0adfc82045.tar.xz
Major extantz clean up part 2. Including new Evas_3d style camera.
Diffstat (limited to 'src/extantz/extantz.h')
-rw-r--r--src/extantz/extantz.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index c475fa8..b91124e 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -1,5 +1,5 @@
1#define USE_PHYSICS 1 1#define USE_PHYSICS 1
2#define USE_IRR 1 2#define USE_IRR 0
3#define USE_DEMO 1 3#define USE_DEMO 1
4#define DO_GEARS 0 4#define DO_GEARS 0
5 5
@@ -128,6 +128,8 @@ struct _Gear
128 int count; 128 int count;
129}; 129};
130 130
131
132
131typedef struct _Scene_Data 133typedef struct _Scene_Data
132{ 134{
133 Evas_Object *image; // Our Elm image. 135 Evas_Object *image; // Our Elm image.
@@ -216,6 +218,7 @@ typedef struct _globals
216{ 218{
217 Evas *evas; 219 Evas *evas;
218 Evas_Object *win; // Our Elm window. 220 Evas_Object *win; // Our Elm window.
221 Evas_Object *tb; // Our Elm toolbar.
219 Eina_Clist widgets; // Our windows widgets. 222 Eina_Clist widgets; // Our windows widgets.
220 int logDom; // Our logging domain. 223 int logDom; // Our logging domain.
221 224
@@ -239,7 +242,9 @@ EAPI void finishIrr(GLData *gld);
239 242
240EAPI void Evas_3D_Demo_add(globals *ourGlobals); 243EAPI void Evas_3D_Demo_add(globals *ourGlobals);
241Eina_Bool _animate_scene(void *data); 244Eina_Bool _animate_scene(void *data);
242void Evas_3D_Demo_fini(void); 245void Evas_3D_Demo_fini(globals *ourGlobals);
246
247void cameraAdd(Evas_Object *win, GLData *gld);
243 248
244Evas_Object *fang_win_add(GLData *gld); 249Evas_Object *fang_win_add(GLData *gld);
245void fang_win_complete(GLData *gld, Evas_Object *win, int x, int y, int w, int h); 250void fang_win_complete(GLData *gld, Evas_Object *win, int x, int y, int w, int h);