diff options
author | David Walter Seikel | 2015-09-11 10:22:56 +1000 |
---|---|---|
committer | David Walter Seikel | 2015-09-11 10:22:56 +1000 |
commit | cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce (patch) | |
tree | c4fa4ade6ff80d624d87b067e16cfaa3fc1ab601 /src/extantz/camera.c | |
parent | New OTR idea. (diff) | |
download | SledjHamr-cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce.zip SledjHamr-cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce.tar.gz SledjHamr-cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce.tar.bz2 SledjHamr-cb7045a64e5bf5a8ecc93f562c162a406d2cd7ce.tar.xz |
Update to latest API changes.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/camera.c | 32 |
1 files changed, 16 insertions, 16 deletions
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) | |||
50 | Evas_Vec4 orient, rotateQ, result, move; | 50 | Evas_Vec4 orient, rotateQ, result, move; |
51 | 51 | ||
52 | evas_vec3_set(&rotate, DEGREE_TO_RADIAN(scene->move->r), DEGREE_TO_RADIAN(scene->move->s), DEGREE_TO_RADIAN(scene->move->p)); | 52 | evas_vec3_set(&rotate, DEGREE_TO_RADIAN(scene->move->r), DEGREE_TO_RADIAN(scene->move->s), DEGREE_TO_RADIAN(scene->move->p)); |
53 | eo_do(scene->camera_node, evas_3d_node_orientation_get(EVAS_3D_SPACE_PARENT, &orient.x, &orient.y, &orient.z, &orient.w)); | 53 | eo_do(scene->camera_node, evas_canvas3d_node_orientation_get(EVAS_CANVAS3D_SPACE_PARENT, &orient.x, &orient.y, &orient.z, &orient.w)); |
54 | evas_euler_to_quaternion(&rotateQ, &rotate); | 54 | evas_euler_to_quaternion(&rotateQ, &rotate); |
55 | evas_quaternion_multiply(&result, &orient, &rotateQ); | 55 | evas_quaternion_multiply(&result, &orient, &rotateQ); |
56 | evas_quaternion_normalise(&result); | 56 | evas_quaternion_normalise(&result); |
57 | eo_do(scene->camera_node, evas_3d_node_orientation_set(result.x, result.y, result.z, result.w)); | 57 | eo_do(scene->camera_node, evas_canvas3d_node_orientation_set(result.x, result.y, result.z, result.w)); |
58 | 58 | ||
59 | evas_vec4_set(&move, scene->move->x, scene->move->y, scene->move->z, 0); | 59 | evas_vec4_set(&move, scene->move->x, scene->move->y, scene->move->z, 0); |
60 | eo_do(scene->camera_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &pos.x, &pos.y, &pos.z)); | 60 | eo_do(scene->camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &pos.x, &pos.y, &pos.z)); |
61 | evas_quaternion_multiply(&rotateQ, &result, &move); | 61 | evas_quaternion_multiply(&rotateQ, &result, &move); |
62 | evas_quaternion_conjugate(&result); | 62 | evas_quaternion_conjugate(&result); |
63 | evas_quaternion_multiply(&move, &rotateQ, &result); | 63 | evas_quaternion_multiply(&move, &rotateQ, &result); |
64 | pos.x += move.x; | 64 | pos.x += move.x; |
65 | pos.y += move.y; | 65 | pos.y += move.y; |
66 | pos.z += move.z; | 66 | pos.z += move.z; |
67 | eo_do(scene->camera_node, evas_3d_node_position_set(pos.x, pos.y, pos.z)); | 67 | eo_do(scene->camera_node, evas_canvas3d_node_position_set(pos.x, pos.y, pos.z)); |
68 | 68 | ||
69 | return EINA_TRUE; | 69 | return EINA_TRUE; |
70 | } | 70 | } |
@@ -219,25 +219,25 @@ static Eina_Bool _cb_event_GL(void *data, Evas_Object *obj, Evas_Object *src, Ev | |||
219 | } | 219 | } |
220 | */ | 220 | */ |
221 | 221 | ||
222 | Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image) | 222 | Eo *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *image) |
223 | { | 223 | { |
224 | Evas_3D_Node *result = NULL; | 224 | Eo *result = NULL; |
225 | Evas_3D_Camera *camera; | 225 | Eo *camera; |
226 | 226 | ||
227 | camera = eo_add(EVAS_3D_CAMERA_CLASS, evas, | 227 | camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas, |
228 | evas_3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0) | 228 | evas_canvas3d_camera_projection_perspective_set(90.0, 1.0, 1.0, 1024.0) |
229 | ); | 229 | ); |
230 | 230 | ||
231 | result = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA), | 231 | result = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA), |
232 | evas_3d_node_camera_set(camera), | 232 | evas_canvas3d_node_camera_set(camera), |
233 | evas_3d_node_position_set(0.0, 20.0, 30.0), | 233 | evas_canvas3d_node_position_set(0.0, 20.0, 30.0), |
234 | // 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), | 234 | // 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), |
235 | evas_3d_node_orientation_set(0.0, 0.0, 0.0, 1.0) | 235 | evas_canvas3d_node_orientation_set(0.0, 0.0, 0.0, 1.0) |
236 | ); | 236 | ); |
237 | // eo_unref(camera); | 237 | // eo_unref(camera); |
238 | 238 | ||
239 | eo_do(scene->root_node, evas_3d_node_member_add(result)); | 239 | eo_do(scene->root_node, evas_canvas3d_node_member_add(result)); |
240 | eo_do(scene->scene, evas_3d_scene_camera_node_set(result)); | 240 | eo_do(scene->scene, evas_canvas3d_scene_camera_node_set(result)); |
241 | 241 | ||
242 | scene->move = calloc(1, sizeof(cameraMove)); | 242 | scene->move = calloc(1, sizeof(cameraMove)); |
243 | // In this code, we are making our own camera, so grab it's input when we are focused. | 243 | // In this code, we are making our own camera, so grab it's input when we are focused. |