aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/extantz.c
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.c
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 '')
-rw-r--r--src/extantz/extantz.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index d0cd8ef..11f1d4e 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -170,6 +170,7 @@ static void _draw_gl(Evas_Object *obj)
170#endif 170#endif
171 171
172 _animate_scene(ourGlobals); 172 _animate_scene(ourGlobals);
173 animateCamera(ourGlobals);
173 174
174#if USE_IRR 175#if USE_IRR
175 drawIrr_end(ourGlobals); 176 drawIrr_end(ourGlobals);
@@ -363,7 +364,7 @@ void overlay_add(globals *ourGlobals)
363 // According to the Elm inlined image window example, this is what's needed to. 364 // According to the Elm inlined image window example, this is what's needed to.
364 evas_object_event_callback_add(elm_win_inlined_image_object_get(gld->winwin), EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_elm, NULL); 365 evas_object_event_callback_add(elm_win_inlined_image_object_get(gld->winwin), EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_elm, NULL);
365 // In this code, we are making our own camera, so grab it's input when we are focused. 366 // In this code, we are making our own camera, so grab it's input when we are focused.
366 cameraAdd(ourGlobals, gld->winwin); 367// cameraAdd(ourGlobals, gld->winwin);
367 368
368 elm_win_alpha_set(gld->winwin, EINA_TRUE); 369 elm_win_alpha_set(gld->winwin, EINA_TRUE);
369 // Apparently transparent is not good enough for ELM backgrounds, so make it a rectangle. 370 // Apparently transparent is not good enough for ELM backgrounds, so make it a rectangle.