summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_canvas3d_camera.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_camera.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index c8ed312..d631df6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -8,7 +8,7 @@ _camera_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
8 void *data EINA_UNUSED, void *fdata) 8 void *data EINA_UNUSED, void *fdata)
9{ 9{
10 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key; 10 Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
11 eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata)); 11 evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata);
12 return EINA_TRUE; 12 return EINA_TRUE;
13} 13}
14 14
@@ -66,8 +66,8 @@ EOLIAN static Eo *
66_evas_canvas3d_camera_eo_base_constructor(Eo *obj, 66_evas_canvas3d_camera_eo_base_constructor(Eo *obj,
67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED) 67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
68{ 68{
69 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 69 obj = eo_constructor(eo_super(obj, MY_CLASS));
70 eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_CAMERA)); 70 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
71 71
72 return obj; 72 return obj;
73} 73}
@@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj,
92 eina_hash_free(pd->nodes); 92 eina_hash_free(pd->nodes);
93 } 93 }
94 94
95 eo_do_super(obj, MY_CLASS, eo_destructor()); 95 eo_destructor(eo_super(obj, MY_CLASS));
96} 96}
97 97
98EAPI Evas_Canvas3D_Camera * 98EAPI Evas_Canvas3D_Camera *
@@ -110,7 +110,7 @@ _evas_canvas3d_camera_projection_matrix_set(Eo *obj, Evas_Canvas3D_Camera_Data *
110 const Evas_Real *matrix) 110 const Evas_Real *matrix)
111{ 111{
112 eina_matrix4_array_set(&pd->projection, matrix); 112 eina_matrix4_array_set(&pd->projection, matrix);
113 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); 113 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL);
114} 114}
115 115
116EOLIAN static void 116EOLIAN static void
@@ -133,7 +133,7 @@ _evas_canvas3d_camera_projection_perspective_set(Eo *obj, Evas_Canvas3D_Camera_D
133 xmax = ymax * aspect; 133 xmax = ymax * aspect;
134 134
135 evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar); 135 evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar);
136 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); 136 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL);
137} 137}
138 138
139EOLIAN static void 139EOLIAN static void
@@ -143,7 +143,7 @@ _evas_canvas3d_camera_projection_frustum_set(Eo *obj, Evas_Canvas3D_Camera_Data
143 Evas_Real dnear, Evas_Real dfar) 143 Evas_Real dnear, Evas_Real dfar)
144{ 144{
145 evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar); 145 evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar);
146 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); 146 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL);
147} 147}
148 148
149EOLIAN static void 149EOLIAN static void
@@ -153,7 +153,7 @@ _evas_canvas3d_camera_projection_ortho_set(Eo *obj, Evas_Canvas3D_Camera_Data *p
153 Evas_Real dnear, Evas_Real dfar) 153 Evas_Real dnear, Evas_Real dfar)
154{ 154{
155 eina_matrix4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar); 155 eina_matrix4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar);
156 eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL)); 156 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL);
157} 157}
158 158
159EOLIAN static Eina_Bool 159EOLIAN static Eina_Bool