aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/extantz.h
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-06 00:12:23 +1000
committerDavid Walter Seikel2014-05-06 00:12:23 +1000
commit95e4dc70ff9118d0abfd5321605385321ab02f5c (patch)
tree656aeb3983e83c22ab00ac404ba4d1448a732390 /src/extantz/extantz.h
parentClean up include files. (diff)
downloadSledjHamr-95e4dc70ff9118d0abfd5321605385321ab02f5c.zip
SledjHamr-95e4dc70ff9118d0abfd5321605385321ab02f5c.tar.gz
SledjHamr-95e4dc70ff9118d0abfd5321605385321ab02f5c.tar.bz2
SledjHamr-95e4dc70ff9118d0abfd5321605385321ab02f5c.tar.xz
Shuffle stuff around into the new scenri.c and camera stuff.
Diffstat (limited to 'src/extantz/extantz.h')
-rw-r--r--src/extantz/extantz.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 4ecf8e8..c22a61d 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -9,6 +9,7 @@
9 9
10#include "winFang.h" 10#include "winFang.h"
11#include "GuiLua.h" 11#include "GuiLua.h"
12#include "scenri.h"
12 13
13#include <elm_widget_glview.h> 14#include <elm_widget_glview.h>
14#include <Evas_GL.h> 15#include <Evas_GL.h>
@@ -137,7 +138,6 @@ typedef struct _Scene_Data
137 Evas_3D_Node *camera_node; 138 Evas_3D_Node *camera_node;
138 Evas_3D_Node *light_node; 139 Evas_3D_Node *light_node;
139 140
140 Evas_3D_Camera *camera;
141 Evas_3D_Light *light; 141 Evas_3D_Light *light;
142 142
143 Evas_3D_Mesh *mesh; 143 Evas_3D_Mesh *mesh;
@@ -254,7 +254,9 @@ EAPI void Evas_3D_Demo_add(globals *ourGlobals);
254Eina_Bool _animate_scene(globals *ourGlobals); 254Eina_Bool _animate_scene(globals *ourGlobals);
255void Evas_3D_Demo_fini(globals *ourGlobals); 255void Evas_3D_Demo_fini(globals *ourGlobals);
256 256
257void cameraAdd(globals *ourGlobals, Evas_Object *win); 257Scene_Data *scenriAdd(globals *ourGlobals);
258Evas_3D_Node *cameraAdd(globals *ourGlobals, Scene_Data *scene, Evas_Object *win);
259Eina_Bool animateCamera(globals *ourGlobals);
258 260
259winFang *chat_add(globals *ourGlobals); 261winFang *chat_add(globals *ourGlobals);
260winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); 262winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);