aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ClientHamr/extantz/extantz.h
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-01-27 09:26:52 +1000
committerDavid Walter Seikel2013-01-27 09:26:52 +1000
commit2624827ee680b0a721c408da690721b28e8f2427 (patch)
tree2e7958847b7ede1baba9f74cc8a58dea288a4cb8 /ClientHamr/extantz/extantz.h
parentDelete a bunch of the keyboard handling stuff. (diff)
downloadSledjHamr-2624827ee680b0a721c408da690721b28e8f2427.zip
SledjHamr-2624827ee680b0a721c408da690721b28e8f2427.tar.gz
SledjHamr-2624827ee680b0a721c408da690721b28e8f2427.tar.bz2
SledjHamr-2624827ee680b0a721c408da690721b28e8f2427.tar.xz
Get the new camera actually working. Still some bugs to be ironed out.
Diffstat (limited to 'ClientHamr/extantz/extantz.h')
-rw-r--r--ClientHamr/extantz/extantz.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/ClientHamr/extantz/extantz.h b/ClientHamr/extantz/extantz.h
index 5fec64c..4bce461 100644
--- a/ClientHamr/extantz/extantz.h
+++ b/ClientHamr/extantz/extantz.h
@@ -2,6 +2,7 @@
2#include <elm_widget_glview.h> 2#include <elm_widget_glview.h>
3#include <Evas_GL.h> 3#include <Evas_GL.h>
4#include <EPhysics.h> 4#include <EPhysics.h>
5#include "extantzCamera.h"
5 6
6 7
7#ifdef GL_GLES 8#ifdef GL_GLES
@@ -44,6 +45,7 @@ extern "C"{
44typedef struct IrrlichtDevice IrrlichtDevice; 45typedef struct IrrlichtDevice IrrlichtDevice;
45typedef struct IVideoDriver IVideoDriver; 46typedef struct IVideoDriver IVideoDriver;
46typedef struct ISceneManager ISceneManager; 47typedef struct ISceneManager ISceneManager;
48typedef struct ICameraSceneNode ICameraSceneNode;
47 49
48#endif 50#endif
49 51
@@ -143,13 +145,17 @@ struct _GLData
143 int useIrr : 1; 145 int useIrr : 1;
144 int doneIrr : 1; 146 int doneIrr : 1;
145 int resized : 1; 147 int resized : 1;
148 int camFocus : 1;
146 149
147 Evas_Object *bx, *r1; 150 Evas_Object *bx, *r1;
148 Ecore_Animator *animator; 151 Ecore_Animator *animator;
149 152
150 IrrlichtDevice *device; // IrrlichtDevice 153 IrrlichtDevice *device;
151 IVideoDriver *driver; // IVideoDriver 154 IVideoDriver *driver;
152 ISceneManager *smgr; // ISceneManager 155 ISceneManager *smgr;
156 ICameraSceneNode *camera;
157
158 cameraMove *move;
153 159
154 // Gear Stuff 160 // Gear Stuff
155 GLfloat view_rotx; 161 GLfloat view_rotx;