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

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

Author: mkrose
Date: 2005-04-02 13:12:59 -0800 (Sat, 02 Apr 2005)
New Revision: 1507

Modified:
   trunk/CSP/CSPSim/Source/VirtualScene.cpp
Log:
Oops, forgot a file in the last changeset.  This also includes a trivial
cleanup in the fog initialization.

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

Modified: trunk/CSP/CSPSim/Source/VirtualScene.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/VirtualScene.cpp	2005-04-02 21:01:57 UTC (rev 1506)
+++ trunk/CSP/CSPSim/Source/VirtualScene.cpp	2005-04-02 21:12:59 UTC (rev 1507)
@@ -376,12 +376,9 @@
 	osg::StateSet * pFogState = m_FogGroup->getOrCreateStateSet();
 	osg::Fog* fog = new osg::Fog;
 	fog->setMode(osg::Fog::LINEAR);
+	fog->setFogCoordinateSource(osg::Fog::FRAGMENT_DEPTH);
 	fog->setDensity(0.3f);
-	if (m_FogEnabled) {
-		pFogState->setAttributeAndModes(fog, osg::StateAttribute::ON);
-	} else {
-		pFogState->setAttributeAndModes(fog, osg::StateAttribute::OFF);
-	}
+	pFogState->setAttributeAndModes(fog, m_FogEnabled ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
 	m_FogGroup->setStateSet(pFogState);
 
 	m_FrameStamp = new osg::FrameStamp;
@@ -514,7 +511,7 @@
 		}
 		if (m_SpinTheWorld) m_Sky->spinTheWorld();
 		if (m_Terrain.valid()) {
-			simdata::LLA m = m_Terrain->getProjection().convert(m_Origin);
+			simdata::LLA m = m_Terrain->getProjection()->convert(m_Origin);
 			m_Sky->update(m.latitude(), m.longitude(), CSPSim::theSim->getCurrentTime());
 		} else {
 			m_Sky->update(0.0, 0.0, CSPSim::theSim->getCurrentTime());