diff options
author | David Walter Seikel | 2014-05-06 00:37:13 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-06 00:37:13 +1000 |
commit | 95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf (patch) | |
tree | 60c82569897b5d39234169fd8fd81c88d8459afa /src/extantz/extantz.h | |
parent | Shuffle stuff around into the new scenri.c and camera stuff. (diff) | |
download | SledjHamr-95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf.zip SledjHamr-95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf.tar.gz SledjHamr-95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf.tar.bz2 SledjHamr-95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf.tar.xz |
Camera no longer needs ourGlobals.
Diffstat (limited to 'src/extantz/extantz.h')
-rw-r--r-- | src/extantz/extantz.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index c22a61d..1c12843 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -158,6 +158,7 @@ typedef struct _Scene_Data | |||
158 | Evas_3D_Material *material3; | 158 | Evas_3D_Material *material3; |
159 | Evas_3D_Texture *texture_diffuse; | 159 | Evas_3D_Texture *texture_diffuse; |
160 | 160 | ||
161 | cameraMove *move; | ||
161 | } Scene_Data; | 162 | } Scene_Data; |
162 | 163 | ||
163 | // Elm GL view related data here. | 164 | // Elm GL view related data here. |
@@ -178,7 +179,6 @@ typedef struct _GLData | |||
178 | IVideoDriver *driver; | 179 | IVideoDriver *driver; |
179 | ISceneManager *smgr; | 180 | ISceneManager *smgr; |
180 | ICameraSceneNode *camera; | 181 | ICameraSceneNode *camera; |
181 | |||
182 | cameraMove *move; | 182 | cameraMove *move; |
183 | 183 | ||
184 | #if DO_GEARS | 184 | #if DO_GEARS |
@@ -255,8 +255,8 @@ Eina_Bool _animate_scene(globals *ourGlobals); | |||
255 | void Evas_3D_Demo_fini(globals *ourGlobals); | 255 | void Evas_3D_Demo_fini(globals *ourGlobals); |
256 | 256 | ||
257 | Scene_Data *scenriAdd(globals *ourGlobals); | 257 | Scene_Data *scenriAdd(globals *ourGlobals); |
258 | Evas_3D_Node *cameraAdd(globals *ourGlobals, Scene_Data *scene, Evas_Object *win); | 258 | Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *win); |
259 | Eina_Bool animateCamera(globals *ourGlobals); | 259 | Eina_Bool animateCamera(Scene_Data *scene); |
260 | 260 | ||
261 | winFang *chat_add(globals *ourGlobals); | 261 | winFang *chat_add(globals *ourGlobals); |
262 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); | 262 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); |