Menu
▾
▴
[Csp-commits] THIRDPARTYLIBS/demeter TerrainTextureFactory.h,1.4,1.5 DemeterVisualC6.sln,1.2,1.3 DemeterVisualC6.vcproj,1.3,1.4 CHANGES.current,1.8,1.9 Terrain.cpp,1.9,1.10
Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv7003
Modified Files:
TerrainTextureFactory.h DemeterVisualC6.sln
DemeterVisualC6.vcproj CHANGES.current Terrain.cpp
Log Message:
see CHANGES.current
Index: TerrainTextureFactory.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TerrainTextureFactory.h 15 Feb 2003 20:56:19 -0000 1.4
--- TerrainTextureFactory.h 6 Dec 2003 00:34:07 -0000 1.5
***************
*** 7,23 ****
#include <vector>
! #ifdef _WIN32
! #include <hash_map>
! using std::hash_map;
#else
! #ifdef __GNUC__
! #if __GNUC__ >= 3
! #include <ext/hash_map>
! using __gnu_cxx::hash_map;
! #else
! #include <hash_map>
! using std::hash_map;
! #endif
! #endif
#endif
--- 7,43 ----
#include <vector>
! #if defined(__GNUC__) || defined(__INTEL_COMPILER)
! #if __GNUC__ >= 3
! #include <ext/hash_map>
! #if __GNUC_MINOR__ > 0
! #define HASH_MAP __gnu_cxx::hash_map
! #define HASH __gnu_cxx::hash
! #else
! #define HASH_MAP std::hash_map
! #define HASH std::hash
! #endif
! #else
! #include <hash_map>
! #define HASH_MAP std::hash_map
! #define HASH std::hash
! #endif
#else
! #ifdef _MSC_VER
! #if (_MSC_VER <= 1200) && defined(_STLP_WIN32)
! #include <hash_map>
! #define HASH_MAP std::hash_map
! #define HASH std::hash
! #elif (_MSC_VER == 1300)
! #include <hash_map>
! #define HASH_MAP std::hash_map
! #define HASH std::hash_compare
! #elif (_MSC_VER > 1300)
! #include <hash_map>
! #define HASH_MAP stdext::hash_map
! #define HASH stdext::hash_compare
! #endif
! #else
! #error "PLEASE PROVIDE CORRECT #INCLUDE<HASH_MAP> STATEMENT FOR YOUR PLATFORM!"
! #endif
#endif
***************
*** 45,49 ****
TerrainLattice * m_pTerrainLattice;
! hash_map<int,Texture*> m_Textures;
std::vector<Uint8*> m_BaseTextures;
--- 65,69 ----
TerrainLattice * m_pTerrainLattice;
! HASH_MAP<int,Texture*> m_Textures;
std::vector<Uint8*> m_BaseTextures;
Index: DemeterVisualC6.sln
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DemeterVisualC6.sln 10 Jun 2003 22:48:37 -0000 1.2
--- DemeterVisualC6.sln 6 Dec 2003 00:34:07 -0000 1.3
***************
*** 1,11 ****
! Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemeterVisualC6", "DemeterVisualC6.vcproj", "{3DB95589-1C58-48C4-A62B-10443581A35F}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! ConfigName.0 = Debug
! ConfigName.1 = Release
! EndGlobalSection
! GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
--- 1,11 ----
! Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemeterVisualC6", "DemeterVisualC6.vcproj", "{3DB95589-1C58-48C4-A62B-10443581A35F}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! Debug = Debug
! Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
Index: DemeterVisualC6.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DemeterVisualC6.vcproj 10 Jun 2003 22:48:37 -0000 1.3
--- DemeterVisualC6.vcproj 6 Dec 2003 00:34:07 -0000 1.4
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.00"
Name="DemeterVisualC6"
SccProjectName=""
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
Name="DemeterVisualC6"
SccProjectName=""
***************
*** 40,44 ****
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6d.dll"
LinkIncremental="2"
--- 40,44 ----
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="SDL_image.lib SDL.lib osgd.lib opengl32.lib glu32.lib"
OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6d.dll"
LinkIncremental="2"
***************
*** 69,73 ****
--- 69,79 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
***************
*** 127,133 ****
--- 133,147 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CHANGES.current 15 Jul 2003 18:53:40 -0000 1.8
--- CHANGES.current 6 Dec 2003 00:34:07 -0000 1.9
***************
*** 2,5 ****
--- 2,10 ----
===========================
+ 2003-12-06: delta
+ Minor changes to shut up .net 7.1 warnings.
+ Demeter debug version links onto release
+ SDL_image.lib
+
2003-07-15: onsight
Disabled GDAL support by default.
Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Terrain.cpp 15 Jul 2003 18:53:40 -0000 1.9
--- Terrain.cpp 6 Dec 2003 00:34:08 -0000 1.10
***************
*** 27,33 ****
#ifdef _WIN32
#include <crtdbg.h>
#endif
! #include "assert.h"
#define DETAIL_TEXTURE_SIZE 512
--- 27,34 ----
#ifdef _WIN32
#include <crtdbg.h>
+ #include <cmath>
#endif
! #include <cassert>
#define DETAIL_TEXTURE_SIZE 512
***************
*** 1297,1301 ****
numLevels += 1.0f;
for (double j = 0.0f; j < numLevels; j += 1.0f)
! numBlocks += pow(4,j);
if (Settings::GetInstance()->IsVerbose())
{
--- 1298,1302 ----
numLevels += 1.0f;
for (double j = 0.0f; j < numLevels; j += 1.0f)
! numBlocks += powf(4,j);
if (Settings::GetInstance()->IsVerbose())
{
***************
*** 2681,2685 ****
for(int i = 0; (i < MAX_POWER) && (!isPowerOf2); i++)
{
! if (pow(2,(double)i) == number)
isPowerOf2 = true;
}
--- 2682,2686 ----
for(int i = 0; (i < MAX_POWER) && (!isPowerOf2); i++)
{
! if (powf(2,(double)i) == number)
isPowerOf2 = true;
}
***************
*** 4085,4089 ****
int i;
for (i = 0; i < numPows; i++)
! powers[i] = (int)pow(2,(double)i);
newX = 0;
for (i = 0; i < numPows && newX == 0; i++)
--- 4086,4090 ----
int i;
for (i = 0; i < numPows; i++)
! powers[i] = (int)powf(2,(double)i);
newX = 0;
for (i = 0; i < numPows && newX == 0; i++)
|
