near and far are #defined in MSVC

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 41e313c099bda3ba5aebb2321fbac3fc9f13a88f..6e93d57c3198d1d681c90ec1ca2dffe774419a31 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -855,13 +855,13 @@ FGRenderer::resize( int width, int height ) {
 }
 
 void FGRenderer::setCameraParameters(float vfov, float aspectRatio,
-                                     float near, float far)
+                                     float zNear, float zFar)
 {
-    near = .1;
+    zNear = .1;
     osgViewer::Viewer* viewer = globals->get_renderer()->getViewer();
     viewer->getCamera()->setProjectionMatrixAsPerspective(vfov,
                                                           1.0f / aspectRatio,
-                                                          near, far);
+                                                          zNear, zFar);
     
 }
 bool

diff --git a/src/Main/renderer.hxx b/src/Main/renderer.hxx
index f651be821b4c951a8ae715f775b5a35218d363ea..918408bcd548bf29afbc4362fa279e488dc5ece1 100644 (file)
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -43,7 +43,7 @@ public:
     /** Set all the camera parameters at once. aspectRatio is height / width.
      */
     static void setCameraParameters(float vfov, float aspectRatio,
-                                    float near, float far);
+                                    float zNear, float zFar);
     /** Just pick into the scene and return the pick callbacks on the way ...
      */
     static bool pick( unsigned x, unsigned y,