From 95d791b9dbdcb6bb27a9ee2ce5aa17cdf9a933bf Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 6 May 2014 00:37:13 +1000
Subject: Camera no longer needs ourGlobals.

---
 src/extantz/extantz.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/extantz/extantz.c')

diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 11f1d4e..b7de3a7 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -170,7 +170,7 @@ static void _draw_gl(Evas_Object *obj)
 #endif
 
   _animate_scene(ourGlobals);
-  animateCamera(ourGlobals);
+  animateCamera(ourGlobals->scene);
 
 #if USE_IRR
   drawIrr_end(ourGlobals);
@@ -487,6 +487,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     init_evas_gl(&ourGlobals);
 
     Evas_3D_Demo_add(&ourGlobals);
+    // TODO - Just a temporary hack so Irrlicht and Evas_3D can share the camera move.
+    ourGlobals.gld.move = ourGlobals.scene->move;
     evas_object_data_set(elm_image_object_get(ourGlobals.scene->image), "glob", &ourGlobals);
     evas_object_image_pixels_get_callback_set(elm_image_object_get(ourGlobals.scene->image), on_pixels, &ourGlobals);
 
-- 
cgit v1.1