[Csp-commits] THIRDPARTYLIBS/demeter Terrain.cpp,1.7,1.8 TerrainTextureFactory.cpp,1.4,1.5

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv10228

Modified Files:
	Terrain.cpp TerrainTextureFactory.cpp 
Log Message:


Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Terrain.cpp	10 Jun 2003 22:34:26 -0000	1.7
--- Terrain.cpp	10 Jun 2003 22:43:21 -0000	1.8
***************
*** 716,720 ****
  	m_LatticePositionY = 0;
  
! 	std::cout << "SetAllElevations " << szElevationsFilename << "\n";
  	SetAllElevations(szElevationsFilename,vertexSpacing,elevationScale);
  
--- 716,720 ----
  	m_LatticePositionY = 0;
  
! 	//std::cout << "SetAllElevations " << szElevationsFilename << "\n";
  	SetAllElevations(szElevationsFilename,vertexSpacing,elevationScale);
  
***************
*** 829,834 ****
  void Terrain::SetAllElevations(const char* szElevationsFilename,float vertexSpacing,float elevationScale)
  {
! 	std::cout << "SetAllElevations()\n";
! 	std::cout << "efilename = " << szElevationsFilename << "\n";
  	bool useRaw = (strstr(szElevationsFilename, ".raw") || strstr(szElevationsFilename, ".RAW") );
  
--- 829,834 ----
  void Terrain::SetAllElevations(const char* szElevationsFilename,float vertexSpacing,float elevationScale)
  {
! 	//std::cout << "SetAllElevations()\n";
! 	//std::cout << "efilename = " << szElevationsFilename << "\n";
  	bool useRaw = (strstr(szElevationsFilename, ".raw") || strstr(szElevationsFilename, ".RAW") );
  

Index: TerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TerrainTextureFactory.cpp	10 Jun 2003 22:34:26 -0000	1.4
--- TerrainTextureFactory.cpp	10 Jun 2003 22:43:21 -0000	1.5
***************
*** 206,210 ****
  
  			//std::cout << "Generating Texture" << latticeX << ":" << latticeY << endl;
! 			std::cout << originX << "," << originY << "  " << width << "," << height << "  " << textureSize << "\n";
  
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];
--- 206,210 ----
  
  			//std::cout << "Generating Texture" << latticeX << ":" << latticeY << endl;
! 			//std::cout << originX << "," << originY << "  " << width << "," << height << "  " << textureSize << "\n";
  
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];