aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-06 00:53:00 +1000
committerDavid Walter Seikel2014-05-06 00:53:00 +1000
commit692fbc1ac5a26d51ed8b67408e144dccf0265f7f (patch)
treec0cb6c5056ff18c5d3c55423d7bee51f487d5071 /src/extantz
parentScenri no longer needs ourGlobals. (diff)
downloadSledjHamr-692fbc1ac5a26d51ed8b67408e144dccf0265f7f.zip
SledjHamr-692fbc1ac5a26d51ed8b67408e144dccf0265f7f.tar.gz
SledjHamr-692fbc1ac5a26d51ed8b67408e144dccf0265f7f.tar.bz2
SledjHamr-692fbc1ac5a26d51ed8b67408e144dccf0265f7f.tar.xz
Disable the non working Elm input callback, and TODO++.
Diffstat (limited to 'src/extantz')
-rw-r--r--src/extantz/camera.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/extantz/camera.c b/src/extantz/camera.c
index ad628b5..7e22d8d 100644
--- a/src/extantz/camera.c
+++ b/src/extantz/camera.c
@@ -1,6 +1,7 @@
1#include "extantz.h" 1#include "extantz.h"
2 2
3 3
4// TODO - Rotate the direction vector by the rotation to convert from input to camera coords.
4Eina_Bool animateCamera(Scene_Data *scene) 5Eina_Bool animateCamera(Scene_Data *scene)
5{ 6{
6 Evas_Real x, y, z, w; 7 Evas_Real x, y, z, w;
@@ -150,6 +151,7 @@ static void _on_camera_input_up(void *data, Evas *evas, Evas_Object *obj, void *
150 else printf("Camera input not ready\n"); 151 else printf("Camera input not ready\n");
151} 152}
152 153
154/* While it's true that image is an Elm image, seems this Elm input event callbacrk doesn't work.
153// Elm style event callback. 155// Elm style event callback.
154static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info) 156static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info)
155{ 157{
@@ -173,10 +175,11 @@ static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Ev
173 175
174 default : 176 default :
175 printf("Unknown GL input event.\n"); 177 printf("Unknown GL input event.\n");
176 } /* switch */ 178 }
177 179
178 return processed; 180 return processed;
179} 181}
182*/
180 183
181Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image) 184Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image)
182{ 185{
@@ -201,7 +204,8 @@ Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image)
201 // In this code, we are making our own camera, so grab it's input when we are focused. 204 // In this code, we are making our own camera, so grab it's input when we are focused.
202 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_camera_input_down, scene->move); 205 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_camera_input_down, scene->move);
203 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_UP, _on_camera_input_up, scene->move); 206 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_UP, _on_camera_input_up, scene->move);
204 elm_object_event_callback_add(image, _cb_event_GL, NULL); 207 // While it's true that image is an Elm image, seems this Elm input event callbacrk doesn't work.
208// elm_object_event_callback_add(image, _cb_event_GL, NULL);
205 209
206 return result; 210 return result;
207} 211}