From cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 11 Sep 2015 10:22:56 +1000 Subject: Update to latest API changes. --- src/extantz/camera.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/extantz/camera.c') diff --git a/src/extantz/camera.c b/src/extantz/camera.c index adbae6f..4bcf64c 100644 --- a/src/extantz/camera.c +++ b/src/extantz/camera.c @@ -50,21 +50,21 @@ Eina_Bool animateCamera(Scene_Data *scene) Evas_Vec4 orient, rotateQ, result, move; evas_vec3_set(&rotate, DEGREE_TO_RADIAN(scene->move->r), DEGREE_TO_RADIAN(scene->move->s), DEGREE_TO_RADIAN(scene->move->p)); - eo_do(scene->camera_node, evas_3d_node_orientation_get(EVAS_3D_SPACE_PARENT, &orient.x, &orient.y, &orient.z, &orient.w)); + eo_do(scene->camera_node, evas_canvas3d_node_orientation_get(EVAS_CANVAS3D_SPACE_PARENT, &orient.x, &orient.y, &orient.z, &orient.w)); evas_euler_to_quaternion(&rotateQ, &rotate); evas_quaternion_multiply(&result, &orient, &rotateQ); evas_quaternion_normalise(&result); - eo_do(scene->camera_node, evas_3d_node_orientation_set(result.x, result.y, result.z, result.w)); + eo_do(scene->camera_node, evas_canvas3d_node_orientation_set(result.x, result.y, result.z, result.w)); evas_vec4_set(&move, scene->move->x, scene->move->y, scene->move->z, 0); - eo_do(scene->camera_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &pos.x, &pos.y, &pos.z)); + eo_do(scene->camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &pos.x, &pos.y, &pos.z)); evas_quaternion_multiply(&rotateQ, &result, &move); evas_quaternion_conjugate(&result); evas_quaternion_multiply(&move, &rotateQ, &result); pos.x += move.x; pos.y += move.y; pos.z += move.z; - eo_do(scene->camera_node, evas_3d_node_position_set(pos.x, pos.y, pos.z)); + eo_do(scene->camera_node, evas_canvas3d_node_position_set(pos.x, pos.y, pos.z)); return EINA_TRUE; } @@ -219,25 +219,25 @@ static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Ev } */ -Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image) +Eo *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image) { - Evas_3D_Node *result = NULL; - Evas_3D_Camera *camera; + Eo *result = NULL; + Eo *camera; - camera = eo_add(EVAS_3D_CAMERA_CLASS, evas, - evas_3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0) + camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas, + evas_canvas3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0) ); - result = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA), - evas_3d_node_camera_set(camera), - evas_3d_node_position_set(0.0, 20.0, 30.0), -// evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0), - evas_3d_node_orientation_set(0.0, 0.0, 0.0, 1.0) + result = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA), + evas_canvas3d_node_camera_set(camera), + evas_canvas3d_node_position_set(0.0, 20.0, 30.0), +// evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0), + evas_canvas3d_node_orientation_set(0.0, 0.0, 0.0, 1.0) ); // eo_unref(camera); - eo_do(scene->root_node, evas_3d_node_member_add(result)); - eo_do(scene->scene, evas_3d_scene_camera_node_set(result)); + eo_do(scene->root_node, evas_canvas3d_node_member_add(result)); + eo_do(scene->scene, evas_canvas3d_scene_camera_node_set(result)); scene->move = calloc(1, sizeof(cameraMove)); // In this code, we are making our own camera, so grab it's input when we are focused. -- cgit v1.1