aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ClientHamr/extantz/extantz.h
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-01-15 06:33:14 +1000
committerDavid Walter Seikel2014-01-15 06:33:14 +1000
commit629c1449c44cdc02bd592a591cae50f2a56f3523 (patch)
tree9aba225cc0152309a4da9bc3197bfe6eb8a7af25 /ClientHamr/extantz/extantz.h
parentDon't start in jumping mode. (diff)
downloadSledjHamr-629c1449c44cdc02bd592a591cae50f2a56f3523.zip
SledjHamr-629c1449c44cdc02bd592a591cae50f2a56f3523.tar.gz
SledjHamr-629c1449c44cdc02bd592a591cae50f2a56f3523.tar.bz2
SledjHamr-629c1449c44cdc02bd592a591cae50f2a56f3523.tar.xz
Major changes, things where too fragile while I made them, so it's all one commit blob.
Sorted out top level menu and toolbar. Sorted out most focus issues. Sorted out resizing issues. Sorted out event issues. Sorted out camera issues. Added a window to cover the GL surface and act as it's UI event catcher. Added generic window and menu creation functions. Added a chat window. Moved cthe old window to it's own function, renamed it woMan. Re arranged some stuff. More comments. Clean ups. Probably other bits and pieces I forgot to mention. Starting to look real now. A little bit.
Diffstat (limited to 'ClientHamr/extantz/extantz.h')
-rw-r--r--ClientHamr/extantz/extantz.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/ClientHamr/extantz/extantz.h b/ClientHamr/extantz/extantz.h
index af0c1d3..afb94af 100644
--- a/ClientHamr/extantz/extantz.h
+++ b/ClientHamr/extantz/extantz.h
@@ -147,7 +147,7 @@ struct _Gear
147// GL related data here. 147// GL related data here.
148struct _GLData 148struct _GLData
149{ 149{
150 Evas_Object *win; 150 Evas_Object *win, *winwin;
151 151
152 Ecore_Evas *ee; 152 Ecore_Evas *ee;
153 Evas *canvas; 153 Evas *canvas;
@@ -173,7 +173,6 @@ struct _GLData
173 int doneIrr : 1; 173 int doneIrr : 1;
174 int gearsInited : 1; 174 int gearsInited : 1;
175 int resized : 1; 175 int resized : 1;
176 int camFocus : 1;
177 176
178 Evas_Object *bx, *r1; 177 Evas_Object *bx, *r1;
179 Ecore_Animator *animator; 178 Ecore_Animator *animator;