[Csp-commits] THIRDPARTYLIBS/demeter Terrain.cpp,1.5,1.6 DemeterVisualC6.vcproj,1.1,1.2 CHANGES.current,1.4,1.5

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

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

Modified Files:
	Terrain.cpp DemeterVisualC6.vcproj CHANGES.current 
Log Message:
no message

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Terrain.cpp	18 Apr 2003 11:10:00 -0000	1.5
--- Terrain.cpp	18 Apr 2003 11:26:17 -0000	1.6
***************
*** 19,23 ****
  */
  
! #ifdef _WIN32
  #pragma warning( disable : 4786 )
  #endif
--- 19,23 ----
  */
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1300)
  #pragma warning( disable : 4786 )
  #endif
***************
*** 58,63 ****
  //#endif
  
- #define _PROTECT_ACCESS_
- 
  #include "Terrain.h"
  #include "BitArray.h"
--- 58,61 ----
***************
*** 1627,1632 ****
  	HGLRC currentContext = wglGetCurrentContext();
  	bool found = false;
! 	for (i = 0; i < m_SharedContexts.size() && !found; i++)
! 		found = (m_SharedContexts[i] == currentContext);
  	if (!found)
  	{
--- 1625,1630 ----
  	HGLRC currentContext = wglGetCurrentContext();
  	bool found = false;
! 	for (unsigned k  = 0; k < m_SharedContexts.size() && !found; k++)
! 		found = (m_SharedContexts[k] == currentContext);
  	if (!found)
  	{
***************
*** 1997,2001 ****
      m_pTextureSet->Write(file,this);
  
!     for (int i = 0; i < m_TextureCells.size(); i++)
          m_TextureCells[i]->Write(file,this);
      fclose(file);
--- 1995,1999 ----
      m_pTextureSet->Write(file,this);
  
!     for (unsigned i = 0; i < m_TextureCells.size(); i++)
          m_TextureCells[i]->Write(file,this);
      fclose(file);
***************
*** 2049,2053 ****
  void Terrain::PreloadTextures()
  {
!     for (int i = 0; i < m_TextureCells.size(); i++)
      {
          m_TextureCells[i]->BindTexture();
--- 2047,2051 ----
  void Terrain::PreloadTextures()
  {
!     for (unsigned i = 0; i < m_TextureCells.size(); i++)
      {
          m_TextureCells[i]->BindTexture();
***************
*** 3758,3768 ****
      Uint8 useCompression;
      fread(&useCompression,sizeof(Uint8),1,file);
!     m_UseCompression = (bool)useCompression;
      Uint8 bClamp;
      fread(&bClamp,sizeof(Uint8),1,file);
!     m_bClamp = (bool)bClamp;
      Uint8 bAlpha;
      fread(&bAlpha,sizeof(Uint8),1,file);
!     m_bAlpha = (bool)bAlpha;
      if (m_szFilename == NULL)
      {
--- 3756,3766 ----
      Uint8 useCompression;
      fread(&useCompression,sizeof(Uint8),1,file);
! 	m_UseCompression = useCompression != 0;
      Uint8 bClamp;
      fread(&bClamp,sizeof(Uint8),1,file);
!     m_bClamp = bClamp != 0;
      Uint8 bAlpha;
      fread(&bAlpha,sizeof(Uint8),1,file);
!     m_bAlpha = bAlpha != 0;
      if (m_szFilename == NULL)
      {

Index: DemeterVisualC6.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DemeterVisualC6.vcproj	6 Apr 2003 10:39:18 -0000	1.1
--- DemeterVisualC6.vcproj	18 Apr 2003 11:26:17 -0000	1.2
***************
*** 23,27 ****
  				Optimization="0"
  				AdditionalIncludeDirectories="..\Include,..\Include\SDL"
! 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS;_PROTECT_ACCESS_;_STLP_USE_OWN_NAMESPACE"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
--- 23,27 ----
  				Optimization="0"
  				AdditionalIncludeDirectories="..\Include,..\Include\SDL"
! 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
***************
*** 83,87 ****
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS;_STLP_USE_OWN_NAMESPACE"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"
--- 83,87 ----
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\include"
! 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS"
  				StringPooling="TRUE"
  				RuntimeLibrary="0"

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES.current	18 Apr 2003 11:10:00 -0000	1.4
--- CHANGES.current	18 Apr 2003 11:26:17 -0000	1.5
***************
*** 2,5 ****
--- 2,9 ----
  ===========================
  
+ 2003-04-18: delta
+ 	    Checked Onsight changes. got ride of some vc++ warnings.
+ 	    Updated .NET project.
+ 
  2003-04-18: onsight
              Changed Terrain and TerrainLattice to inherit from