summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2018-01-03 06:04:02 +0100
committerCedric BAIL <cedric@osg.samsung.com>2018-01-04 12:57:33 -0800
commit6afcd9b2a1f54d1f870ada578337583811ccea1f (patch)
tree74d7f7c477cb61b68196d708127d16ba00c46f8c
parent298915c627895dbd4522cda6a6cd9b80567cf54f (diff)
evas: NEAR AND FAR are already defined on Windows
-rw-r--r--src/examples/evas/evas-3d-static-lod.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 22f7494c40..4e3c3994e0 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -28,8 +28,8 @@
28#define WIDTH 600 28#define WIDTH 600
29#define HEIGHT 600 29#define HEIGHT 600
30#define NUMBER_MESHS 2 30#define NUMBER_MESHS 2
31#define NEAR 90.0 31#define DNEAR 90.0
32#define FAR 1000.0 32#define DFAR 1000.0
33 33
34static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/lod/iso_sphere"; 34static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/lod/iso_sphere";
35 35
@@ -86,8 +86,8 @@ _animate_scene(void *data)
86 else 86 else
87 z += 4.0; 87 z += 4.0;
88 88
89 if (z == NEAR * 2.0) pass = EINA_FALSE; 89 if (z == DNEAR * 2.0) pass = EINA_FALSE;
90 if (z == FAR / 2.0) pass = EINA_TRUE; 90 if (z == DFAR / 2.0) pass = EINA_TRUE;
91 91
92 evas_canvas3d_node_position_set(scene->camera_node, x , y , z); 92 evas_canvas3d_node_position_set(scene->camera_node, x , y , z);
93 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, 93 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
@@ -113,7 +113,7 @@ _camera_setup(Scene_Data *data)
113{ 113{
114 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 114 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
115 115
116 evas_canvas3d_camera_projection_perspective_set(data->camera, NEAR, 1.0, 2.0, FAR); 116 evas_canvas3d_camera_projection_perspective_set(data->camera, DNEAR, 1.0, 2.0, DFAR);
117 117
118 data->camera_node = 118 data->camera_node =
119 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 119 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
@@ -146,8 +146,8 @@ static void
146_mesh_setup(Scene_Data *data) 146_mesh_setup(Scene_Data *data)
147{ 147{
148 int i = 0; 148 int i = 0;
149 Evas_Real distances[NUMBER_MESHS + 2] = {NEAR, 150.0, 300.0, 500.0}; 149 Evas_Real distances[NUMBER_MESHS + 2] = {DNEAR, 150.0, 300.0, 500.0};
150 Evas_Real m_distances[NUMBER_MESHS + 2] = {NEAR, 200.0, 500.0, 500.0}; 150 Evas_Real m_distances[NUMBER_MESHS + 2] = {DNEAR, 200.0, 500.0, 500.0};
151 151
152 /* Setup material. */ 152 /* Setup material. */
153 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 153 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);