jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f253f9a7bc8d564632f25d3bc57c00c38b85a3c9
commit f253f9a7bc8d564632f25d3bc57c00c38b85a3c9 Author: Jean-Philippe Andre <[email protected]> Date: Fri Apr 8 10:38:15 2016 +0900 Evas 3d: Fix compilation for Windows near and far are #defined in windows.h. Old legacy stuff. To be sure the code compiles, rename the variables. Fixes T3423 --- src/lib/evas/canvas/evas_canvas3d_mesh.c | 12 ++++++------ src/lib/evas/canvas/evas_canvas3d_mesh.eo | 4 ++-- src/modules/evas/engines/gl_common/evas_gl_context.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index 606d399..091a8bf 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -1155,17 +1155,17 @@ _evas_canvas3d_mesh_convex_hull_data_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh EOLIAN static void _evas_canvas3d_mesh_lod_boundary_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, - Evas_Real near, Evas_Real far) + Evas_Real near_lod, Evas_Real far_lod) { - pd->near_lod_boundary = near; - pd->far_lod_boundary = far; + pd->near_lod_boundary = near_lod; + pd->far_lod_boundary = far_lod; } EOLIAN static void _evas_canvas3d_mesh_lod_boundary_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, - Evas_Real *near, Evas_Real *far) + Evas_Real *near_lod, Evas_Real *far_lod) { - *near = pd->near_lod_boundary; - *far = pd->far_lod_boundary; + *near_lod = pd->near_lod_boundary; + *far_lod = pd->far_lod_boundary; } #include "canvas/evas_canvas3d_mesh.eo.c" diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo index 3cbae53..b39e2dc 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo @@ -415,8 +415,8 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File) See also @Evas.Canvas3D.Mesh.lod_boundary.set.]] } values { - near: Evas.Real; [[up boundary]] - far: Evas.Real; [[down boundary]] + near_lod: Evas.Real; [[up boundary]] + far_lod: Evas.Real; [[down boundary]] } } } diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c index ab2d283..4fc9e4d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -322,7 +322,7 @@ static void matrix_ortho(GLfloat *m, GLfloat l, GLfloat r, GLfloat t, GLfloat b, - GLfloat near, GLfloat far, + GLfloat near_, GLfloat far_, int rot, int vw, int vh, int foc, GLfloat orth) { @@ -366,12 +366,12 @@ matrix_ortho(GLfloat *m, m[8] = 0.0; m[9] = 0.0; - m[10] = -(2.0 / (far - near)); + m[10] = -(2.0 / (far_ - near_)); m[11] = 1.0 / (GLfloat)foc; m[12] = (m[0] * tx) + (m[4] * ty) - ((r + l) / (r - l)); m[13] = (m[1] * tx) + (m[5] * ty) - ((t + b) / (t - b)); - m[14] = (m[2] * tx) + (m[6] * ty) - ((near + far) / (far - near)); + m[14] = (m[2] * tx) + (m[6] * ty) - ((near_ + far_) / (far_ - near_)); m[15] = (m[3] * tx) + (m[7] * ty) + orth; } --
