[Csp-commits] APPLICATIONS/CSPSim/Source GameScreen.cpp,1.5,1.6 CSPSim.cpp,1.6,1.7

[<de...@us...>]

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

Modified Files:
	GameScreen.cpp CSPSim.cpp 
Log Message:
Fix bug for object stats

Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameScreen.cpp	19 Feb 2003 23:01:25 -0000	1.5
--- GameScreen.cpp	20 Feb 2003 09:53:47 -0000	1.6
***************
*** 100,125 ****
  		CSP_LOG( CSP_APP , CSP_ERROR, "No HID interface maps defined, '__gamescreen__' not found.");
  	}
- 	
- 	// add a layer for texts on screen
- 	m_rpInfosView = new osgUtil::SceneView();
- 	m_rpInfosView->setDefaults();
- 
- 	int ScreenWidth = CSPSim::theSim->GetSDLScreen()->w;
- 	int ScreenHeight = CSPSim::theSim->GetSDLScreen()->h;
- 
- 	m_rpInfosView->setViewport(0,0,ScreenWidth,ScreenHeight);
- 
- 	osg::Depth* depth = new osg::Depth;
-     depth->setRange(0.0,0.0);  
-     osg::StateSet* State = new osg::StateSet();
-     State->setAttribute(depth);
- 
- 	m_rpInfosView->getRenderStage()->setClearMask(0x0);
- 
- 	m_ScreenInfoManager = new ScreenInfoManager(ScreenWidth,ScreenHeight);
- 	m_ScreenInfoManager->setName("ScreenInfoManager");
-     m_ScreenInfoManager->setStateSet(State);
- 
-     m_rpInfosView->setSceneData(m_ScreenInfoManager.get() );
  }
  
--- 100,103 ----
***************
*** 193,196 ****
--- 171,196 ----
  		m_ActiveObject->ShowRepresentant(1);
  	}
+ 
+ 	// add a layer for texts on screen
+ 	m_rpInfosView = new osgUtil::SceneView();
+ 	m_rpInfosView->setDefaults();
+ 
+ 	int ScreenWidth = CSPSim::theSim->GetSDLScreen()->w;
+ 	int ScreenHeight = CSPSim::theSim->GetSDLScreen()->h;
+ 
+ 	m_rpInfosView->setViewport(0,0,ScreenWidth,ScreenHeight);
+ 
+ 	osg::Depth* depth = new osg::Depth;
+     depth->setRange(0.0,0.0);  
+     osg::StateSet* State = new osg::StateSet();
+     State->setAttribute(depth);
+ 
+ 	m_rpInfosView->getRenderStage()->setClearMask(0x0);
+ 
+ 	m_ScreenInfoManager = new ScreenInfoManager(ScreenWidth,ScreenHeight);
+ 	m_ScreenInfoManager->setName("ScreenInfoManager");
+     m_ScreenInfoManager->setStateSet(State);
+ 
+     m_rpInfosView->setSceneData(m_ScreenInfoManager.get() );
  }
  

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CSPSim.cpp	19 Feb 2003 23:01:27 -0000	1.6
--- CSPSim.cpp	20 Feb 2003 09:53:47 -0000	1.7
***************
*** 240,248 ****
  	// create screens
  	m_GameScreen = new GameScreen;
- 	m_GameScreen->OnInit();
- 	m_GameScreen->SetBattlefield(m_Battlefield);
  	
  	// start in the aircraft
  	setActiveObject(ao);
  
  #if 0
--- 240,250 ----
  	// create screens
  	m_GameScreen = new GameScreen;
  	
  	// start in the aircraft
  	setActiveObject(ao);
+ 
+ 	// setup screens
+ 	m_GameScreen->OnInit();
+ 	m_GameScreen->SetBattlefield(m_Battlefield);
  
  #if 0