From d9ddd0bb06be8902f45f693e2c5e58382a30134d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 16 Apr 2003 19:20:15 +0000 Subject: [PATCH] Changed near and far instances into near_point, far_point to avoid problems with Win32 build. --- src/osgProducer/Viewer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp index 303c3fdff..9a39c269a 100644 --- a/src/osgProducer/Viewer.cpp +++ b/src/osgProducer/Viewer.cpp @@ -444,7 +444,7 @@ bool Viewer::computePixelCoords(float x,float y,unsigned int cameraNum,float& pi return false; } -bool Viewer::computeNearFarPoints(float x,float y,unsigned int cameraNum,osg::Vec3& near, osg::Vec3& far) +bool Viewer::computeNearFarPoints(float x,float y,unsigned int cameraNum,osg::Vec3& near_point, osg::Vec3& far_point) { if (cameraNum>=getSceneHandlerList().size()) return false; @@ -453,7 +453,7 @@ bool Viewer::computeNearFarPoints(float x,float y,unsigned int cameraNum,osg::Ve float pixel_x,pixel_y; if (computePixelCoords(x,y,cameraNum,pixel_x,pixel_y)) { - return scenehandler->projectWindowXYIntoObject(pixel_x,pixel_y,near,far); + return scenehandler->projectWindowXYIntoObject(pixel_x,pixel_y,near_point,far_point); } return false;