Major cleanup of extantz, part one.

1 files changed, 53 insertions, 26 deletions

diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 6e0e03e..c475fa8 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -1,9 +1,6 @@
-#define USE_EO      0
 #define USE_PHYSICS 1
-#define USE_EGL     1   // If using Evas_GL, though it might be via Elm.
-#define USE_ELM_GL  1
-#define USE_IRR     0
-#define USE_DEMO    0
+#define USE_IRR     1
+#define USE_DEMO    1
 #define DO_GEARS    0
 
 
@@ -60,16 +57,6 @@ typedef struct ICameraSceneNode ICameraSceneNode;
 #endif
 
 
-typedef struct _globals
-{
-  Evas          *evas;
-  Evas_Object   *win;           // Our Elm window.
-  Eina_Clist    widgets;        // Our windows widgets.
-  int           logDom;         // Our logging domain.
-} globals;
-
-extern globals ourGlobals;
-
 
 typedef struct _Gear Gear;
 typedef struct _GLData GLData;
@@ -141,20 +128,46 @@ struct _Gear
    int count;
 };
 
+typedef struct _Scene_Data
+{
+  Evas_Object      *image;              // Our Elm image.
+  Evas_3D_Scene    *scene;
+  Evas_3D_Node     *root_node;
+  Evas_3D_Node     *camera_node;
+  Evas_3D_Node     *light_node;
+
+  Evas_3D_Camera   *camera;
+  Evas_3D_Light    *light;
+
+  Evas_3D_Mesh     *mesh;
+  Evas_3D_Node     *mesh_node;
+  Evas_3D_Material *material0;
+  Evas_3D_Material *material1;
+  Evas_3D_Texture  *texture0;
+  Evas_3D_Texture  *texture1;
+  Evas_3D_Texture  *texture_normal;
+
+  Evas_3D_Mesh     *mesh2;
+  Evas_3D_Node     *mesh2_node;
+  Evas_3D_Material *material2;
+  Evas_3D_Texture  *texture2;
+
+  Evas_3D_Mesh     *mesh3;
+  Evas_3D_Node     *mesh3_node;
+  Evas_3D_Material *material3;
+  Evas_3D_Texture  *texture_diffuse;
+
+} Scene_Data;
+
 // GL related data here.
 struct _GLData
 {
     Evas_Object *win, *winwin;
 
-    Ecore_Evas  *ee;
-    Evas *canvas;
-    Evas_Native_Surface ns;
+    Ecore_Evas  *ee;
+    Evas        *canvas;
 
-    Evas_GL_Context     *ctx;
-    Evas_GL_Surface     *sfc;
-    Evas_GL_Config      *cfg;
-    Evas_GL             *evasGl;        // The Evas way.
-    Evas_Object         *elmGl;         // The Elm way.
+    Evas_Object         *elmGl;
     Evas_GL_API         *glApi;
 
     GLuint      program;
@@ -164,14 +177,13 @@ struct _GLData
     int         win_w, win_h;   // The size of the window.
     int         win_x, win_y;   // The position of the window.
     int         sfc_w, sfc_h;   // This is what Irrlicht is using, size of the GL image surface / glview.
-    int         img_w, img_h;   // Size of the viewport.  DON'T reuse sfc_* here.  Despite the fach that sfc_* is only used in the init when Irricht is disabled?  WTF?
-    int         useEGL : 1;
+    int         img_w, img_h;   // Size of the viewport.  DON'T reuse sfc_* here.  Despite the fact that sfc_* is only used in the init when Irricht is disabled?  WTF?
     int         useIrr : 1;
     int         doneIrr : 1;
     int         gearsInited : 1;
     int         resized : 1;
 
-    Evas_Object *bx, *r1;
+    Evas_Object *bx;//, *r1;
     Ecore_Animator  *animator;
 
     IrrlichtDevice      *device;
@@ -200,6 +212,19 @@ struct _GLData
    GLfloat      light[3];
 };
 
+typedef struct _globals
+{
+  Evas          *evas;
+  Evas_Object   *win;           // Our Elm window.
+  Eina_Clist    widgets;        // Our windows widgets.
+  int           logDom;         // Our logging domain.
+
+  struct _GLData gld;
+  Scene_Data    *scene;
+} globals;
+
+extern globals ourGlobals;
+
 
 void gears_init(GLData *gld);
 void drawGears(GLData *gld);
@@ -213,6 +238,8 @@ EAPI void drawIrr_end(GLData *gld);
 EAPI void finishIrr(GLData *gld);
 
 EAPI void Evas_3D_Demo_add(globals *ourGlobals);
+Eina_Bool _animate_scene(void *data);
+void Evas_3D_Demo_fini(void);
 
 Evas_Object *fang_win_add(GLData *gld);
 void fang_win_complete(GLData *gld, Evas_Object *win, int x, int y, int w, int h);