[Csp-commits] svn:csp r1561 - trunk/CSP/CSPSim/Source

[<sv...@ww...>]

Author: wolverine
Date: 2005-06-07 17:50:13 -0700 (Tue, 07 Jun 2005)
New Revision: 1561

Modified:
   trunk/CSP/CSPSim/Source/VirtualScene.cpp
Log:
changes to compile on windows

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1561

Modified: trunk/CSP/CSPSim/Source/VirtualScene.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/VirtualScene.cpp	2005-06-08 00:49:50 UTC (rev 1560)
+++ trunk/CSP/CSPSim/Source/VirtualScene.cpp	2005-06-08 00:50:13 UTC (rev 1561)
@@ -815,12 +815,12 @@
 bool VirtualScene::pick(int x, int y) {
 	if (m_NearObjectGroup->getNumChildren() > 0) {
 		assert(m_NearObjectGroup->getNumChildren() == 1);
-		osg::Vec3 near;
-		osg::Vec3 far;
+		osg::Vec3 var_near;
+		osg::Vec3 var_far;
 		const int height = m_NearView->getViewport()->height();
-		if (m_NearView->projectWindowXYIntoObject(x, height - y, near, far)) {
+		if (m_NearView->projectWindowXYIntoObject(x, height - y, var_near, var_far)) {
 			osgUtil::IntersectVisitor iv;
-			osg::ref_ptr<osg::LineSegment> line_segment = new osg::LineSegment(near, far);
+			osg::ref_ptr<osg::LineSegment> line_segment = new osg::LineSegment(var_near, var_far);
 			iv.addLineSegment(line_segment.get());
 			m_NearView->getSceneData()->accept(iv);
 			osgUtil::IntersectVisitor::HitList &hits = iv.getHitList(line_segment.get());