[Csp-commits] APPLICATIONS/CSPSim/Source Sky.cpp,1.14,1.15

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv3561

Modified Files:
	Sky.cpp 
Log Message:


Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Sky.cpp	26 Jun 2003 09:25:23 -0000	1.14
--- Sky.cpp	26 Jun 2003 22:15:09 -0000	1.15
***************
*** 583,587 ****
  	osg::Depth *depth = new osg::Depth;
  	depth->setFunction(osg::Depth::ALWAYS);
! 	depth->setRange(1.0, 2000000.0);
  	dstate->setAttributeAndModes(depth, osg::StateAttribute::OFF);
  
--- 583,587 ----
  	osg::Depth *depth = new osg::Depth;
  	depth->setFunction(osg::Depth::ALWAYS);
! 	depth->setRange(1.0, 1.0);
  	dstate->setAttributeAndModes(depth, osg::StateAttribute::OFF);
  
***************
*** 1224,1228 ****
  	m_SkyDome->setColorBinding( Geometry::BIND_PER_VERTEX );
  	
! 	StateSet *dstate = new StateSet;
  
  	if (1) {
--- 1224,1228 ----
  	m_SkyDome->setColorBinding( Geometry::BIND_PER_VERTEX );
  	
! 	// XXX XXX StateSet *dstate = new StateSet;
  
  	if (1) {
***************
*** 1248,1270 ****
  		m_SkyDomeTextureImage = image;
  		m_SkyDomeTexture = tex;
! 		dstate->setTextureAttributeAndModes(0, m_SkyDomeTexture.get(), StateAttribute::ON);
! 		dstate->setTextureAttributeAndModes(0, new TexEnv);
  	}
  
- 	dstate->setMode(GL_LIGHTING, StateAttribute::OFF);
- 	dstate->setMode(GL_CULL_FACE, StateAttribute::OFF);
- 	dstate->setMode(GL_DEPTH_TEST, StateAttribute::OFF);
- 
  	// clear the depth to the far plane.
  	osg::Depth* depth = new osg::Depth;
  	depth->setFunction(osg::Depth::ALWAYS);
  	depth->setRange(1.0, 1.0);   
  	dstate->setAttributeAndModes(depth,StateAttribute::OFF);
! 	dstate->setMode(GL_FOG, osg::StateAttribute::OFF);
! 	dstate->setRenderBinDetails(-2,"RenderBin");
! 	m_SkyDome->setStateSet(dstate);
  
  	m_StarDome = new StarSystem();
! 	m_StarDome->setStateSet(dstate);
  
  	osg::Geode *geode = new osg::Geode();
--- 1248,1283 ----
  		m_SkyDomeTextureImage = image;
  		m_SkyDomeTexture = tex;
! 		StateSet *dome_state = m_SkyDome->getOrCreateStateSet();
! 		dome_state->setTextureAttributeAndModes(0, m_SkyDomeTexture.get(), StateAttribute::ON);
! 		dome_state->setTextureAttributeAndModes(0, new TexEnv);
! 		dome_state->setMode(GL_LIGHTING, StateAttribute::OFF);
! 		dome_state->setMode(GL_CULL_FACE, StateAttribute::OFF);
! 		dome_state->setMode(GL_DEPTH_TEST, StateAttribute::OFF);
! 		dome_state->setMode(GL_FOG, osg::StateAttribute::OFF);
! 		dome_state->setRenderBinDetails(-2,"RenderBin");
! 		osg::Depth* depth = new osg::Depth;
! 		depth->setFunction(osg::Depth::ALWAYS);
! 		depth->setRange(1.0, 1.0);   
! 		dome_state->setAttributeAndModes(depth,StateAttribute::OFF);
  	}
  
  	// clear the depth to the far plane.
+ 	/* XXX XXX
  	osg::Depth* depth = new osg::Depth;
  	depth->setFunction(osg::Depth::ALWAYS);
  	depth->setRange(1.0, 1.0);   
  	dstate->setAttributeAndModes(depth,StateAttribute::OFF);
! 	*/
  
  	m_StarDome = new StarSystem();
! 	StateSet *star_state = m_StarDome->getOrCreateStateSet();
! 	star_state->setMode(GL_LIGHTING, StateAttribute::OFF);
! 	star_state->setMode(GL_CULL_FACE, StateAttribute::OFF);
! 	star_state->setMode(GL_DEPTH_TEST, StateAttribute::OFF);
! 	star_state->setMode(GL_FOG, osg::StateAttribute::OFF);
! 	osg::Depth* depth = new osg::Depth;
! 	depth->setFunction(osg::Depth::ALWAYS);
! 	depth->setRange(1.0, 1.0);   
! 	star_state->setAttributeAndModes(depth,StateAttribute::OFF);
  
  	osg::Geode *geode = new osg::Geode();