[Csp-commits] APPLICATIONS/CSPFlightSim/Source TerrainObject.cpp,1.4,1.5

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

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

Modified Files:
	TerrainObject.cpp 
Log Message:
Changing path to Terrain data files

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/TerrainObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TerrainObject.cpp	13 Dec 2002 04:39:06 -0000	1.4
--- TerrainObject.cpp	14 Dec 2002 18:56:27 -0000	1.5
***************
*** 1,11 ****
- #include "stdinc.h"
- 
- #include "TerrainObject.h"
- #include "VirtualBattlefield.h"
- 
  #include <osg/Depth>
  #include <osg/Geode>
  #include <osg/StateSet>
  
  
  extern int g_ScreenWidth;
--- 1,10 ----
  #include <osg/Depth>
  #include <osg/Geode>
  #include <osg/StateSet>
  
+ #include "LogStream.h"
+ #include "Platform.h"
+ #include "TerrainObject.h"
+ #include "VirtualBattlefield.h"
  
  extern int g_ScreenWidth;
***************
*** 83,87 ****
  		{
  			// create lattice
! 			Demeter::Settings::GetInstance()->SetMediaPath("Terrain");
  			createTerrainLattice();
  		    osg::Node * pTerrainLatticeNode = CreateTerrainLatticeNode(m_pTerrainLattice);
--- 82,86 ----
  		{
  			// create lattice
! 			Demeter::Settings::GetInstance()->SetMediaPath("../Data/Terrain");
  			createTerrainLattice();
  		    osg::Node * pTerrainLatticeNode = CreateTerrainLatticeNode(m_pTerrainLattice);
***************
*** 95,99 ****
  		{
  			// create single terrain node
! 			Demeter::Settings::GetInstance()->SetMediaPath("Terrain");
  			createTerrain();
  			osg::Node * pTerrainNode = CreateTerrainNode(m_pTerrain);
--- 94,98 ----
  		{
  			// create single terrain node
! 			Demeter::Settings::GetInstance()->SetMediaPath("../Data/Terrain");
  			createTerrain();
  			osg::Node * pTerrainNode = CreateTerrainNode(m_pTerrain);
***************
*** 309,316 ****
  void TerrainObject::UpdateDemeterSettings()
  {
!     char szMediaPath[9];
! 
!     sprintf(szMediaPath,".%cterrain%c",DIR_SEPARATOR,DIR_SEPARATOR);
!     Demeter::Settings::GetInstance()->SetMediaPath(szMediaPath);
  
      Demeter::Settings::GetInstance()->SetVerbose(false);
--- 308,313 ----
  void TerrainObject::UpdateDemeterSettings()
  {
!     std::string mediaPath = OSPath::filter("../Data/Terrain/");
!     Demeter::Settings::GetInstance()->SetMediaPath(mediaPath.c_str());
  
      Demeter::Settings::GetInstance()->SetVerbose(false);
***************
*** 320,324 ****
      Demeter::Settings::GetInstance()->SetTextureCompression(m_bTextureCompression);
      Demeter::Settings::GetInstance()->SetUseDynamicTextures(m_bDynamicTextures);
! 	Demeter::Settings::GetInstance()->SetDetailTextureRepeats(20);
  	Demeter::Settings::GetInstance()->SetUseNormals(true);
  
--- 317,321 ----
      Demeter::Settings::GetInstance()->SetTextureCompression(m_bTextureCompression);
      Demeter::Settings::GetInstance()->SetUseDynamicTextures(m_bDynamicTextures);
! 	Demeter::Settings::GetInstance()->SetDetailTextureRepeats(16);
  	Demeter::Settings::GetInstance()->SetUseNormals(true);