From 160c161b57595fdae637936c50a162d193f1a982 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 3 May 2014 23:40:48 +1000
Subject: More shuffling of gld -> ourGlobals and related cleanups.

---
 src/extantz/Evas_3D_demo.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/src/extantz/Evas_3D_demo.c b/src/extantz/Evas_3D_demo.c
index b01dd47..95b2f2f 100644
--- a/src/extantz/Evas_3D_demo.c
+++ b/src/extantz/Evas_3D_demo.c
@@ -266,9 +266,8 @@ _sphere_init(int precision)
 }
 
 
-Eina_Bool _animate_scene(void *data)
+Eina_Bool _animate_scene(globals *ourGlobals)
 {
-  globals *ourGlobals = data;
   static float angle = 0.0f;
   static float earthAngle = 0.0f;
   static int   frame = 0;
@@ -703,12 +702,10 @@ void Evas_3D_Demo_add(globals *ourGlobals)
     // Elm can't seem to be able to tell us WHERE an image was clicked, so use raw Evas calbacks instead.
     evas_object_event_callback_add(temp, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move, &ourScene);
     evas_object_event_callback_add(temp, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &ourScene);
-    cameraAdd(obj, &ourGlobals->gld);
+    cameraAdd(ourGlobals, obj);
     elm_win_resize_object_add(ourGlobals->win, obj);
 //    elm_box_pack_end(ourGlobals->gld.bx, obj);
 
-    // Add animation timer callback.
-//    ecore_timer_add(0.016, _animate_scene, &ourScene);
     ourGlobals->gld.move = calloc(1, sizeof(cameraMove));
 }
 
-- 
cgit v1.1