diff options
author | David Walter Seikel | 2014-06-01 18:42:37 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-06-01 18:42:37 +1000 |
commit | f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b (patch) | |
tree | fcb1688da21eca15a7334e04dfd1cb029450d2db /src/extantz/extantz.h | |
parent | TODO++ (diff) | |
download | SledjHamr-f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b.zip SledjHamr-f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b.tar.gz SledjHamr-f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b.tar.bz2 SledjHamr-f0cce6bd0e7bfafcaf91df0dccd16f43cba1ea4b.tar.xz |
Get the from disk sim loading to work.
Still an odd problem with sonic that doesn't make sense.
Diffstat (limited to 'src/extantz/extantz.h')
-rw-r--r-- | src/extantz/extantz.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h index 5095556..1526626 100644 --- a/src/extantz/extantz.h +++ b/src/extantz/extantz.h | |||
@@ -132,6 +132,7 @@ typedef struct | |||
132 | 132 | ||
133 | typedef struct _Scene_Data | 133 | typedef struct _Scene_Data |
134 | { | 134 | { |
135 | Evas *evas; | ||
135 | Evas_Object *image; // Our Elm image. | 136 | Evas_Object *image; // Our Elm image. |
136 | Evas_3D_Scene *scene; | 137 | Evas_3D_Scene *scene; |
137 | Evas_3D_Node *root_node; | 138 | Evas_3D_Node *root_node; |
@@ -140,6 +141,8 @@ typedef struct _Scene_Data | |||
140 | 141 | ||
141 | Evas_3D_Light *light; | 142 | Evas_3D_Light *light; |
142 | 143 | ||
144 | Eina_Clist stuffs; | ||
145 | /* | ||
143 | Evas_3D_Mesh *mesh; | 146 | Evas_3D_Mesh *mesh; |
144 | Evas_3D_Node *mesh_node; | 147 | Evas_3D_Node *mesh_node; |
145 | Evas_3D_Material *material0; | 148 | Evas_3D_Material *material0; |
@@ -157,10 +160,11 @@ typedef struct _Scene_Data | |||
157 | Evas_3D_Node *mesh3_node; | 160 | Evas_3D_Node *mesh3_node; |
158 | Evas_3D_Material *material3; | 161 | Evas_3D_Material *material3; |
159 | Evas_3D_Texture *texture_diffuse; | 162 | Evas_3D_Texture *texture_diffuse; |
160 | 163 | */ | |
161 | cameraMove *move; | 164 | cameraMove *move; |
162 | 165 | ||
163 | Evas_Object_Event_Cb clickCb; | 166 | Evas_Object_Event_Cb clickCb; |
167 | lua_State *L; | ||
164 | } Scene_Data; | 168 | } Scene_Data; |
165 | 169 | ||
166 | typedef void (* aniStuffs)(void *stuffs); | 170 | typedef void (* aniStuffs)(void *stuffs); |
@@ -168,6 +172,7 @@ typedef void (* aniStuffs)(void *stuffs); | |||
168 | typedef struct _extantzStuffs | 172 | typedef struct _extantzStuffs |
169 | { | 173 | { |
170 | Stuffs stuffs; | 174 | Stuffs stuffs; |
175 | Scene_Data *scene; | ||
171 | Evas_3D_Node *mesh_node; // Multiple Evas_3D_Mesh's can be in one Evas_3D_Node | 176 | Evas_3D_Node *mesh_node; // Multiple Evas_3D_Mesh's can be in one Evas_3D_Node |
172 | // Can't use in arrays here, can't find the element sizes of incomplete types. | 177 | // Can't use in arrays here, can't find the element sizes of incomplete types. |
173 | Eina_Array *mesh; // Evas_3D_Mesh | 178 | Eina_Array *mesh; // Evas_3D_Mesh |
@@ -245,7 +250,6 @@ typedef struct _globals | |||
245 | 250 | ||
246 | GLData gld; | 251 | GLData gld; |
247 | Scene_Data *scene; | 252 | Scene_Data *scene; |
248 | Eina_Clist stuffs; | ||
249 | 253 | ||
250 | EPhysics_World *world; | 254 | EPhysics_World *world; |
251 | 255 | ||
@@ -278,7 +282,7 @@ EAPI void finishIrr(globals *ourGlobals); | |||
278 | 282 | ||
279 | void overlay_add(globals *ourGlobals); | 283 | void overlay_add(globals *ourGlobals); |
280 | 284 | ||
281 | EAPI void Evas_3D_Demo_add(globals *ourGlobals); | 285 | EAPI void Evas_3D_Demo_add(globals *ourGlobals, char *file); |
282 | Eina_Bool animateScene(globals *ourGlobals); | 286 | Eina_Bool animateScene(globals *ourGlobals); |
283 | void Evas_3D_Demo_fini(globals *ourGlobals); | 287 | void Evas_3D_Demo_fini(globals *ourGlobals); |
284 | 288 | ||
@@ -287,9 +291,9 @@ Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *win); | |||
287 | Eina_Bool animateCamera(Scene_Data *scene); | 291 | Eina_Bool animateCamera(Scene_Data *scene); |
288 | Eina_Bool animateScene(globals *ourGlobals); | 292 | Eina_Bool animateScene(globals *ourGlobals); |
289 | void scenriDel(Scene_Data *scene); | 293 | void scenriDel(Scene_Data *scene); |
290 | void stuffsSetup(ExtantzStuffs *stuffs, globals *ourGlobals, Scene_Data *scene, int fake); | 294 | void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake); |
291 | ExtantzStuffs *addStuffs(char *uuid, char *name, char *description, char *owner, | 295 | ExtantzStuffs *addStuffs(char *uuid, char *name, char *description, char *owner, |
292 | char *file, MeshType type, float px, float py, float pz, float rx, float ry, float rz, float rw); | 296 | char *file, MeshType type, double px, double py, double pz, double rx, double ry, double rz, double rw); |
293 | void addMaterial(ExtantzStuffs *e, int face, TextureType type, char *file); | 297 | void addMaterial(ExtantzStuffs *e, int face, TextureType type, char *file); |
294 | 298 | ||
295 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); | 299 | winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); |