[Csp-commits] THIRDPARTYLIBS/demeter DemeterVisualC6.vcproj,NONE,1.1 DemeterVisualC6.sln,NONE,1.1 Te

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

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

--- NEW FILE: DemeterVisualC6.vcproj ---
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.00"
	Name="DemeterVisualC6"
	SccProjectName=""
	SccLocalPath="">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				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"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Debug/DemeterVisualC6.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="4"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
				OutputFile="Debug/DemeterVisualC6d.dll"
				LinkIncremental="2"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="..\lib"
				IgnoreDefaultLibraryNames="libcmt.lib"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Debug/DemeterVisualC6d.pdb"
				ImportLibrary=".\Debug/DemeterVisualC6d.lib"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Debug/DemeterVisualC6.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="..\include"
				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS;_STLP_USE_OWN_NAMESPACE"
				StringPooling="TRUE"
				RuntimeLibrary="0"
				EnableFunctionLevelLinking="TRUE"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Release/DemeterVisualC6.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib"
				OutputFile=".\Release/DemeterVisualC6.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="..\lib"
				ProgramDatabaseFile=".\Release/DemeterVisualC6.pdb"
				ImportLibrary=".\Release/DemeterVisualC6.lib"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Release/DemeterVisualC6.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
		</Configuration>
	</Configurations>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath=".\DemeterDrawable.cpp">
			</File>
			<File
				RelativePath=".\Terrain.cpp">
			</File>
			<File
				RelativePath=".\TerrainTextureFactory.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath=".\DemeterDrawable.h">
			</File>
			<File
				RelativePath=".\DemeterException.h">
			</File>
			<File
				RelativePath=".\Terrain.h">
			</File>
			<File
				RelativePath=".\TerrainTextureFactory.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: DemeterVisualC6.sln ---
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
		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.ActiveCfg = Release|Win32
		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.Build.0 = Release|Win32
		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.ActiveCfg = Release|Win32
		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.Build.0 = Release|Win32
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
	EndGlobalSection
	GlobalSection(ExtensibilityAddIns) = postSolution
	EndGlobalSection
EndGlobal

Index: Terrain.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Terrain.h	8 Feb 2003 15:57:28 -0000	1.3
--- Terrain.h	6 Apr 2003 10:39:18 -0000	1.4
***************
*** 24,28 ****
  #define _TERRAIN_DEMETER_H_

! #define _USE_GDAL_
  //_USE_GDAL_ tells Demeter to support the GDAL data loading library. This allows Demeter to directly
  //read DEM and SDTS files. Turn this option on only if you have installed the GDAL library on
--- 24,28 ----
  #define _TERRAIN_DEMETER_H_

! //#define _USE_GDAL_
  //_USE_GDAL_ tells Demeter to support the GDAL data loading library. This allows Demeter to directly
  //read DEM and SDTS files. Turn this option on only if you have installed the GDAL library on
***************
*** 34,38 ****
  //line-of-sight tests, etc. If you enable this option, then be aware that MUCH more memory will be needed.

! //#define _PROTECT_ACCESS_
  // _PROTECT_ACCESS_ turns on extra checks to validate parameters passed to various terrain methods to make sure
  // the parameters are within range. Turn this option on when you want the Terrain to clamp
--- 34,38 ----
  //line-of-sight tests, etc. If you enable this option, then be aware that MUCH more memory will be needed.

! #define _PROTECT_ACCESS_
  // _PROTECT_ACCESS_ turns on extra checks to validate parameters passed to various terrain methods to make sure
  // the parameters are within range. Turn this option on when you want the Terrain to clamp
***************
*** 660,664 ****
          inline void     ref() const { ++m_refCount; }
          /// Decrement the reference count by one, indicating that a pointer to this object is referencing it. If the reference count goes to zero, it is assumed that this object is no longer referenced and is automatically deleted.
!         inline void     unref() const { --m_refCount; if (m_refCount<=0) delete this; }

      private:
--- 660,664 ----
          inline void     ref() const { ++m_refCount; }
          /// Decrement the reference count by one, indicating that a pointer to this object is referencing it. If the reference count goes to zero, it is assumed that this object is no longer referenced and is automatically deleted.
!         inline void     unref() const { /*assert(m_refCount > 0);*/ if (m_refCount > 0) {--m_refCount; if (m_refCount==0 && this) delete this;} }

      private:

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Terrain.cpp	15 Feb 2003 20:56:18 -0000	1.3
--- Terrain.cpp	6 Apr 2003 10:39:18 -0000	1.4
***************
*** 40,44 ****
  #include "sys/stat.h"

! #include "SDL_image.h"

  #ifndef _WIN32
--- 40,44 ----
  #include "sys/stat.h"

! #include "SDL/SDL_image.h"

  #ifndef _WIN32
***************
*** 718,722 ****

      // Load the texture data.
!     int texWidth,texHeight;
      Uint8* pTextureImage = NULL;
      if (szTextureFilename != NULL)
--- 718,722 ----

      // Load the texture data.
!     int texWidth = 0,texHeight = 0;
      Uint8* pTextureImage = NULL;
      if (szTextureFilename != NULL)
***************
*** 756,760 ****
  Terrain::~Terrain()
  {
! 	for (unsigned int i = 0; i < m_TextureCells.size(); i++)
  	{
  		delete m_TextureCells[i];
--- 756,760 ----
  Terrain::~Terrain()
  {
! 	for (unsigned int i = 0; i < m_TextureCells.size();  i++)
  	{
  		delete m_TextureCells[i];

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGES.current	15 Mar 2003 22:30:45 -0000	1.2
--- CHANGES.current	6 Apr 2003 10:39:18 -0000	1.3
***************
*** 1,4 ****
--- 1,8 ----
  Version 0.3.1 (in progress)
  ===========================
+ 
+ 2003-04-06: delta
+ 	    Committed .net project
+ 
  2003-03-14: onsight
              First log entry: this is the format.

[Csp-commits] THIRDPARTYLIBS/demeter DemeterVisualC6.vcproj,NONE,1.1 DemeterVisualC6.sln,NONE,1.1 Te

[Csp-commits] THIRDPARTYLIBS/demeter DemeterVisualC6.vcproj,NONE,1.1 DemeterVisualC6.sln,NONE,1.1 Terrain.h,1.3,1.4 Terrain.cpp,1.3,1.4 CHANGES.current,1.2,1.3