csp-commits Mailing List for The Combat Simulator Project (Page 69)

Status: Alpha

Brought to you by: boddman, deltasf, mkrose, storm_bringer, wolverine69

csp-commits — Mailing list for CVS commit messages.

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2003	Jan (140)	Feb (98)	Mar (152)	Apr (104)	May (71)	Jun (94)	Jul (169)	Aug (83)	Sep (47)	Oct (134)	Nov (7)	Dec (20)
2004	Jan (41)	Feb (14)	Mar (42)	Apr (47)	May (68)	Jun (143)	Jul (65)	Aug (29)	Sep (40)	Oct (34)	Nov (33)	Dec (97)
2005	Jan (29)	Feb (30)	Mar (9)	Apr (37)	May (13)	Jun (31)	Jul (22)	Aug (23)	Sep	Oct (37)	Nov (34)	Dec (117)
2006	Jan (48)	Feb (6)	Mar (2)	Apr (71)	May (10)	Jun (16)	Jul (7)	Aug (1)	Sep (14)	Oct (17)	Nov (25)	Dec (26)
2007	Jan (8)	Feb (2)	Mar (7)	Apr (26)	May	Jun (12)	Jul (30)	Aug (14)	Sep (9)	Oct (4)	Nov (7)	Dec (6)
2008	Jan (10)	Feb (10)	Mar (6)	Apr (8)	May	Jun (10)	Jul (18)	Aug (15)	Sep (16)	Oct (5)	Nov (3)	Dec (10)
2009	Jan (11)	Feb (2)	Mar	Apr (15)	May (31)	Jun (18)	Jul (11)	Aug (26)	Sep (52)	Oct (17)	Nov (4)	Dec
2010	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 67 68 69 70 71 .. 115 > >> (Page 69 of 115)

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.15,1.16 HashUtility.cpp,1.9,1.10

From: <de...@us...> - 2004-01-01 16:15:23

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

Modified Files:
	InterfaceRegistry.cpp HashUtility.cpp 
Log Message:
see CHANGES.current

Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InterfaceRegistry.cpp	2 Nov 2003 21:11:19 -0000	1.15
--- InterfaceRegistry.cpp	1 Jan 2004 16:15:19 -0000	1.16
***************
*** 37,43 ****
  #include <SimData/Version.h>
  
  #include <string>
  #include <vector>
- #include <algorithm>
  
  using std::cout;
--- 37,43 ----
  #include <SimData/Version.h>
  
+ #include <algorithm>
  #include <string>
  #include <vector>
  
  using std::cout;

Index: HashUtility.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/HashUtility.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HashUtility.cpp	16 Aug 2003 10:29:44 -0000	1.9
--- HashUtility.cpp	1 Jan 2004 16:15:19 -0000	1.10
***************
*** 71,74 ****
--- 71,75 ----
  
     // handle most of the key
+   
     while (len >= 12)
     {

[Csp-commits] APPLICATIONS/SimData/Include/SimData HashUtility.h,1.20,1.21

From: <de...@us...> - 2004-01-01 16:13:13

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv23090

Modified Files:
	HashUtility.h 
Log Message:
see CHANGES.current

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** HashUtility.h	24 Oct 2003 06:44:13 -0000	1.20
--- HashUtility.h	1 Jan 2004 16:13:09 -0000	1.21
***************
*** 200,207 ****
  	struct eqstr: public HASH<char const*>
  	{
! 		size_t operator()(char const* s) const {
  			return static_cast<size_t>(newhash4_cstring(s));
  		}
! 		bool operator()(char const* s1, char const* s2) const {
  			return (strcmp(s1, s2) < 0);
  		}
--- 200,207 ----
  	struct eqstr: public HASH<char const*>
  	{
! 		size_t operator()(char const* const &s) const {
  			return static_cast<size_t>(newhash4_cstring(s));
  		}
! 		bool operator()(char const* const &s1, char const* const &s2) const {
  			return (strcmp(s1, s2) < 0);
  		}

[Csp-commits] APPLICATIONS/CSPSim/Data/Images fx2.jpeg,1.1,1.2

From: <de...@us...> - 2003-12-28 21:48:27

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/Images
In directory sc8-pr-cvs1:/tmp/cvs-serv13309

Modified Files:
	fx2.jpeg 
Log Message:
see CHANGES.current

Index: fx2.jpeg
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/Images/fx2.jpeg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsYoUG1h and /tmp/cvsAzfY5o differ

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.vcproj,1.14,1.15

From: <de...@us...> - 2003-12-28 20:25:25

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv437

Modified Files:
	CSPSimDLL.vcproj 
Log Message:
see CHANGES.current

Index: CSPSimDLL.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CSPSimDLL.vcproj	20 Oct 2003 00:23:24 -0000	1.14
--- CSPSimDLL.vcproj	28 Dec 2003 20:25:21 -0000	1.15
***************
*** 24,29 ****
  				AdditionalOptions="/Zm1000"
  				Optimization="0"
! 				AdditionalIncludeDirectories="&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config&quot;;E:\CSP\THIRDPARTYLIBS\OpenThreads\include;E:\CSP\THIRDPARTYLIBS\Producer\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5&quot;;C:\Python22\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include"
! 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="3"
--- 24,29 ----
  				AdditionalOptions="/Zm1000"
  				Optimization="0"
! 				AdditionalIncludeDirectories="C:\Python23\include;..\..\Include;..\..\..\..\THIRDPARTYLIBS\demeter;..\..\..\..\THIRDPARTYLIBS\CSPChunkLod\include"
! 				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="3"
***************
*** 43,51 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib"
  				OutputFile="../../Bin/_cCSPd.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="C:/Python22/Lib/site-packages/SimData,C:/Python22/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="TRUE"
--- 43,51 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimDatad.lib odbc32.lib odbccp32.lib"
  				OutputFile="../../Bin/_cCSPd.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="C:/Python23/Lib/site-packages/SimData,C:/Python23/libs, ../../../../THIRDPARTYLIBS/lib"
  				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="TRUE"
***************
*** 93,98 ****
  				AdditionalOptions="/Zm1000"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="E:\CSP\THIRDPARTYLIBS\OpenThreads\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5\sigc++\config&quot;;E:\CSP\THIRDPARTYLIBS\Producer\include;&quot;E:\CSP\THIRDPARTYLIBS\libsigc++-1.2.5&quot;;../../Include;C:/Python22/include;../../../../THIRDPARTYLIBS/include;../../../../THIRDPARTYLIBS/demeter;..\..\..\..\\THIRDPARTYLIBS\CSPChunkLod\include"
! 				PreprocessorDefinitions="CSP_NDEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
  				RuntimeLibrary="2"
--- 93,98 ----
  				AdditionalOptions="/Zm1000"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="C:/Python23/include;../../Include;../../../../THIRDPARTYLIBS/demeter;../../../../THIRDPARTYLIBS/CSPChunkLod/include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CSPSIMDLL_EXPORTS"
  				StringPooling="TRUE"
  				RuntimeLibrary="2"
***************
*** 103,109 ****
  				ObjectFile=".\Release/"
  				ProgramDataBaseFileName=".\Release/"
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				CompileAs="0"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
--- 103,111 ----
  				ObjectFile=".\Release/"
  				ProgramDataBaseFileName=".\Release/"
+ 				BrowseInformation="0"
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"
! 				CompileAs="2"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
***************
*** 111,120 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib sigc-1.2.lib OpenThreadsWin32.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python22/libs,C:/Python22/Lib/site-packages/SimData"
! 				ImportLibrary=".\Release/_CSP.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 113,127 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib  sigc-1.2.lib OpenThreadsWin32.lib"
  				OutputFile="../../Bin/_cCSP.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python23/libs,C:/Python23/Lib/site-packages/SimData"
! 				GenerateDebugInformation="TRUE"
! 				AssemblyDebug="0"
! 				GenerateMapFile="FALSE"
! 				MapExports="FALSE"
! 				ImportLibrary=".\Release/_CSP.lib"
! 				TargetMachine="1"/>
  			<Tool
  				Name="VCMIDLTool"
***************
*** 180,184 ****
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
  				</FileConfiguration>
  				<FileConfiguration
--- 187,192 ----
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"
! 						UndefinePreprocessorDefinitions="_DEBUG"/>
  				</FileConfiguration>
  				<FileConfiguration
***************
*** 186,190 ****
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"/>
  				</FileConfiguration>
  			</File>
--- 194,199 ----
  					<Tool
  						Name="VCCLCompilerTool"
! 						PreprocessorDefinitions="SWIG_NOINCLUDE"
! 						UndefinePreprocessorDefinitions="_DEBUG"/>
  				</FileConfiguration>
  			</File>
***************
*** 197,206 ****
  						Name="VCCLCompilerTool"/>
  				</FileConfiguration>
- 				<FileConfiguration
- 					Name="Release|Win32"
- 					ExcludedFromBuild="TRUE">
- 					<Tool
- 						Name="VCCLCompilerTool"/>
- 				</FileConfiguration>
  			</File>
  			<File
--- 206,209 ----
***************
*** 484,490 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\GlibCsp.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\HID.h">
  			</File>
--- 487,490 ----
***************
*** 502,505 ****
--- 502,508 ----
  			</File>
  			<File
+ 				RelativePath="..\..\Include\MapEvent.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Include\MenuScreen.h">
  			</File>
***************
*** 544,550 ****
  			</File>
  			<File
- 				RelativePath="..\..\Include\stdinc.h">
- 			</File>
- 			<File
  				RelativePath="..\..\Include\SynchronousUpdate.h">
  			</File>
--- 547,550 ----
***************
*** 568,575 ****
  			</File>
  			<File
! 				RelativePath="..\..\Include\VehicleModel.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<Filter
--- 568,575 ----
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualBattlefield.h">
  			</File>
  			<File
! 				RelativePath="..\..\Include\VirtualScene.h">
  			</File>
  			<Filter
***************
*** 655,659 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
--- 655,659 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
***************
*** 663,667 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python22\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
--- 663,667 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -IC:\Python23\include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
  "
  					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>

[Csp-commits] APPLICATIONS/CSPSim/Include LogoScreen.h,1.7,1.8

From: <de...@us...> - 2003-12-28 19:56:45

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv25963

Modified Files:
	LogoScreen.h 
Log Message:
see CHANGES.current

Index: LogoScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LogoScreen.h	4 May 2003 11:30:10 -0000	1.7
--- LogoScreen.h	28 Dec 2003 19:56:42 -0000	1.8
***************
*** 29,34 ****
  #include "BaseScreen.h"
  
  
! struct SDL_Surface;
  
  /**
--- 29,45 ----
  #include "BaseScreen.h"
  
+ #include <osg/ref_ptr>
+ 
+ namespace osg {
+ 	class Texture2D;
+ };
+ 
+ namespace osgUtil {
+ 	class SceneView;
+ };
  
! 
! 
! //struct SDL_Surface;
  
  /**
***************
*** 47,55 ****
  
  	virtual void onRender();
! 	virtual void onUpdate(double dt)  {;  }
! 
  
  private:
! 	SDL_Surface * m_image;
  	int m_width, m_height;
  };
--- 58,67 ----
  
  	virtual void onRender();
! 	virtual void onUpdate(double dt);
  
  private:
! 	osg::ref_ptr<osgUtil::SceneView> m_LogoView; 
! 	osg::ref_ptr<osg::Texture2D> m_Texture;
! 	//SDL_Surface * m_image;
  	int m_width, m_height;
  };

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.cpp,1.38,1.39

From: <de...@us...> - 2003-12-28 19:56:33

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

Modified Files:
	CSPSim.cpp 
Log Message:
see CHANGES.current

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** CSPSim.cpp	21 Oct 2003 21:13:01 -0000	1.38
--- CSPSim.cpp	28 Dec 2003 19:56:30 -0000	1.39
***************
*** 22,26 ****
   *
   */
! #include <Python.h>
  
  #include "CSPSim.h"
--- 22,33 ----
   *
   */
! 
! #ifdef _DEBUG
! #undef _DEBUG
! #include <python.h>
! #define _DEBUG
! #else
! #include <python.h>
! #endif
  
  #include "CSPSim.h"
***************
*** 221,227 ****
  		// installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
  		// OSG can find itself the plugins.
! #ifdef _WIN32
! 		osgDB::setLibraryFilePathList(".");
! #endif
  
  		// open the primary data archive
--- 228,234 ----
  		// installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
  		// OSG can find itself the plugins.
! //#ifdef _WIN32
! //		osgDB::setLibraryFilePathList(".");
! //#endif
  
  		// open the primary data archive
***************
*** 258,264 ****
  
  		logoScreen.onRender();
- 
- 		//--m_RenderSurface.swapBuffers();
  		SDL_GL_SwapBuffers();
  
  		m_Clean = false;
--- 265,270 ----
  
  		logoScreen.onRender();
  		SDL_GL_SwapBuffers();
+ 		//--m_RenderSurface.swapBuffers();
  
  		m_Clean = false;
***************
*** 271,274 ****
--- 277,284 ----
  		m_Interface = new VirtualHID();
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: theater");
  
***************
*** 287,290 ****
--- 297,304 ----
  		m_Atmosphere.setPosition(lat, lon);
  		
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: scene");
  
***************
*** 293,296 ****
--- 307,314 ----
  		m_Scene->setTerrain(m_Terrain);
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: battlefield");
  
***************
*** 300,303 ****
--- 318,325 ----
  		m_Battlefield->setTheater(m_Theater);
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: scene configuration");
  
***************
*** 350,353 ****
--- 372,379 ----
  
  #endif
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: gamescreen");

[Csp-commits] APPLICATIONS/CSPSim/Source LogoScreen.cpp,1.13,1.14

From: <de...@us...> - 2003-12-28 19:56:19

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

Modified Files:
	LogoScreen.cpp 
Log Message:
see CHANGES.current

Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** LogoScreen.cpp	6 Aug 2003 06:25:18 -0000	1.13
--- LogoScreen.cpp	28 Dec 2003 19:56:15 -0000	1.14
***************
*** 1,4 ****
! // Combat Simulator Project - FlightSim Demo
! // Copyright (C) 2002 The Combat Simulator Project
  // http://csp.sourceforge.net
  // 
--- 1,4 ----
! // Combat Simulator Project - CSPSim
! // Copyright (C) 2002, 2003, 2004 The Combat Simulator Project
  // http://csp.sourceforge.net
  // 
***************
*** 28,41 ****
  # endif
  
- #ifdef WIN32
- #include <windows.h>
- #endif
- 
  #include "LogoScreen.h"
! #include "Exception.h"
! #include "Config.h"
  
  #include <SimData/FileUtility.h>
  
  #include <iostream>
  #include <GL/gl.h>			// Header File For The OpenGL32 Library
--- 28,225 ----
  # endif
  
  #include "LogoScreen.h"
! 
! #include <osg/Geode>
! #include <osg/Geometry>
! #include <osg/Texture2D>
! #include <osgDB/ReadFile>
! #include <osgUtil/SceneView>
  
  #include <SimData/FileUtility.h>
  
+ #include "Config.h"
+ #include "Exception.h"
+ 
+ 
+ LogoScreen::LogoScreen(int width, int height) {
+ 	m_width = width;
+ 	m_height = height;
+ }
+ 
+ LogoScreen::~LogoScreen() {
+ }
+ 
+ class ImageUpdateCallback: public osg::NodeCallback {
+ 	typedef std::vector<osg::ref_ptr<osg::Image> > ImageList;
+     osg::ref_ptr<osg::Texture2D> m_Texture;
+ 	double m_Delay;
+     ImageList m_ImageList;
+     size_t m_CurrPos;
+     double m_PrevTime;
+ public:
+     ImageUpdateCallback(osg::Texture2D *texture, double delay):
+ 	m_Texture(texture),
+ 	m_Delay(delay),
+ 	m_PrevTime(0.0) {
+ 		// serialized?
+ 		typedef std::vector<std::string> StrVec;
+ 		StrVec file_name;
+ 		file_name.push_back("CSPLogo.bmp");
+ 		file_name.push_back("moonrise1.png");
+ 		file_name.push_back("crescent.png");
+ 		file_name.push_back("sunlight2.png");
+ 		file_name.push_back("sunset4.png");
+ 		file_name.push_back("console2.png");
+ 		file_name.push_back("TLabMultitex.jpeg");
+ 		file_name.push_back("landing-2.png");
+ 		file_name.push_back("vista.png");
+ 		file_name.push_back("ground-fog.png");
+ 		file_name.push_back("fx2.jpeg");
+ 
+ 		std::string image_path = getDataPath("ImagePath");
+ 		StrVec::const_iterator iEnd = file_name.end();
+ 		for (StrVec::const_iterator i = file_name.begin();i!=iEnd;++i) {
+ 			std::string path = simdata::ospath::join(image_path, *i);
+ 			osg::ref_ptr<osg::Image> image = osgDB::readImageFile(path);
+ 			if (!image.valid()) {
+ 				std::string err = "Unable to load bitmap " + path;
+ 				std::cerr << err << std::endl;
+ 				throw csp::DataError(err);
+ 			}
+ 			else
+ 				m_ImageList.push_back(image);
+ 		}
+ 		if (!file_name.empty()) {
+ 			__time64_t ltime;
+ 			_time64( &ltime );
+ 			unsigned int seed = static_cast<unsigned int>(ltime);
+ 			srand(seed);
+ 			m_CurrPos = rand() % file_name.size();
+ 			setValue();
+ 		}
+ 	}
+     virtual void operator()(osg::Node*, osg::NodeVisitor *nv) {
+ 		if (nv->getFrameStamp()) {
+ 			double currTime = nv->getFrameStamp()->getReferenceTime();
+ 			//if (currTime-m_PrevTime>m_Delay) {
+ 			// record time
+ 			m_PrevTime = currTime;
+ 			// advance the current positon, wrap round if required.
+ 			++m_CurrPos %= m_ImageList.size();
+ 			setValue();
+ 			//}
+ 		}
+     }
+ 	void setValue() {
+ 		m_Texture->setImage(m_ImageList[m_CurrPos].get());
+ 	}
+ };
+ 
+ void LogoScreen::onInit() {
+ 	m_LogoView = new osgUtil::SceneView();
+ 	m_LogoView->setDefaults();
+ 	m_LogoView->setViewport(0,0,m_width,m_height);
+ 	float scale = 0.5f; 
+ 	float w = scale * m_width, h = scale * m_height;
+ 	m_LogoView->setProjectionMatrixAsOrtho2D(-w,w,-h,h);
+ 	osg::FrameStamp *fs = new osg::FrameStamp();
+ 	m_LogoView-> setFrameStamp(fs);
+ 
+ 	// create geometry
+     osg::Geometry* geom = new osg::Geometry;
+ 
+ 	// disable display list so our modified tex show up
+     geom->setUseDisplayList(false);
+ 
+ 	scale = 0.5f * 0.9f;
+ 	w = scale * m_width;
+ 	h = scale * m_height;
+     osg::Vec3Array* vertices = new osg::Vec3Array(4);
+ 	(*vertices)[0] = osg::Vec3(-w,h,0.0f);//top left
+     (*vertices)[1] = osg::Vec3(-w,-h,0.0f);//bottom left
+     (*vertices)[2] = osg::Vec3(w,-h,0.0f);//bottom right
+     (*vertices)[3] = osg::Vec3(w,h,0.0f);//top right
+     geom->setVertexArray(vertices);
+     
+     osg::Vec2Array* texcoords = new osg::Vec2Array(4);
+     (*texcoords)[0].set(0.0f, 1.0f);
+     (*texcoords)[1].set(0.0f, 0.0f);
+     (*texcoords)[2].set(1.0f, 0.0f);
+     (*texcoords)[3].set(1.0f, 1.0f);
+ 	 
+     geom->setTexCoordArray(0,texcoords);
+ 
+ 	osg::Vec4Array* colors = new osg::Vec4Array(1);
+     (*colors)[0].set(1.0f,1.0f,1.0f,1.0f);
+     geom->setColorArray(colors);
+     geom->setColorBinding(osg::Geometry::BIND_OVERALL);
+     geom->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, 4));
+ 
+ 	m_Texture = new osg::Texture2D;
+ 
+ 	// setup state
+ 	osg::StateSet *stateset = geom->getOrCreateStateSet();
+ 	stateset->setTextureAttributeAndModes(0, m_Texture.get(), osg::StateAttribute::ON);
+ 	geom->setStateSet(stateset);
+ 
+     osg::Geode *geode = new osg::Geode;
+ 	geode->addDrawable(geom);
+ 	geode->setUpdateCallback(new ImageUpdateCallback(m_Texture.get(),0.5));
+ 
+ 	m_LogoView->setSceneData(geode);
+ }
+ 
+ void LogoScreen::onExit() {	
+ }	
+ 
+ void LogoScreen::onRender() {
+ 	m_LogoView->cull();
+ 	m_LogoView->draw();
+ }
+ 
+ void LogoScreen::onUpdate(double dt) {
+ 	m_LogoView->update();
+ }
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ /*
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+ 
  #include <iostream>
  #include <GL/gl.h>			// Header File For The OpenGL32 Library
***************
*** 100,102 ****
--- 284,287 ----
  	glDrawPixels(m_image->w, m_image->h, GL_RGB, GL_UNSIGNED_BYTE, m_image->pixels);
  }
+ */

[Csp-commits] APPLICATIONS/CSPSim/Data/Images vista.png,NONE,1.1 TLabMultitex.jpeg,NONE,1.1 sunset4.png,NONE,1.1 sunlight2.png,NONE,1.1 moonrise1.png,NONE,1.1 moon.png,NONE,1.1 landing-2.png,NONE,1.1 ground-fog.png,NONE,1.1 fx2.jpeg,NONE,1.1 CSPLogo.bmp,NONE,1.1 crescent.png,NONE,1.1 console2.png,NONE,1.1

From: <de...@us...> - 2003-12-28 17:53:32

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/Images
In directory sc8-pr-cvs1:/tmp/cvs-serv31923

Added Files:
	vista.png TLabMultitex.jpeg sunset4.png sunlight2.png 
	moonrise1.png moon.png landing-2.png ground-fog.png fx2.jpeg 
	CSPLogo.bmp crescent.png console2.png 
Log Message:
see CHANGES.current

--- NEW FILE: vista.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: TLabMultitex.jpeg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sunset4.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sunlight2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: moonrise1.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: moon.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: landing-2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ground-fog.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fx2.jpeg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: CSPLogo.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: crescent.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: console2.png ---
(This appears to be a binary file; contents omitted.)

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/VisualStudio VisualStudio.vcproj,1.3,1.4

From: <de...@us...> - 2003-12-21 12:31:02

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv12384

Modified Files:
	VisualStudio.vcproj 
Log Message:
no message

Index: VisualStudio.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio/VisualStudio.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VisualStudio.vcproj	6 Dec 2003 16:09:16 -0000	1.3
--- VisualStudio.vcproj	21 Dec 2003 12:30:59 -0000	1.4
***************
*** 33,37 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="opengl32.lib osgNVd.lib libjpeg.lib osgDBd.lib osgd.lib"
  				OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLodd.dll"
  				LinkIncremental="2"
--- 33,37 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="cgGL.lib Cg.lib osgNVCgd.lib opengl32.lib osgNVd.lib libjpeg.lib osgDBd.lib osgd.lib"
  				OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLodd.dll"
  				LinkIncremental="2"
***************
*** 73,77 ****
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\..\include;..\include"
! 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;OSGCHUNKLOD_LIBRARY"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="2"
--- 73,77 ----
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\..\include;..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;OSGCHUNKLOD_LIBRARY"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="2"
***************
*** 83,87 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="osg.lib osgDB.lib osgNV.lib opengl32.lib libjpeg.lib"
  				OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLod.dll"
  				LinkIncremental="1"
--- 83,87 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="cgGL.lib Cg.lib osgNVCg.lib osg.lib osgDB.lib osgNV.lib opengl32.lib libjpeg.lib"
  				OutputFile="..\..\..\APPLICATIONS\CSPSim\Bin\osgChunkLod.dll"
  				LinkIncremental="1"

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod ChunkLod.cpp,1.1,1.2

From: <de...@us...> - 2003-12-21 12:30:23

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod
In directory sc8-pr-cvs1:/tmp/cvs-serv12296

Modified Files:
	ChunkLod.cpp 
Log Message:
no message

Index: ChunkLod.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod/ChunkLod.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChunkLod.cpp	19 Jun 2003 17:42:57 -0000	1.1
--- ChunkLod.cpp	21 Dec 2003 12:30:20 -0000	1.2
***************
*** 165,170 ****
  #ifdef USE_CG
  	_cgContext = new osgNVCg::Context;
! 
! 	if (_cgContext->getHandle() != 0) {
  		_canUseVertexProgram = true;
  		_useVertexProgram = true;
--- 165,172 ----
  #ifdef USE_CG
  	_cgContext = new osgNVCg::Context;
! 	
! 	// XXX
! 	osg::ref_ptr<osg::State> s = new osg::State;
! 	if (_cgContext->getHandle(*s) != 0) {
  		_canUseVertexProgram = true;
  		_useVertexProgram = true;
***************
*** 304,308 ****
  	if (_useVertexProgram) {
  #ifdef USE_CG
! 		cgGLEnableProfile (cgGetProgramProfile (_cgProgram->getHandle()));
  #endif
  	}
--- 306,310 ----
  	if (_useVertexProgram) {
  #ifdef USE_CG
! 		cgGLEnableProfile (cgGetProgramProfile (_cgProgram->getHandle(s)));
  #endif
  	}
***************
*** 317,321 ****
  	if (_useVertexProgram) {
  #ifdef USE_CG
! 		cgGLDisableProfile (cgGetProgramProfile (_cgProgram->getHandle()));
  #endif
  	}
--- 319,323 ----
  	if (_useVertexProgram) {
  #ifdef USE_CG
! 		cgGLDisableProfile (cgGetProgramProfile (_cgProgram->getHandle(s)));
  #endif
  	}

[Csp-commits] APPLICATIONS/CSPSim/Source ScreenInfo.cpp,1.22,1.23

From: <de...@us...> - 2003-12-21 10:44:35

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

Modified Files:
	ScreenInfo.cpp 
Log Message:
no message

Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ScreenInfo.cpp	20 Oct 2003 00:23:23 -0000	1.22
--- ScreenInfo.cpp	21 Dec 2003 10:44:32 -0000	1.23
***************
*** 71,89 ****
  	//m_TTFPath("ltype.ttf"),
  	m_FontSize(20), 
! 	m_CharacterSize(14),
! 	//m_CharacterSize(11),
  	m_Text(0) {
  	m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
  	addDrawable(m_Text);
  	setName(name);
- 	// FIXME: these lines seems to badly interact with others parts of the code, 
- 	// on windows at least; for example, TEXDOME code from Sky doesn t work correctly
- 	// when they are uncommented.
  	// HACK to prevent text from disappearing when chunklod multitexture details
  	// are turned on:
! 	//osg::StateSet *ss = getOrCreateStateSet();
! 	//ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! 	//ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! 	//ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
  }
  
--- 71,86 ----
  	//m_TTFPath("ltype.ttf"),
  	m_FontSize(20), 
! 	//m_CharacterSize(14),
! 	m_CharacterSize(11),
  	m_Text(0) {
  	m_Text = makeText(pos_x,pos_y - m_CharacterSize, text);
  	addDrawable(m_Text);
  	setName(name);
  	// HACK to prevent text from disappearing when chunklod multitexture details
  	// are turned on:
! 	osg::StateSet *ss = getOrCreateStateSet();
! 	ss->setTextureAttributeAndModes(1, new osg::Texture2D, osg::StateAttribute::OFF);
! 	ss->setTextureAttributeAndModes(2, new osg::Texture2D, osg::StateAttribute::OFF);
! 	ss->setTextureAttributeAndModes(3, new osg::Texture2D, osg::StateAttribute::OFF);
  }

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.77,1.78

From: <de...@us...> - 2003-12-21 10:36:21

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv30052

Modified Files:
	CHANGES.current 
Log Message:
no message

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** CHANGES.current	24 Oct 2003 15:40:13 -0000	1.77
--- CHANGES.current	21 Dec 2003 10:36:15 -0000	1.78
***************
*** 1,4 ****
--- 1,13 ----
   Version 0.4.0 (in progress)
  ===========================
+ 2003-12-21: delta
+   * Fixed stars at daytime on windows (GL_BLEND problem).
+   
+   * Separated gears and markers control.
+   
+   * Added an osgFX effect (specular highlight).
+   
+   * Other minor changes.
+   
  2003-10-24: onsight
    * Added some SimData header includes that were included
***************
*** 163,165 ****
  2003-08-20: onsight
    * Tagged version r0_3_4, starting version 0.3.5
- 
--- 172,173 ----

[Csp-commits] APPLICATIONS/CSPSim/Include ObjectModel.h,1.14,1.15

From: <de...@us...> - 2003-12-21 10:21:19

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv27870

Modified Files:
	ObjectModel.h 
Log Message:
no message

Index: ObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/ObjectModel.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ObjectModel.h	20 Oct 2003 00:23:22 -0000	1.14
--- ObjectModel.h	21 Dec 2003 10:21:16 -0000	1.15
***************
*** 139,144 ****
  	enum { CONTACT_MARKERS };
  
- 	bool m_MarkersVisible;
- 
  private:
  	osg::ref_ptr<osg::Group> m_GearSprites;
--- 139,142 ----

[Csp-commits] APPLICATIONS/CSPSim/Source ObjectModel.cpp,1.23,1.24

From: <de...@us...> - 2003-12-21 10:21:06

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

Modified Files:
	ObjectModel.cpp 
Log Message:
no message

Index: ObjectModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ObjectModel.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ObjectModel.cpp	20 Oct 2003 00:23:23 -0000	1.23
--- ObjectModel.cpp	21 Dec 2003 10:21:03 -0000	1.24
***************
*** 35,38 ****
--- 35,39 ----
  #include <osgDB/Registry>
  #include <osgDB/ReadFile>
+ #include <osgFX/SpecularHighlights>
  #include <osgUtil/SmoothingVisitor>
  #include <osgUtil/DisplayListVisitor>
***************
*** 179,183 ****
  	m_PolygonOffset = 0.0;
  	m_CullFace = -1;
- 	m_MarkersVisible = true;
  }
  
--- 180,183 ----
***************
*** 387,390 ****
--- 387,392 ----
  		m_ContactMarkers->addChild(diamond);
  	}
+ 	// set markers visible by default
+ 	m_ContactMarkers->setNodeMask(0x1);
  	m_DebugMarkers->addChild(m_ContactMarkers.get());
  }
***************
*** 547,554 ****
  void ObjectModel::showContactMarkers(bool on) {
  	if (on) 
! 		m_DebugMarkers->setAllChildrenOn();
  	else
! 		m_DebugMarkers->setAllChildrenOff();
! 	m_MarkersVisible = on;
  }
  
--- 549,555 ----
  void ObjectModel::showContactMarkers(bool on) {
  	if (on) 
! 		m_ContactMarkers->setNodeMask(0x1);
  	else
! 		m_ContactMarkers->setNodeMask(0x0);
  }
  
***************
*** 562,566 ****
  
  bool ObjectModel::getMarkersVisible() const {
! 	return m_MarkersVisible;
  }
  
--- 563,567 ----
  
  bool ObjectModel::getMarkersVisible() const {
! 	return (m_ContactMarkers->getNodeMask() != 0x0);
  }
  
***************
*** 604,607 ****
--- 605,617 ----
  };
  
+ 
+ osg::Node *addEffect(osg::Node *model_node) {
+ 	// add an osgFX effect
+ 	osgFX::SpecularHighlights* effect = new osgFX::SpecularHighlights;
+ 	effect->setTextureUnit(1);
+ 	effect->addChild(model_node);
+ 	return effect;
+ }
+ 
  SceneModel::SceneModel(simdata::Ref<ObjectModel> const & model) {
  	m_Model = model;
***************
*** 615,619 ****
  	// create a working copy
  	ModelCopy model_copy;
! 	model_node = model_copy(model_node);
  
  	std::cout << "MODEL COPIED\n";
--- 625,630 ----
  	// create a working copy
  	ModelCopy model_copy;
! 	//model_node = model_copy(model_node);
! 	model_node = model_copy(addEffect(model_node));
  
  	std::cout << "MODEL COPIED\n";
***************
*** 685,691 ****
  		return true;
  	else {
! 		size_t n = m_SmokeEmitterLocation.size();
! 		if (n>0) {
! 			for (size_t i = 0; i <n; ++i) {
  				fx::SmokeTrail *trail = new fx::SmokeTrail();
  				trail->setEnabled(false);
--- 696,702 ----
  		return true;
  	else {
! 		if (!m_SmokeEmitterLocation.empty()) {
! 			std::vector<simdata::Vector3>::const_iterator iEnd = m_SmokeEmitterLocation.end(); 
! 			for (std::vector<simdata::Vector3>::iterator i = m_SmokeEmitterLocation.begin(); i != iEnd; ++i) {
  				fx::SmokeTrail *trail = new fx::SmokeTrail();
  				trail->setEnabled(false);
***************
*** 698,702 ****
  				trail->addOperator(new fx::SmokeThinner);
  
! 				trail->setOffset(m_SmokeEmitterLocation[i]);
  
  				m_SmokeTrails = new fx::SmokeTrailSystem;
--- 709,713 ----
  				trail->addOperator(new fx::SmokeThinner);
  
! 				trail->setOffset(*i);
  
  				m_SmokeTrails = new fx::SmokeTrailSystem;
***************
*** 724,729 ****
--- 735,742 ----
  void SceneModel::enableSmoke()
  {
+ 	CSP_LOG(OBJECT, DEBUG, "SceneModel::enableSmoke()...");
  	if (!m_Smoke) {
  		if (!addSmoke()) return;
+ 		CSP_LOG(OBJECT, DEBUG, "SceneModel::enableSmoke()");
  		m_SmokeTrails->setEnabled(true);
  		m_Smoke = true;

[Csp-commits] APPLICATIONS/CSPSim/Source Sky.cpp,1.22,1.23

From: <de...@us...> - 2003-12-21 09:56:03

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

Modified Files:
	Sky.cpp 
Log Message:
Fixed stars at daytime on windows

Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Sky.cpp	20 Oct 2003 00:23:23 -0000	1.22
--- Sky.cpp	21 Dec 2003 09:56:00 -0000	1.23
***************
*** 256,261 ****
  		glRotatef(rx, 1, 0, 0);
  		glRotatef(rz, 0, 0, 1);
! 		glBegin(GL_POINTS);
  		glEnable(GL_BLEND);
  		for (; --i >= 0; ++c, ++p) {
  			glColor4f(c->x(), c->y(), c->z(), c->w()*alpha);
--- 256,263 ----
  		glRotatef(rx, 1, 0, 0);
  		glRotatef(rz, 0, 0, 1);
! 
  		glEnable(GL_BLEND);
+ 
+ 		glBegin(GL_POINTS);
  		for (; --i >= 0; ++c, ++p) {
  			glColor4f(c->x(), c->y(), c->z(), c->w()*alpha);

[Csp-commits] APPLICATIONS/CSPSim/Include/Systems AircraftSimpleFCS.h,1.3,1.4

From: <de...@us...> - 2003-12-20 18:17:18

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems
In directory sc8-pr-cvs1:/tmp/cvs-serv29610

Modified Files:
	AircraftSimpleFCS.h 
Log Message:
no message

Index: AircraftSimpleFCS.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems/AircraftSimpleFCS.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AircraftSimpleFCS.h	20 Oct 2003 01:27:10 -0000	1.3
--- AircraftSimpleFCS.h	20 Dec 2003 18:17:15 -0000	1.4
***************
*** 27,33 ****
  #define __AIRCRAFTSIMPLEFCS_H__
  
  #include <System.h>
  #include <Log.h>
- 
  
  
--- 27,35 ----
  #define __AIRCRAFTSIMPLEFCS_H__
  
+ #include <algorithm>
+ #include <cmath>
+ 
  #include <System.h>
  #include <Log.h>

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/VisualStudio VisualStudio.vcproj,1.2,1.3

From: <de...@us...> - 2003-12-06 16:09:19

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv28746

Modified Files:
	VisualStudio.vcproj 
Log Message:
no message

Index: VisualStudio.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio/VisualStudio.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VisualStudio.vcproj	6 Dec 2003 15:51:55 -0000	1.2
--- VisualStudio.vcproj	6 Dec 2003 16:09:16 -0000	1.3
***************
*** 16,21 ****
  			IntermediateDirectory="Debug"
  			ConfigurationType="2"
! 			CharacterSet="2"
! 			ManagedExtensions="TRUE">
  			<Tool
  				Name="VCCLCompilerTool"
--- 16,21 ----
  			IntermediateDirectory="Debug"
  			ConfigurationType="2"
! 			CharacterSet="0"
! 			ManagedExtensions="FALSE">
  			<Tool
  				Name="VCCLCompilerTool"
***************
*** 37,41 ****
  				LinkIncremental="2"
  				AdditionalLibraryDirectories="..\..\lib"
! 				IgnoreDefaultLibraryNames="msvcrtd.lib"
  				GenerateDebugInformation="TRUE"
  				ImportLibrary="..\..\lib\osgChunkLodd.lib"/>
--- 37,41 ----
  				LinkIncremental="2"
  				AdditionalLibraryDirectories="..\..\lib"
! 				IgnoreDefaultLibraryNames="libc"
  				GenerateDebugInformation="TRUE"
  				ImportLibrary="..\..\lib\osgChunkLodd.lib"/>
***************
*** 67,71 ****
  			ConfigurationType="2"
  			CharacterSet="2"
! 			ManagedExtensions="TRUE">
  			<Tool
  				Name="VCCLCompilerTool"
--- 67,71 ----
  			ConfigurationType="2"
  			CharacterSet="2"
! 			ManagedExtensions="FALSE">
  			<Tool
  				Name="VCCLCompilerTool"
***************
*** 73,79 ****
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\..\include;..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG;OSGCHUNKLOD_LIBRARY"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="2"
  				RuntimeTypeInfo="TRUE"
  				WarningLevel="3"/>
--- 73,80 ----
  				InlineFunctionExpansion="1"
  				AdditionalIncludeDirectories="..\..\include;..\include"
! 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;OSGCHUNKLOD_LIBRARY"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="2"
+ 				BufferSecurityCheck="FALSE"
  				RuntimeTypeInfo="TRUE"
  				WarningLevel="3"/>
***************
*** 86,90 ****
  				LinkIncremental="1"
  				AdditionalLibraryDirectories="..\..\lib"
! 				IgnoreDefaultLibraryNames="msvcrt.lib"
  				GenerateDebugInformation="TRUE"
  				ImportLibrary="..\..\lib\osgChunkLod.lib"/>
--- 87,91 ----
  				LinkIncremental="1"
  				AdditionalLibraryDirectories="..\..\lib"
! 				IgnoreDefaultLibraryNames="libc"
  				GenerateDebugInformation="TRUE"
  				ImportLibrary="..\..\lib\osgChunkLod.lib"/>

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod RayStrip.cpp,1.1,1.2

From: <de...@us...> - 2003-12-06 15:51:58

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod
In directory sc8-pr-cvs1:/tmp/cvs-serv25811/src/osgChunkLod

Modified Files:
	RayStrip.cpp 
Log Message:
Updated sln for msvc 7.1

Index: RayStrip.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/src/osgChunkLod/RayStrip.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RayStrip.cpp	19 Jun 2003 17:42:57 -0000	1.1
--- RayStrip.cpp	6 Dec 2003 15:51:55 -0000	1.2
***************
*** 69,73 ****
  			std::cout << n_indices << " " << start << " " << i << "\n";
  		}
! 		if (watchdog < 0 && fabs(start - i) < 10) {
  			std::cout << i << " " << start << "\n";
  		}
--- 69,73 ----
  			std::cout << n_indices << " " << start << " " << i << "\n";
  		}
! 		if (watchdog < 0 && abs(start - i) < 10) {
  			std::cout << i << " " << start << "\n";
  		}

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod MultiTextureDetails,1.1,1.2 RayStrip,1.1,1.2

From: <de...@us...> - 2003-12-06 15:51:58

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod
In directory sc8-pr-cvs1:/tmp/cvs-serv25811/include/osgChunkLod

Modified Files:
	MultiTextureDetails RayStrip 
Log Message:
Updated sln for msvc 7.1

Index: MultiTextureDetails
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod/MultiTextureDetails,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MultiTextureDetails	19 Jun 2003 17:41:10 -0000	1.1
--- MultiTextureDetails	6 Dec 2003 15:51:55 -0000	1.2
***************
*** 30,33 ****
--- 30,48 ----
  #include <string>
  
+ #ifndef GL_MAX_TEXTURE_UNITS_ARB	
+ #define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+ #endif
+ 
+ #ifndef GL_COMBINE_RGB_EXT
+ #define GL_COMBINE_RGB_EXT                0x8571
+ #endif
+ 
+ /*
+ #ifndef GL_VERSION_1_3 
+ #include <GL/glext.h>
+ #endif
+ */
+ 
+ 
  namespace osgChunkLod {
  

Index: RayStrip
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/include/osgChunkLod/RayStrip,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RayStrip	19 Jun 2003 17:41:10 -0000	1.1
--- RayStrip	6 Dec 2003 15:51:55 -0000	1.2
***************
*** 37,41 ****
  
  	struct ChunkLodVertex;
! 	struct ChunkLodElevationTest;
  
  	/**
--- 37,41 ----
  
  	struct ChunkLodVertex;
! 	class ChunkLodElevationTest;
  
  	/**

[Csp-commits] THIRDPARTYLIBS/CSPChunkLod/VisualStudio VisualStudio.sln,1.1,1.2 VisualStudio.vcproj,1.1,1.2

From: <de...@us...> - 2003-12-06 15:51:58

Update of /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv25811/VisualStudio

Modified Files:
	VisualStudio.sln VisualStudio.vcproj 
Log Message:
Updated sln for msvc 7.1

Index: VisualStudio.sln
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio/VisualStudio.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VisualStudio.sln	28 Jun 2003 10:24:18 -0000	1.1
--- VisualStudio.sln	6 Dec 2003 15:51:55 -0000	1.2
***************
*** 1,11 ****
! Microsoft Visual Studio Solution File, Format Version 7.00
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualStudio", "VisualStudio.vcproj", "{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
  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}") = "osgChunkLod", "VisualStudio.vcproj", "{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
! 	ProjectSection(ProjectDependencies) = postProject
! 	EndProjectSection
  EndProject
  Global
  	GlobalSection(SolutionConfiguration) = preSolution
! 		Debug = Debug
! 		Release = Release
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution

Index: VisualStudio.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/CSPChunkLod/VisualStudio/VisualStudio.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VisualStudio.vcproj	28 Jun 2003 10:24:18 -0000	1.1
--- VisualStudio.vcproj	6 Dec 2003 15:51:55 -0000	1.2
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.00"
  	Name="osgChunkLod"
  	ProjectGUID="{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
! 	Version="7.10"
  	Name="osgChunkLod"
  	ProjectGUID="{439CBFDC-A6BC-4AE6-9A40-B706C4146C1A}"
***************
*** 53,57 ****
--- 53,63 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  		<Configuration
***************
*** 96,102 ****
--- 102,116 ----
  				Name="VCWebServiceProxyGeneratorTool"/>
  			<Tool
+ 				Name="VCXMLDataGeneratorTool"/>
+ 			<Tool
  				Name="VCWebDeploymentTool"/>
+ 			<Tool
+ 				Name="VCManagedWrapperGeneratorTool"/>
+ 			<Tool
+ 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  		</Configuration>
  	</Configurations>
+ 	<References>
+ 	</References>
  	<Files>
  		<Filter

[Csp-commits] THIRDPARTYLIBS/demeter Terrain.cpp,1.10,1.11

From: <de...@us...> - 2003-12-06 09:26:54

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

Modified Files:
	Terrain.cpp 
Log Message:
no message

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Terrain.cpp	6 Dec 2003 00:34:08 -0000	1.10
--- Terrain.cpp	6 Dec 2003 09:26:51 -0000	1.11
***************
*** 27,31 ****
  #ifdef _WIN32
      #include <crtdbg.h>
- 	#include <cmath>
  #endif
  
--- 27,30 ----

[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

From: <de...@us...> - 2003-12-06 00:34:12

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++)

[Csp-commits] Fwd: Re: Combat Simulator Project (CSP)

From: <han...@gm...> - 2003-11-27 08:11:06

I asked Cole from Global Conflict Blue (GCB) http://gcblue.sourceforge.net/=
=20

With kind regards!

Dust

Ps: I know I=B4m not a developer, so please feel free to contact GCB direct.=
 Dewitt "Cole" Colclough=
 <mailto:dew...@gl...>de...@tw... (or=
 dew...@gl... ?) ICQ:=
 <http://web.icq.com/whitepages/add_me?uin=3D17723806&action=3Dadd>17723806<=
http://web.icq.com/whitepages/message_me?uin=3D17723806&action=3Dmessage>=20


>X-Flags: 0000
>Delivered-To: GMX delivery to han...@gm...
>From: "Dewitt Cole" <dew...@gl...>
>To: <han...@gm...>
>Cc: "Dewitt" <de...@tw...>
>Subject: Re: Combat Simulator Project  (CSP)
>Date: Wed, 26 Nov 2003 19:50:42 -0500
>
>
>Very nice to hear from you. I took a quick look at the CSP project, and it
>looks great so far.
>
>I definitely think there are ways we could collaborate. It would be great=
 to
>allow the player to jump from platform to platform within a large sim. This
>idea is kind of the "holy grail" of combat sims.
>
>At a minimum we could leverage your graphics code to improve my graphics
>engine and leverage your flight dynamics code to improve my aircraft  :)=
 And
>I could help you guys out with sensor modeling or some other area that=
 makes
>sense. I work as an airborne radar and EW engineer.
>
>I'd like to chat more with you on this. Maybe try me again on ICQ or send=
 me
>your ICQ number and I will try you?  I'll be on tonight and then gone for
>the rest of the week.
>
>Dewitt
>
>----- Original Message -----=20
>From: <han...@gm...>
>To: <dew...@gl...>
>Sent: Wednesday, November 26, 2003 7:09 PM
>Subject: Combat Simulator Project (CSP)
>
>
>Hi!
>
>I think my ICQ message didn=B4t reach you, so I=B4m trying the mail.
>
>I just found your project Global Conflict Blue (GCB). Looks VERY promising.
>
>As you said in on your homepage you are looking for colaboration.
>
>Maybe you know Combat Simulator Project  (CSP) http://csp.sourceforge.net/
>
>Check it out, it=B4s under GPL and uses OpenSceneGraph too.
>
>By the way, do you think it=B4s possible to connect the two? For example,=
 if
>you have an radar contact to jump into the jet and fly it?
>
>With best regards!

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.14,1.15

From: <mk...@us...> - 2003-11-02 21:11:22

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

Modified Files:
	InterfaceRegistry.cpp 
Log Message:


Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InterfaceRegistry.cpp	24 Oct 2003 06:44:13 -0000	1.14
--- InterfaceRegistry.cpp	2 Nov 2003 21:11:19 -0000	1.15
***************
*** 39,42 ****
--- 39,43 ----
  #include <string>
  #include <vector>
+ #include <algorithm>
  
  using std::cout;

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.92,1.93

From: <mk...@us...> - 2003-11-02 21:11:22

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv27457

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** CHANGES.current	1 Nov 2003 16:08:40 -0000	1.92
--- CHANGES.current	2 Nov 2003 21:11:19 -0000	1.93
***************
*** 1,4 ****
--- 1,8 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-11-02: onsight
+   * Added #include <algorithm> in InterfaceRegistry.cpp (as 
+     suggested by delta).
+ 
  2003-11-01: onsight
    * Some tweaking of the Scons scripts.  Added a platform-specific

Flat | Threaded

<< < 1 .. 67 68 69 70 71 .. 115 > >> (Page 69 of 115)