jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bd745c9677ce87d32d6e820b45015fa2b3981e56
commit bd745c9677ce87d32d6e820b45015fa2b3981e56 Author: Daniel Zaoui <[email protected]> Date: Tue Oct 21 08:45:22 2014 +0300 3D Warnings-- --- src/examples/evas/evas-3d-cube-rotate.c | 18 +++++++++--------- src/examples/evas/evas-smart-interface.c | 2 +- src/examples/evas/evas-smart-object.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c index 1689d7e..1cb0d96 100644 --- a/src/examples/evas/evas-3d-cube-rotate.c +++ b/src/examples/evas/evas-3d-cube-rotate.c @@ -147,15 +147,15 @@ _continue_scene(void *data) static void -_rotate_x_reload(Evas_3D_Scene *scene, Evas_Event_Mouse_Down *ev, Evas_3D_Node *node, Evas_3D_Mesh *mesh, +_rotate_x_reload(Evas_3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_3D_Node *node, Evas_3D_Mesh *mesh, float *angle_diff, Evas_Coord *mouse_coord) { - Evas_3D_Node *n; - Evas_3D_Mesh *m; + Evas_3D_Node *n = NULL; + Evas_3D_Mesh *m = NULL; Evas_Real s, t; int mouse_diff; - eo_do(scene, evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); + eo_do(eo_scene, evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); if ((n == node) && (m == mesh)) { @@ -177,7 +177,7 @@ _rotate_x_reload(Evas_3D_Scene *scene, Evas_Event_Mouse_Down *ev, Evas_3D_Node * } static void -_play_scene(void *data, Evas *evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) +_play_scene(void *data, Evas *_evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Scene_Data *d = (Scene_Data *)data; @@ -192,7 +192,7 @@ _play_scene(void *data, Evas *evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, voi } static void -_stop_scene(void *data, Evas *evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED) +_stop_scene(void *data, Evas *_evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED) { Scene_Data *d = (Scene_Data *)data; d->angle = 0.0; @@ -202,11 +202,11 @@ _stop_scene(void *data, Evas *evas EINA_UNUSED, Evas_Object *eo EINA_UNUSED, voi static Eina_Bool _animate_scene(void *data) { - Scene_Data *scene = (Scene_Data *)data; + Scene_Data *sc = (Scene_Data *)data; - angle += scene->angle; + angle += sc->angle; - eo_do(scene->mesh_node, evas_3d_node_orientation_angle_axis_set(angle, 0, 1.0, 0.0)); + eo_do(sc->mesh_node, evas_3d_node_orientation_angle_axis_set(angle, 0, 1.0, 0.0)); return EINA_TRUE; } diff --git a/src/examples/evas/evas-smart-interface.c b/src/examples/evas/evas-smart-interface.c index 2f6d862..b9a43fe 100644 --- a/src/examples/evas/evas-smart-interface.c +++ b/src/examples/evas/evas-smart-interface.c @@ -667,7 +667,7 @@ _on_example_smart_object_child_num_change(void *data EINA_UNUSED, void *event_info) { fprintf(stdout, "Number of child members on our example smart" - " object changed to %llu\n", (unsigned long long)event_info); + " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info); } int diff --git a/src/examples/evas/evas-smart-object.c b/src/examples/evas/evas-smart-object.c index 0a2a63f..3df08be 100644 --- a/src/examples/evas/evas-smart-object.c +++ b/src/examples/evas/evas-smart-object.c @@ -639,7 +639,7 @@ _on_example_smart_object_child_num_change(void *data EINA_UNUSED, void *event_info) { fprintf(stdout, "Number of child members on our example smart" - " object changed to %llu\n", (unsigned long long)event_info); + " object changed to %llu\n", (unsigned long long)(uintptr_t)event_info); } int --
