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

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 .. 99 100 101 102 103 .. 115 > >> (Page 101 of 115)

[Csp-commits] APPLICATIONS/CSPSim/Tools/HID GameScreen.map,1.5,1.6

From: <mk...@us...> - 2003-03-22 18:02:00

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

Modified Files:
	GameScreen.map 
Log Message:


Index: GameScreen.map
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID/GameScreen.map,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameScreen.map	21 Feb 2003 08:00:42 -0000	1.5
--- GameScreen.map	22 Mar 2003 18:01:56 -0000	1.6
***************
*** 33,36 ****
--- 33,37 ----
  map key:p		press		PAUSE
  map key:F12             press           STATS
+ map key:HOME		press		CONSOLE
  map key:SPACE		press		CHANGE_VEHICLE
  map key:KP_MINUS	press		CAMERA_ZOOM_OUT

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.vcproj,1.1,1.2

From: <de...@us...> - 2003-03-22 16:08:05

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

Modified Files:
	CSPSimDLL.vcproj 
Log Message:
no message

Index: CSPSimDLL.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CSPSimDLL.vcproj	22 Mar 2003 02:26:12 -0000	1.1
--- CSPSimDLL.vcproj	22 Mar 2003 16:08:02 -0000	1.2
***************
*** 83,87 ****
  				Name="VCCLCompilerTool"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="../../Include,../../../SimData/Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include,../../SimData/include"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS;_STLP_USE_OWN_NAMESPACE"
  				StringPooling="TRUE"
--- 83,87 ----
  				Name="VCCLCompilerTool"
  				InlineFunctionExpansion="1"
! 				AdditionalIncludeDirectories="../../Include,C:/Python22/include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSPSIMDLL_EXPORTS;_STLP_USE_OWN_NAMESPACE"
  				StringPooling="TRUE"
***************
*** 105,109 ****
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python22/libs"
  				ImportLibrary=".\Release/_CSP.lib"/>
  			<Tool
--- 105,109 ----
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="../../../../THIRDPARTYLIBS/lib,C:/Python22/libs,C:/Python22/Lib/site-packages/SimData"
  				ImportLibrary=".\Release/_CSP.lib"/>
  			<Tool

[Csp-commits] APPLICATIONS/SimData/Include/SimData ObjectInterface.h,1.9,1.10

From: <de...@us...> - 2003-03-22 15:21:08

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

Modified Files:
	ObjectInterface.h 
Log Message:
no message

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ObjectInterface.h	22 Mar 2003 00:40:26 -0000	1.9
--- ObjectInterface.h	22 Mar 2003 15:21:04 -0000	1.10
***************
*** 65,69 ****
   */
  
! #ifdef _WIN32 
  	#define __PTS_SIM__
  #endif
--- 65,69 ----
   */
  
! #if defined(_MSC_VER) && (_MSC_VER <= 1300)
  	#define __PTS_SIM__
  #endif
***************
*** 194,198 ****
  		}
  	}
! 	virtual void unpack(Object *, UnPacker &p) {
  		C * object = dynamic_cast<C *>(o);
  		T &m = object->*member;
--- 194,198 ----
  		}
  	}
! 	virtual void unpack(Object *o, UnPacker &p) {
  		C * object = dynamic_cast<C *>(o);
  		T &m = object->*member;

[Csp-commits] APPLICATIONS/SimData setup.py,1.8,1.9 CHANGES.current,1.10,1.11

From: <de...@us...> - 2003-03-22 15:20:48

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

Modified Files:
	setup.py CHANGES.current 
Log Message:
no message

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** setup.py	22 Mar 2003 07:42:32 -0000	1.8
--- setup.py	22 Mar 2003 15:20:44 -0000	1.9
***************
*** 76,81 ****
  	if win:
  		package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib'])
! 		src = os.path.join("Source","cSimData.py")
  		if os.path.exists(src):
  			copy_file(src, os.path.join("SimData","cSimData.py"))
  	else:
--- 76,82 ----
  	if win:
  		package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib'])
! 		src = os.path.join("VisualStudio","cSimData.py")
  		if os.path.exists(src):
+ 			from distutils.file_util import copy_file
  			copy_file(src, os.path.join("SimData","cSimData.py"))
  	else:

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CHANGES.current	22 Mar 2003 07:42:32 -0000	1.10
--- CHANGES.current	22 Mar 2003 15:20:44 -0000	1.11
***************
*** 1,4 ****
--- 1,8 ----
  Version 0.3.1 (in progress)
  ===========================
+ 
+ 2003-03-22: delta
+ 	    Minor changes to setup.py under make_install_win
+ 
  2003-03-21: onsight
              Moved Python include path setting to the main Makefile.

[Csp-commits] APPLICATIONS/SimData Makefile,1.7,1.8

From: <mk...@us...> - 2003-03-22 13:00:52

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

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	22 Mar 2003 07:42:32 -0000	1.7
--- Makefile	22 Mar 2003 13:00:49 -0000	1.8
***************
*** 19,23 ****
  
  default: 
! 	@python setup.py version
  	@for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
--- 19,23 ----
  
  default: 
! 	@python setup.py check_version
  	@for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
***************
*** 25,28 ****
  
  install:
! 	@python setup.py version
  	@python setup.py make_install
--- 25,28 ----
  
  install:
! 	@python setup.py check_version
  	@python setup.py make_install

[Csp-commits] APPLICATIONS/CSPSim/Source ScreenInfo.cpp,1.5,1.6

From: <mk...@us...> - 2003-03-22 12:47:23

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

Modified Files:
	ScreenInfo.cpp 
Log Message:
min max fps reset

Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScreenInfo.cpp	22 Mar 2003 02:24:58 -0000	1.5
--- ScreenInfo.cpp	22 Mar 2003 12:47:20 -0000	1.6
***************
*** 67,72 ****
  {
  	float fps = CSPSim::theSim->getFrameRate();
! 	m_minFps = min(m_minFps,fps)+0.01;
! 	m_maxFps = max(m_maxFps,fps)-0.01;
  	std::ostringstream osstr;
  	osstr << setprecision(1) << fixed << fps << " FPS min: " << m_minFps << " max: " << m_maxFps;
--- 67,78 ----
  {
  	float fps = CSPSim::theSim->getFrameRate();
! 	static int i = 0;
! 	if (i++ >= 1000) { // reset occasionally
! 		m_minFps = 100.0;
! 		m_maxFps = 0.0;
! 		i = 0;
! 	}
! 	m_minFps = min(m_minFps,fps);
! 	m_maxFps = max(m_maxFps,fps);
  	std::ostringstream osstr;
  	osstr << setprecision(1) << fixed << fps << " FPS min: " << m_minFps << " max: " << m_maxFps;

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

From: <mk...@us...> - 2003-03-22 12:43:02

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

Modified Files:
	CSPSim.cpp 
Log Message:
added mute option to ini

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CSPSim.cpp	22 Mar 2003 12:38:27 -0000	1.13
--- CSPSim.cpp	22 Mar 2003 12:42:59 -0000	1.14
***************
*** 569,573 ****
  		::exit(2);
  	}
! 	SDL_PauseAudio(1);
  
  	return 0;
--- 569,574 ----
  		::exit(2);
  	}
! 	bool mute = g_Config.getBool("Testing", "Mute", false, true);
! 	SDL_PauseAudio(mute);
  
  	return 0;

[Csp-commits] APPLICATIONS/CSPSim/Include AeroDynamics.h,1.5,1.6 Atmosphere.h,1.1,1.2

From: <mk...@us...> - 2003-03-22 12:38:59

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

Modified Files:
	AeroDynamics.h Atmosphere.h 
Log Message:


Index: AeroDynamics.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/AeroDynamics.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AeroDynamics.h	21 Mar 2003 20:08:28 -0000	1.5
--- AeroDynamics.h	22 Mar 2003 12:38:56 -0000	1.6
***************
*** 300,303 ****
--- 300,304 ----
  	simdata::Quaternion *m_Orientation;
  
+ 	double m_Distance;
  	double m_AirSpeed;
  	double m_Mass;

Index: Atmosphere.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Atmosphere.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Atmosphere.h	21 Mar 2003 20:08:31 -0000	1.1
--- Atmosphere.h	22 Mar 2003 12:38:56 -0000	1.2
***************
*** 59,65 ****
  	double m_GroundDensity;
  	double m_TimeScale;
- 	double m_UpdateTime;
  	double m_WindIndex;
  	double m_WindScale;
  	int m_UpdateIndex;
  	simdata::SimDate m_Date;
--- 59,66 ----
  	double m_GroundDensity;
  	double m_TimeScale;
  	double m_WindIndex;
  	double m_WindScale;
+ 	double m_FastUpdate;
+ 	double m_UpdateTime;
  	int m_UpdateIndex;
  	simdata::SimDate m_Date;
***************
*** 72,76 ****
  	std::vector<float> m_WindAltX;
  	std::vector<float> m_WindAltY;
! 	std::vector<float> m_WindGust;
  	std::vector<float> m_DensityTime;
  	std::vector<float> m_TurbulenceAltA;
--- 73,77 ----
  	std::vector<float> m_WindAltX;
  	std::vector<float> m_WindAltY;
! 	std::vector<float> m_GustTime;
  	std::vector<float> m_DensityTime;
  	std::vector<float> m_TurbulenceAltA;
***************
*** 79,82 ****
--- 80,84 ----
  	bool m_TurbulenceBlendUp;
  	double m_GustModulation;
+ 	int m_GustIndex;
  };

[Csp-commits] APPLICATIONS/CSPSim/Source AeroDynamics.cpp,1.8,1.9 Atmosphere.cpp,1.1,1.2 CSPSim.cpp,1.12,1.13

From: <mk...@us...> - 2003-03-22 12:38:30

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

Modified Files:
	AeroDynamics.cpp Atmosphere.cpp CSPSim.cpp 
Log Message:



Index: AeroDynamics.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AeroDynamics.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AeroDynamics.cpp	22 Mar 2003 02:24:58 -0000	1.8
--- AeroDynamics.cpp	22 Mar 2003 12:38:27 -0000	1.9
***************
*** 57,60 ****
--- 57,62 ----
  	m_Contacts = 0;
  	m_Bound = false;
+ 	m_Distance = 0.0;
+ 	m_AirSpeed = 0.0;
  	initialize();
  }
***************
*** 367,373 ****
  	double qBarFactor  = 0.5 * m_WingArea;
  
  	Atmosphere const *atmosphere = CSPSim::theSim->getAtmosphere();
  	if (atmosphere != NULL) {
! 		qBarFactor *= atmosphere->getDensity(m_PositionLocal.z);
  		m_Gravity = atmosphere->getGravity(m_PositionLocal.z);
  		Wind = atmosphere->getWind(m_PositionLocal);
--- 369,379 ----
  	double qBarFactor  = 0.5 * m_WingArea;
  
+ 	m_Distance += m_AirSpeed;
+ 
  	Atmosphere const *atmosphere = CSPSim::theSim->getAtmosphere();
  	if (atmosphere != NULL) {
! 		double density = atmosphere->getDensity(m_PositionLocal.z);
! 		density += atmosphere->getTurbulence(m_PositionLocal, m_Distance);
! 		qBarFactor *= density;
  		m_Gravity = atmosphere->getGravity(m_PositionLocal.z);
  		Wind = atmosphere->getWind(m_PositionLocal);

Index: Atmosphere.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Atmosphere.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Atmosphere.cpp	21 Mar 2003 20:07:55 -0000	1.1
--- Atmosphere.cpp	22 Mar 2003 12:38:27 -0000	1.2
***************
*** 124,127 ****
--- 124,128 ----
  	generateWinds();
  	m_Latitude = 0.0;
+ 	m_FastUpdate = 0.0;
  	m_UpdateTime = 0.0;
  	m_UpdateIndex = 0;
***************
*** 135,138 ****
--- 136,140 ----
  	m_TurbulenceBlendUp = true;
  	m_GustModulation = 1.0;
+ 	m_GustIndex = 0;
  	reset();
  }
***************
*** 174,183 ****
  	noise.set(0.9, 5);
  	noise.randomize();
! 	m_WindGust = noise.generate(1000, true, 1.0);
  }
  
  simdata::Vector3 Atmosphere::getWind(simdata::Vector3 const &p) const {
- 	return simdata::Vector3::ZERO;
- /*  DISABLE FOR THE MOMENT
  	simdata::Vector3 wind = m_AverageWind;
  	double h = p.z * 0.0033;
--- 176,183 ----
  	noise.set(0.9, 5);
  	noise.randomize();
! 	m_GustTime = noise.generate(1000, true, 60.0, 3.0);
  }
  
  simdata::Vector3 Atmosphere::getWind(simdata::Vector3 const &p) const {
  	simdata::Vector3 wind = m_AverageWind;
  	double h = p.z * 0.0033;
***************
*** 195,204 ****
  	wind.y += m_WindAltY[idx]*(1.0-f) + m_WindAltY[idx+1]*f;
  	return wind * m_WindScale * m_GustModulation;
- */
  }
  
  double Atmosphere::getTurbulence(simdata::Vector3 const &p, double dist) const {
! 	// XXX to write...
! 	return 0.0;
  }
  
--- 195,221 ----
  	wind.y += m_WindAltY[idx]*(1.0-f) + m_WindAltY[idx+1]*f;
  	return wind * m_WindScale * m_GustModulation;
  }
  
  double Atmosphere::getTurbulence(simdata::Vector3 const &p, double dist) const {
! 	if (dist < 0.0) dist = - dist;
! 	int idx = int(dist * 0.1) % 1000;
! 	float d = m_DensityTime[idx];
! 	idx = int(p.z * 1000.0 / 15000.0);
! 	if (idx < 0) idx = 0;
! 	else if (idx > 999) idx = 999;
! 	float a = m_TurbulenceAltA[idx];
! 	float b = m_TurbulenceAltB[idx];
! 	if (a < 0.0) a = 0.0;
! 	if (b < 0.0) b = 0.0;
! 	a = a * (1.0 - m_TurbulenceBlend) + b * m_TurbulenceBlend;
! 	/*
! 	static int i = 0;
! 	if ((i++ % 40) == 0) {
! 		std::cout << a << ":" << d << "\n";
! 	}
! 	*/
! 	// first try didn't show much effect.  * 30 does something, but hard to notice.
! 	// * 100 is too much.  need to tune...
! 	return a * d * 30.0;
  }
  
***************
*** 212,215 ****
--- 229,237 ----
  }
  
+ /**
+  * Air temperature versus altitude.
+  *
+  * From 1976 Standard Atmosphere, below 32000 m
+  */
  double Atmosphere::getTemperature(double h) const {
  	double scale;
***************
*** 220,223 ****
--- 242,246 ----
  		scale = 0.751865;
  	} else {
+ 		if (h > 32000.0) h = 32000.0;
    		scale = 0.682357 + h * .00000347058;
  	}
***************
*** 225,228 ****
--- 248,256 ----
  }
  
+ /**
+  * Air pressure versus altitude.
+  *
+  * From 1976 Standard Atmosphere, below 32000 m
+  */
  double Atmosphere::getPressure(double h) const {
  	double scale;
***************
*** 233,236 ****
--- 261,265 ----
         		scale = 0.223361 * exp((10999.0-h)*0.000157694);
  	} else {
+ 		if (h > 32000.0) h = 32000.0;
  		scale = pow(0.988626 + h * 0.00000502758, -34.16319);
  	}
***************
*** 238,241 ****
--- 267,276 ----
  }
  
+ 
+ /**
+  * Air density versus altitude.
+  *
+  * From 1976 Standard Atmosphere, below 32000 m
+  */
  double Atmosphere::getDensity(double h) const {
  	double scale;
***************
*** 246,249 ****
--- 281,285 ----
  		scale = 0.297076 * exp( (10999.0 - h) * 0.000157694);
  	} else {
+ 		if (h > 32000.0) h = 32000.0;
  		scale = pow(0.978261 + h * 0.00000497488, -35.16319);
  	}
***************
*** 257,263 ****
   */
  void Atmosphere::update(double dt) {
  	if (m_UpdateIndex == 0) reset();
! 	m_Date.addTime(dt);
  	m_UpdateTime += dt;
  	m_WindIndex += dt;
  	m_WindScale = 0.1 * fabs(m_GroundPressure - m_TargetPressure);
--- 293,308 ----
   */
  void Atmosphere::update(double dt) {
+ 	m_FastUpdate += dt;
+ 	float gust = m_GustTime[m_GustIndex%1000];
+ 	if (gust < 0.0) gust = 0.0;
+ 	m_GustModulation = 1.0 + gust;
+ 	m_GustIndex++;
+ 	//std::cout << getWind(simdata::Vector3::ZERO) << m_GustModulation << std:: endl;
+ 	if (m_FastUpdate < 3.0) return;
  	if (m_UpdateIndex == 0) reset();
! 	dt = m_FastUpdate;
! 	m_FastUpdate = 0.0;
  	m_UpdateTime += dt;
+ 	m_Date.addTime(dt);
  	m_WindIndex += dt;
  	m_WindScale = 0.1 * fabs(m_GroundPressure - m_TargetPressure);
***************
*** 276,279 ****
--- 321,346 ----
  		m_UpdateTime = 0.0;
  	}
+ 	if (m_TurbulenceBlendUp) {
+ 		m_TurbulenceBlend += dt * 0.0003;
+ 		if (m_TurbulenceBlend > 1.0) {
+ 			Perlin1D noise;
+ 			noise.set(0.9, 6);
+ 			noise.randomize();
+ 			m_TurbulenceBlend = 1.0;
+ 			m_TurbulenceBlendUp = false;
+ 			m_TurbulenceAltA = noise.generate(1000, false, 10.0, 2.0, -1.0);
+ 		}
+ 	} else {
+ 		m_TurbulenceBlend += dt * 0.0003;
+ 		if (m_TurbulenceBlend < 0.0) {
+ 			Perlin1D noise;
+ 			noise.set(0.9, 6);
+ 			noise.randomize();
+ 			m_TurbulenceBlend = 0.0;
+ 			m_TurbulenceBlendUp = true;
+ 			m_TurbulenceAltB = noise.generate(1000, false, 10.0, 2.0, -1.0);
+ 		}
+ 	}
+ 
  	/*
  	std::cout << "==========================" << std:: endl;
***************
*** 321,324 ****
--- 388,394 ----
  	m_GroundDensity = m_GroundPressure / (286.9 * m_GroundTemperature);
  	m_AverageWind = m_TargetWind;
+ 	_update();
+ 	_update();
+ 	_update();
  }
  

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CSPSim.cpp	22 Mar 2003 02:24:58 -0000	1.12
--- CSPSim.cpp	22 Mar 2003 12:38:27 -0000	1.13
***************
*** 369,373 ****
  			// Miscellaneous Updates
  			low_priority += dt;
! 			if (low_priority > 1.0) {
  				switch (idx++) {
  					case 0:
--- 369,373 ----
  			// Miscellaneous Updates
  			low_priority += dt;
! 			if (low_priority > 0.33) {
  				switch (idx++) {
  					case 0:
***************
*** 554,557 ****
--- 554,558 ----
  	SDL_EnableUNICODE(1);
  
+ 
  	std::string sound_path = g_Config.getPath("Paths", "SoundPath", ".", true);
  	if ( SDL_LoadWAV(ospath::join(sound_path, "avionturbine5.wav").c_str(),
***************
*** 568,572 ****
  		::exit(2);
  	}
! 	SDL_PauseAudio(0);
  
  	return 0;
--- 569,573 ----
  		::exit(2);
  	}
! 	SDL_PauseAudio(1);
  
  	return 0;

[Csp-commits] APPLICATIONS/CSPSim/Source TerrainObject.cpp,1.10,1.11

From: <mk...@us...> - 2003-03-22 11:55:57

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

Modified Files:
	TerrainObject.cpp 
Log Message:
detail texture restored

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TerrainObject.cpp	22 Mar 2003 02:24:58 -0000	1.10
--- TerrainObject.cpp	22 Mar 2003 11:52:41 -0000	1.11
***************
*** 409,413 ****
  	Demeter::Settings::GetInstance()->SetTextureCompression(m_TextureCompression);
  	Demeter::Settings::GetInstance()->SetUseDynamicTextures(m_DynamicTextures);
! 	Demeter::Settings::GetInstance()->SetDetailTextureRepeats(3);
  	Demeter::Settings::GetInstance()->SetUseNormals(true);
  }
--- 409,413 ----
  	Demeter::Settings::GetInstance()->SetTextureCompression(m_TextureCompression);
  	Demeter::Settings::GetInstance()->SetUseDynamicTextures(m_DynamicTextures);
! 	Demeter::Settings::GetInstance()->SetDetailTextureRepeats(32);
  	Demeter::Settings::GetInstance()->SetUseNormals(true);
  }

[Csp-commits] APPLICATIONS/CSPSim configure.win.py,NONE,1.1

From: <mk...@us...> - 2003-03-22 08:39:58

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

Added Files:
	configure.win.py 
Log Message:


--- NEW FILE: configure.win.py ---
# This is a very simplistic setup script for windows.  It should be
# run before building the MSVC project.  Here's what it does:
#
#   checks the python version
#
#   checks that simdata is installed and the version is compatible
#
#   copies _cSimData.lib from the simdata package to the third-party
#   libs directory.


import sys

min_python_version = "2.2.0"
min_simdata_version = "0.3.1"

if len(sys.argv) == 2:
	command = sys.argv[1]
	if command == "check_version":
		old = sys.version[:5] < min_python_version
		if old:
			print
			print "CSPSim requires Python version %s or higher. (current version is %s)" % \
	                    (min_python_version, sys.version[:5])
			print
		sys.exit(old)
		
try:
	import SimData
	if SimData.getVersion() < "0.3.1":
		print
		print "SimData version %s or greater is required, but version %s is installed." % (min_simdata_version, SimData.getVersion())
		print "SimData is available from CVS at http://sourceforge.net/projects/csp"
		print
		sys.exit(1)
except:
	print
	print "Unable to load SimData; please check that it is properly installed."
	print "SimData is available from CVS at http://sourceforge.net/projects/csp"
	print
	sys.exit(1)


from distutils import sysconfig, dir_util
from distutils.file_util import copy_file
from distutils.errors import DistutilsFileError, DistutilsInternalError

#from distutils.dir_util import mkpath
import os, os.path, string

join = os.path.join
dst = join(join(join("..", ".."), "THIRDPARTYLIBS"), "lib")

if not os.path.isdir(dst):
	print
	print "Path '%s' not found.  This path is the default path for third-party libraries" % dst
	print "needed by CSPSim.  You must create this directory before proceeding."
	print
	sys.exit(1)

lib = sysconfig.get_python_lib()
src = join(join(lib, "SimData"), "_cSimData.lib")
dst = join(lib, "_cSimData.lib")
print "%s => %s" % (src, dst)
try:
	copy_file(src, dst)
except:
	print
	print "ERROR: unable to copy file."
	print
	sys.exit(1)
sys.exit(0)

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.5,1.6

From: <mk...@us...> - 2003-03-22 08:39:22

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

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGES.current	22 Mar 2003 08:28:43 -0000	1.5
--- CHANGES.current	22 Mar 2003 08:39:19 -0000	1.6
***************
*** 12,15 ****
--- 12,21 ----
  	    checking and setup to prepare the build under Windows/MSVC.
  
+             Added CSPWin.py, CompileData.py, and RebuildData.py to
+             VisualStuVdio. It should be possible to double-click on these
+             from Windows to launch CSPSim, compile changes to the data, or
+             rebuild the data from scratch. This assumes of course that
+             Python has hooked the .py extension properly.
+ 
  2003-03-21: delta
              CSPSim is back on windows (thx a lot Onsight).

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio CompileData.py,NONE,1.1 CSPWin.py,NONE,1.1 RebuildData.py,NONE,1.1

From: <mk...@us...> - 2003-03-22 08:36:49

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

Added Files:
	CompileData.py CSPWin.py RebuildData.py 
Log Message:
win helpers

--- NEW FILE: CompileData.py ---
import sys
sys.path = ['../Source'] + sys.path

sys.argv.append("--compile-data")

import CSPSim


--- NEW FILE: CSPWin.py ---
import sys
sys.path = ['../Source'] + sys.path

import CSPSim


--- NEW FILE: RebuildData.py ---
import sys
sys.path = ['../Source'] + sys.path

sys.argv.append("--compile-data")
sys.argv.append("--rebuild")

import CSPSim

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.PYTHON,1.5,NONE

From: <mk...@us...> - 2003-03-22 08:32:56

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

Removed Files:
	CSPSim.PYTHON 
Log Message:
renamed CSPSim.PYTHON CSPSim.py

--- CSPSim.PYTHON DELETED ---

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.py,NONE,1.1

From: <mk...@us...> - 2003-03-22 08:32:35

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

Added Files:
	CSPSim.py 
Log Message:
renamed CSPSim.PYTHON CSPSim.py

--- NEW FILE: CSPSim.py ---
#!/usr/bin/python -O

import sys, os.path

# enable lazy loading of shared library modules if available
if hasattr(sys, "setdlopenflags"):
	sys.setdlopenflags(0x101)
	

def printUsage():
	print "Combat Simulator Project - CSPSim"
	print
	print "  Primary options:"
	print "              --compile-data  run the data compiler"
	print "              --config=path   path to config (.ini) file"
	print "              --help          help message"


def runCSPSim(args):
	if len(args):
		print "Unrecognized option '%s'" % args[0]
		print
		printUsage()
		print
		sys.exit(1)
	datapath = CSP.getDataPath()
	dar = os.path.join(datapath, "Sim.dar")
	if not os.path.exists(dar):
		print
		print "Static data archive '%s' not found." % dar
		compileData([])
	import Shell
	app = CSP.CSPSim()
	app.init()
	app.setShell(Shell.Shell())
	app.run()
	app.cleanup()
	print "CSPSim normal exit."


def compileData(args):
	datapath = CSP.getDataPath()
	dar = os.path.join(datapath, "Sim.dar")
	XML = os.path.join(datapath, "XML")
	#print "compile %s %s" % (XML, dar)
	try:
		from SimData.Compile import Compiler, CompilerUsageError
	except:
		print
		print "ERROR: unable to load the SimData data compiler module."
		print
		print "Please verify the SimData has been installed correctly in your Python"
		print "site-local directory.  See the SimData README file for instructions."
		print
		sys.exit(1)
	compiler = Compiler()
	try:
		compiler.parse([""] + args + [XML, dar])
	except CompilerUsageError, e:
		if e.getMessage():
			print e
		printUsage()
		print
		compiler.printUsage()
		print
		sys.exit(1)
	compiler.compileAll()
	print


action = None
config = "../Data/CSPSim.ini"


# process command line options
program = sys.argv[0]
all_args = sys.argv[1:]
other_args = []

for arg in all_args:
	if arg == '--compile-data':
		action = compileData
	elif arg in ("--help", "-h", "-help"):
		if action == None:
			print
			printUsage()
			print
			sys.exit(1)
		else:
			other_args.append(arg)
	elif arg.startswith("--config="):
		config = arg[9:]
	else:
		other_args.append(arg)

if action is None:
	action = runCSPSim

# load simdata
try:
	import SimData
except Exception, e:
	msg = str(e)
	if len(msg) > 60:
		msg = msg.replace(": ", ":\n  ")
	print """
ERROR: Unable to import SimData.  

%s
""" % msg,

	if str(e).find("symbol") >= 0:
		print """
Unresolved symbols often indicate missing libraries or improper link options.
""",
	print """
Please verify that SimData has been properly installed on your system.  See 
the README file in the SimData distribution for details.  
"""
	sys.exit(1)

SimData.log().set_output("SimData.log")
SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_DEBUG)
import CSP
SimData.log().setLogLevels(SimData.LOG_ALL, SimData.LOG_ALERT)

if not CSP.openConfig(config):
	print "Unable to open primary configuration file (%s)" % config
	sys.exit(0)

action(other_args)

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.4,1.5 README.CVS,1.1,NONE

From: <mk...@us...> - 2003-03-22 08:28:46

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

Modified Files:
	CHANGES.current 
Removed Files:
	README.CVS 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES.current	22 Mar 2003 07:58:32 -0000	1.4
--- CHANGES.current	22 Mar 2003 08:28:43 -0000	1.5
***************
*** 9,12 ****
--- 9,15 ----
              option to recompile all the source data.
  
+ 	    Added configure.win.py.  This simple script does some minimal
+ 	    checking and setup to prepare the build under Windows/MSVC.
+ 
  2003-03-21: delta
              CSPSim is back on windows (thx a lot Onsight).

--- README.CVS DELETED ---

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.PYTHON,1.4,1.5

From: <mk...@us...> - 2003-03-22 08:28:46

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

Modified Files:
	CSPSim.PYTHON 
Log Message:


Index: CSPSim.PYTHON
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.PYTHON,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CSPSim.PYTHON	22 Mar 2003 07:58:32 -0000	1.4
--- CSPSim.PYTHON	22 Mar 2003 08:28:43 -0000	1.5
***************
*** 27,30 ****
--- 27,32 ----
  	dar = os.path.join(datapath, "Sim.dar")
  	if not os.path.exists(dar):
+ 		print
+ 		print "Static data archive '%s' not found." % dar
  		compileData([])
  	import Shell

[Csp-commits] APPLICATIONS/CSPSim CHANGES,1.2,1.3 CHANGES.current,1.3,1.4

From: <mk...@us...> - 2003-03-22 07:58:35

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

Modified Files:
	CHANGES CHANGES.current 
Log Message:


Index: CHANGES
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CHANGES	15 Mar 2003 03:23:23 -0000	1.2
--- CHANGES	22 Mar 2003 07:58:32 -0000	1.3
***************
*** 51,52 ****
--- 51,69 ----
  
              Others changes are minor.
+ 
+ 2003-02-18: onsight
+             Checked in new sky code, improved virtual hid script handling,
+             and a bunch of miscellaneous fixes.
+ 
+             In order for it to run, you need to get the image file moon.png
+             from http://stm.lbl.gov/~tm2/csp/moon.png. make sure it is saved
+             as a png file, and not converted to bmp by IE.
+ 
+             There are some new keyboard commands. take a look at
+             aircraft.map and GameScreen.map in Tools/HID for details. the
+             new hid files are in Data/Input, so be sure to check them out or
+             use map2hid to regenerate them.
+ 
+             The autoconf scripts are broken on linux, you may need to copy
+             Makefile.in to Makefile and tweak it by hand. i'm still working
+             on a fix.

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGES.current	22 Mar 2003 02:18:44 -0000	1.3
--- CHANGES.current	22 Mar 2003 07:58:32 -0000	1.4
***************
*** 2,101 ****
  ===========================
  
! 2003-03-21 delta
!            CSPSim is back on windows (thx a lot Onsight).
             
! 2003-03-21 onsight
!            Merged delta's changes.
  
! 2003-03-19 onsight
!            *** Project Change ***
!            Added LandingGear.cpp and Console.cpp
  
!            Cleanup up Linux build a bit:
         
!          - Removed SDL_console check.
!          - Added test for correct Python path.
!          - Removed files related to Automake.
!          - Adapted to new SimData installation path.  There should
!            be no more relative paths to SimData in the configure
!            script and Makefiles.
  
! 2003-03-14 onsight
!        *** SimData library and data incompatibility ***
  
!            Added ContactList to ObjectModel for bounding hardpoints that
!            interact with the ground. There is a new osg::Switch called
!            m_DebugMarkers that will contain various visual cues for
!            debugging. Currently you can enable visual markers for the
!            contact points, and eventually other geometries like hierarchical
!            bounding boxes can be added.
  
!            Added ground interaction code for model contact points to
!            AeroDynamics. This should probably be abstracted to a base class
!            for use with other vehicles. Right now the ground acts as a hard,
!            highly damped spring on the points. There is also a large
!            (ad-hoc) tangential friction component. Forces beyond a threshold
!            need to be passed to a damage model for further processing (not
!            yet implemented).
  
!            Added landing gear to AircraftObject. This is implemented in two
!            new classes: LandingGearSet and LandingGear. The first is just a
!            container that provides several methods to act on all the gear at
!            once. Each landing gear has a complex physics model (need to add
!            a simplified model as well) including shock absorption, braking,
!            and steering. Gear damage, aerodynamic drag, and continuous
!            retraction/extension are not yet modelled. Hooks in Aerodynamics
!            activate the gear simulation (in the inner loop) when the a/c is
!            near the ground.
  
!            Added a simple ground effect model to AeroDynamics.
  
!            Added a wind vector to the AeroDynamics calculations. The
!            magnitude and direction are hard coded right now for testing.
  
!            Changes to all the object pack and unpack methods to ensure that
!            they are inverse operations. Added postCreate() methods as needed
!            (see recent SimData changes for details).
  
!            New input hooks for wheel brakes.
  
!            Added new (experimental) Python runtime console.
  
!            Added landing gear parameters to XML/vehicles/aircraft/m2k.xml
         
  
! 2003-03-12 delta
!            Cleaning code for ScreenInfo and ScreenInfoManager. It still
!            needs some improvements but it should be better now. Note that
!            osgText has been entirely reimplemented. Although, we didn t use
!            it, we ll need to switch to it soon: more flexible interface,
!            robuster and faster code.
  
!            Added a Runge-Kutta method RK_24, with a predictive step and a
!            corrective one; it is implemented as an abstract class in
!            DynamicalSystem (.cpp & .h). A dynamical system is roughly
!            speaking a system of differential equations (ODE); a pure virtual
!            method is the vector field which looks like vector
!            f(time,vector); here, vector is a std::vector<double> of any
!            dimension; you need to pass its size when you instantiate a
!            DynamicalSystem. This class is generic and could be use as soon
!            as a vector field may be defined.
  
!            Aerodynamics inherites now from DynamicalSystem. I ve done some
!            minor cleaning in code and implement some helper functions to use
!            with dynamical system. Call to this numerical method occurs in
!            doSimStep2; it will be keep until others will have tested it
!            enough (so, old code is still available and functional - just 1
!            line to be changed to switch back).
  
!            Added a line in CSPSim.ini to read sound files (still
!            hardcoded). At the moment, SDL API is used but it should be
!            replaced by OpenAL soon (Wolverine is working on it). Looks like
!            that here:
  
!            SoundPath = ../Data/Sounds
  
!            Changed the radius of skydome to 64000 (hardcoded!, pkz Onsight,
!            check it)
  
!            Others changes are minor.
--- 2,108 ----
  ===========================
  
! 2003-03-21: onsight
!             CSPSim.PYTHON now compiles the data automatically if Sim.dar is
!             not found. You still need to run with the --compile-data option
!             whenever the XML files change, or when the CPSSim object storage
!             format changes. In the latter case, also specify the --rebuild
!             option to recompile all the source data.
! 
! 2003-03-21: delta
!             CSPSim is back on windows (thx a lot Onsight).
             
! 2003-03-21: onsight
!             Merged delta's changes.
  
! 2003-03-19: onsight
!             *** Project Change ***
!             Added LandingGear.cpp and Console.cpp
  
!             Cleanup up Linux build a bit:
         
!             - Removed SDL_console check.
!             - Added test for correct Python path.
!             - Removed files related to Automake.
!             - Adapted to new SimData installation path.  There should
!               be no more relative paths to SimData in the configure
!               script and Makefiles.
  
! 2003-03-14: onsight
!             *** SimData library and data incompatibility ***
  
!             Added ContactList to ObjectModel for bounding hardpoints that
!             interact with the ground. There is a new osg::Switch called
!             m_DebugMarkers that will contain various visual cues for
!             debugging. Currently you can enable visual markers for the
!             contact points, and eventually other geometries like
!             hierarchical bounding boxes can be added.
  
!             Added ground interaction code for model contact points to
!             AeroDynamics. This should probably be abstracted to a base class
!             for use with other vehicles. Right now the ground acts as a
!             hard, highly damped spring on the points. There is also a large
!             (ad-hoc) tangential friction component. Forces beyond a
!             threshold need to be passed to a damage model for further
!             processing (not yet implemented).
  
!             Added landing gear to AircraftObject. This is implemented in two
!             new classes: LandingGearSet and LandingGear. The first is just a
!             container that provides several methods to act on all the gear
!             at once. Each landing gear has a complex physics model (need to
!             add a simplified model as well) including shock absorption,
!             braking, and steering. Gear damage, aerodynamic drag, and
!             continuous retraction/extension are not yet modelled. Hooks in
!             Aerodynamics activate the gear simulation (in the inner loop)
!             when the a/c is near the ground.
  
!             Added a simple ground effect model to AeroDynamics.
  
!             Added a wind vector to the AeroDynamics calculations. The
!             magnitude and direction are hard coded right now for testing.
  
!             Changes to all the object pack and unpack methods to ensure that
!             they are inverse operations. Added postCreate() methods as
!             needed (see recent SimData changes for details).
  
!             New input hooks for wheel brakes.
  
!             Added new (experimental) Python runtime console.
  
!             Added landing gear parameters to XML/vehicles/aircraft/m2k.xml
         
  
! 2003-03-12: delta
!             Cleaning code for ScreenInfo and ScreenInfoManager. It still
!             needs some improvements but it should be better now. Note that
!             osgText has been entirely reimplemented. Although, we didn t use
!             it, we ll need to switch to it soon: more flexible interface,
!             robuster and faster code.
  
!             Added a Runge-Kutta method RK_24, with a predictive step and a
!             corrective one; it is implemented as an abstract class in
!             DynamicalSystem (.cpp & .h). A dynamical system is roughly
!             speaking a system of differential equations (ODE); a pure
!             virtual method is the vector field which looks like vector
!             f(time,vector); here, vector is a std::vector<double> of any
!             dimension; you need to pass its size when you instantiate a
!             DynamicalSystem. This class is generic and could be use as soon
!             as a vector field may be defined.
  
!             Aerodynamics inherites now from DynamicalSystem. I ve done some
!             minor cleaning in code and implement some helper functions to
!             use with dynamical system. Call to this numerical method occurs
!             in doSimStep2; it will be keep until others will have tested it
!             enough (so, old code is still available and functional - just 1
!             line to be changed to switch back).
  
!             Added a line in CSPSim.ini to read sound files (still
!             hardcoded). At the moment, SDL API is used but it should be
!             replaced by OpenAL soon (Wolverine is working on it). Looks like
!             that here:
  
!             SoundPath = ../Data/Sounds
  
!             Changed the radius of skydome to 64000 (hardcoded!, pkz Onsight,
!             check it)
  
!             Others changes are minor.

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.PYTHON,1.3,1.4

From: <mk...@us...> - 2003-03-22 07:58:35

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

Modified Files:
	CSPSim.PYTHON 
Log Message:


Index: CSPSim.PYTHON
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.PYTHON,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CSPSim.PYTHON	21 Mar 2003 20:07:55 -0000	1.3
--- CSPSim.PYTHON	22 Mar 2003 07:58:32 -0000	1.4
***************
*** 24,27 ****
--- 24,31 ----
  		print
  		sys.exit(1)
+ 	datapath = CSP.getDataPath()
+ 	dar = os.path.join(datapath, "Sim.dar")
+ 	if not os.path.exists(dar):
+ 		compileData([])
  	import Shell
  	app = CSP.CSPSim()

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.9,1.10 Makefile,1.6,1.7 setup.py,1.7,1.8

From: <mk...@us...> - 2003-03-22 07:42:35

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

Modified Files:
	CHANGES.current Makefile setup.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CHANGES.current	22 Mar 2003 00:42:41 -0000	1.9
--- CHANGES.current	22 Mar 2003 07:42:32 -0000	1.10
***************
*** 15,18 ****
--- 15,26 ----
              types are added.
  
+ 	    Added Python version check to setup.py (also called from
+ 	    Makefile).
+ 
+ 	    Makefile gets Python include path automatically.
+ 
+ 	    To facilitate the build under Windows, setup.py now copies 
+ 	    cSimData.py from Source to SimData for make_install_win.
+ 
  2003-03-20: delta
  	    Fixes for msvc.

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	21 Mar 2003 18:38:02 -0000	1.6
--- Makefile	22 Mar 2003 07:42:32 -0000	1.7
***************
*** 1,8 ****
  SUBDIRS = Source 
  
! export PYTHON_INCLUDE = /usr/include/python2.2
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept
--- 1,8 ----
  SUBDIRS = Source 
  
! export PYTHON_INCLUDE := -I$(shell python setup.py python_include_path)
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2 $(PYTHON_INCLUDE)# -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept
***************
*** 13,29 ****
  
  all clean clean-deps: 
! 	for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
  	done
  
  default: 
! 	for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
  	done
  
- swig:
- 	rm Source/cSimData_wrap.cpp || true;
- 	make -C Source all
- 
  install:
! 	python setup.py make_install
--- 13,28 ----
  
  all clean clean-deps: 
! 	@python setup.py check_version
! 	@for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
  	done
  
  default: 
! 	@python setup.py version
! 	@for dir in $(SUBDIRS); do \
  		$(MAKE) -C $${dir} $@ || exit 1; \
  	done
  
  install:
! 	@python setup.py version
! 	@python setup.py make_install

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** setup.py	20 Mar 2003 19:13:06 -0000	1.7
--- setup.py	22 Mar 2003 07:42:32 -0000	1.8
***************
*** 26,34 ****
  
  
  from distutils.core import setup
  from distutils.core import Extension
  import distutils.command.build_ext
  from distutils.command.build_ext import build_ext
! import os, os.path, string, sys
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
--- 26,48 ----
  
  
+ import sys
+ 
+ min_python_version = "2.2.0"
+ 
+ if len(sys.argv) == 2:
+ 	command = sys.argv[1]
+ 	if command == "check_version":
+ 		old = sys.version[:5] < min_python_version
+ 		if old:
+ 			print >>sys.stderr, "SimData requires Python version %s or higher. (current version is %s)" % \
+ 	                    (min_python_version, sys.version[:5])
+ 		sys.exit(old)
+ 		
  from distutils.core import setup
  from distutils.core import Extension
  import distutils.command.build_ext
  from distutils.command.build_ext import build_ext
! from distutils import sysconfig, dir_util
! import os, os.path, string
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
***************
*** 54,58 ****
  
  def make_install(win):
- 	from distutils import sysconfig, dir_util
  	lib = sysconfig.get_python_lib()
  	inc = sysconfig.get_python_inc()
--- 68,71 ----
***************
*** 63,66 ****
--- 76,82 ----
  	if win:
  		package_files.extend(['cSimData.py', '_cSimData.dll', '_cSimData.lib'])
+ 		src = os.path.join("Source","cSimData.py")
+ 		if os.path.exists(src):
+ 			copy_file(src, os.path.join("SimData","cSimData.py"))
  	else:
  		package_files.extend(['cSimData.py', '_cSimData.so'])
***************
*** 275,278 ****
--- 291,297 ----
  	if command.startswith("make_install"):
  		make_install(command.endswith("win"))
+ 	if command == "python_include_path":
+ 		print sysconfig.get_python_inc()
+ 		sys.exit(0)
  
  cSimData = Extension("SimData._cSimData",

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli CSPSimAppli.dsp,1.3,1.4

From: <de...@us...> - 2003-03-22 02:43:32

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

Modified Files:
	CSPSimAppli.dsp 
Log Message:
no message

Index: CSPSimAppli.dsp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CSPSimAppli.dsp	19 Feb 2003 23:13:52 -0000	1.3
--- CSPSimAppli.dsp	22 Mar 2003 02:25:30 -0000	1.4
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /I "../../SimData/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 66,75 ****
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_STLP_USE_OWN_NAMESPACE" /FR /FD /GZ /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 66,75 ----
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "../../Bin"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /I "../../SimData/include" /I "../../../THIRDPARTYLIBS/demeter" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FAs /FR /FD /GZ /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 82,86 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib SDL_Console.lib gdal_i.lib _cSimDatad.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"../../Bin/CSPSimd.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Bin/CSPSimd.exe" /pdbtype:sept /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib"
  # SUBTRACT LINK32 /pdb:none
  
--- 82,86 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Bin/CSPSimd.exe" /pdbtype:sept /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 101,113 ****
  
  SOURCE=..\..\Source\AircraftModel.cpp
- 
- !IF  "$(CFG)" == "CSPSimAppli - Win32 Release"
- 
  # PROP Exclude_From_Build 1
- 
- !ELSEIF  "$(CFG)" == "CSPSimAppli - Win32 Debug"
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 101,105 ----
***************
*** 126,136 ****
  
  SOURCE=..\..\Source\Colorspace.cpp
- 
- !IF  "$(CFG)" == "CSPSimAppli - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "CSPSimAppli - Win32 Debug"
- 
- !ENDIF 
- 
  # End Source File
  # Begin Source File
--- 118,121 ----
***************
*** 148,151 ****
--- 133,140 ----
  # Begin Source File
  
+ SOURCE=..\..\Source\DynamicalSystem.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\Source\DynamicObject.cpp
  # End Source File
***************
*** 304,307 ****
--- 293,300 ----
  # Begin Source File
  
+ SOURCE=..\..\Include\DynamicalSystem.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\Include\DynamicObject.h
  # End Source File
***************
*** 316,319 ****
--- 309,316 ----
  # Begin Source File
  
+ SOURCE=..\..\Include\FLCS.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\Include\GlibCsp.h
  # End Source File
***************
*** 406,413 ****
  SOURCE=..\..\Include\VirtualBattlefield.h
  # End Source File
- # Begin Source File
- 
- SOURCE=..\..\Include\VirtualBattlefieldScene.h
- # End Source File
  # End Group
  # Begin Group "Resource Files"
--- 403,406 ----
***************
*** 437,441 ****
  
  "..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! 	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)
  
  # End Custom Build
--- 430,434 ----
  
  "..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! 	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)
  
  # End Custom Build

[Csp-commits] APPLICATIONS/CSPSim/Include SimpleConfig.h,1.6,1.7 LandingGear.h,1.1,1.2 InputInterface.h,1.3,1.4 HID.h,1.4,1.5 Console.h,1.1,1.2

From: <de...@us...> - 2003-03-22 02:38:46

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

Modified Files:
	SimpleConfig.h LandingGear.h InputInterface.h HID.h Console.h 
Log Message:
no message

Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SimpleConfig.h	19 Feb 2003 22:57:59 -0000	1.6
--- SimpleConfig.h	22 Mar 2003 02:25:18 -0000	1.7
***************
*** 41,49 ****
  #include <iostream>
  #include <fstream>
- //#include <cstdio>
- //#include <cstdlib>
- 
- #include <SimData/hash_map.h>
  
  
  /**
--- 41,46 ----
  #include <iostream>
  #include <fstream>
  
+ #include <SimData/HashUtility.h>
  
  /**
***************
*** 338,349 ****
  		
  private:
- 	class HashString {
- 	public:
- 		size_t operator()(std::string const &str) const {
- 			return HASH<char const *>()(str.c_str());
- 		}
- 	};
  
! 	typedef HASH_MAP<std::string, ConfigElement*, HashString> ConfigDictionary;
  	typedef std::vector<ConfigElement *> ElementList;
  
--- 335,345 ----
  		
  private:
  
! # if defined(_MSC_VER) && (_MSC_VER == 1300)
! 	typedef HASH_MAP<std::string, ConfigElement*, simdata::eqstring> ConfigDictionary;
! #else
! 	typedef HASH_MAP<std::string, ConfigElement*, simdata::hashstring> ConfigDictionary;
! #endif
! 
  	typedef std::vector<ConfigElement *> ElementList;
  

Index: LandingGear.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LandingGear.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LandingGear.h	21 Mar 2003 20:08:35 -0000	1.1
--- LandingGear.h	22 Mar 2003 02:25:18 -0000	1.2
***************
*** 64,68 ****
  	bool getTouchdown() const { return m_Touchdown; }
  	void resetTouchdown() { m_Touchdown = false; }
! 	float getCompression() const { return m_Compression; }
  	float getDamage() const { return m_Damage; }
  	bool getExtended() const { return m_Extended; }
--- 64,68 ----
  	bool getTouchdown() const { return m_Touchdown; }
  	void resetTouchdown() { m_Touchdown = false; }
! 	double getCompression() const { return m_Compression; }
  	float getDamage() const { return m_Damage; }
  	bool getExtended() const { return m_Extended; }
***************
*** 104,108 ****
  	float m_TireShiftX;
  	float m_TireShiftY;
! 	float m_Compression;
  	bool m_ABS;
  	simdata::Vector3 m_Position;
--- 104,108 ----
  	float m_TireShiftX;
  	float m_TireShiftY;
! 	double m_Compression;
  	bool m_ABS;
  	simdata::Vector3 m_Position;
***************
*** 144,153 ****
  
  	virtual void pack(simdata::Packer& p) const {
! 		simdata::Object::pack(p);
  		p.pack(m_Gear);
  	}
  
  	virtual void unpack(simdata::UnPacker& p) {
! 		simdata::Object::unpack(p);
  		p.unpack(m_Gear);
  	}
--- 144,153 ----
  
  	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
  		p.pack(m_Gear);
  	}
  
  	virtual void unpack(simdata::UnPacker& p) {
! 		Object::unpack(p);
  		p.unpack(m_Gear);
  	}

Index: InputInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/InputInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InputInterface.h	2 Feb 2003 20:53:27 -0000	1.3
--- InputInterface.h	22 Mar 2003 02:25:18 -0000	1.4
***************
*** 30,34 ****
  #include <SDL/SDL_events.h>
  
! #include <SimData/hash_map.h>
  
  #include "HID.h"
--- 30,34 ----
  #include <SDL/SDL_events.h>
  
! #include <SimData/HashUtility.h>
  
  #include "HID.h"
***************
*** 36,39 ****
--- 36,40 ----
  //class VirtualHID;
  
+ using simdata::eqstr;
  
  class InputInterface {
***************
*** 61,73 ****
  
  protected:
! 	struct eqstr {
! 		bool operator()(const char* s1, const char* s2) const {
! 			return strcmp(s1, s2) == 0;
! 		}
! 	};
! 	
! 	typedef HASH_MAP<const char *, ActionAdapter, HASH<const char *>, eqstr> ActionMap;
! 	typedef HASH_MAP<const char *, MotionAdapter, HASH<const char *>, eqstr> MotionMap;
! 	typedef HASH_MAP<const char *, AxisAdapter, HASH<const char *>, eqstr> AxisMap;
  	
  	ActionMap m_Actions;
--- 62,68 ----
  
  protected:
! 	typedef HASH_MAPS<const char *, ActionAdapter, HASH<const char *>, eqstr>::Type ActionMap;
! 	typedef HASH_MAPS<const char *, MotionAdapter, HASH<const char *>, eqstr>::Type MotionMap;
! 	typedef HASH_MAPS<const char *, AxisAdapter, HASH<const char *>, eqstr>::Type AxisMap;
  	
  	ActionMap m_Actions;

Index: HID.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/HID.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HID.h	19 Feb 2003 11:41:56 -0000	1.4
--- HID.h	22 Mar 2003 02:25:18 -0000	1.5
***************
*** 48,52 ****
  #include <vector>
  
! #include <SimData/HashUtility.h>
  
  #include "EventMapping.h"
--- 48,52 ----
  #include <vector>
  
! //#include <SimData/HashUtility.h>
  
  #include "EventMapping.h"

Index: Console.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Console.h	21 Mar 2003 20:08:35 -0000	1.1
--- Console.h	22 Mar 2003 02:25:18 -0000	1.2
***************
*** 1,38 ****
! #ifndef OSGCONSOLE_CONSOLE_
  #define OSGCONSOLE_CONSOLE_
! 
! #include <osg/Drawable>
  #include <osg/State>
! 
! #include <osgText/Text>
  #include <osgText/Font>
! 
! #include <streambuf>
! #include <string>
! #include <deque>
! 
! namespace osgConsole
! {
! 
! 	class Console: public osg::Drawable, public std::basic_streambuf<char> {
! 	public:
! 
! 		Console(int x=0, int y=0, int w=1024, int h=768, int border=10);
! 		Console(const Console &copy, const osg::CopyOp &copyop = osg::CopyOp::SHALLOW_COPY);
! 
! 		META_Object(osgConsole, Console);
! 
! 		inline float getLeft() const { return left_; }
! 		inline float getBottom() const { return bottom_; }
! 		inline float getWidth() const { return width_; }
! 		inline float getHeight() const { return height_; }
  		inline void setRect(float l, float t, float w, float h);
! 
! 		inline int getTabSize() const { return tab_size_; }
! 		inline void setTabSize(int s) { tab_size_ = s; buffer_.clear(); dirtyDisplayList(); }
! 
! 		inline bool getCursorEnabled() const { return cursor_enabled_; }
! 		inline void setCursorEnabled(bool e) { cursor_enabled_ = e; dirtyDisplayList(); }
! 
  		inline char getCursorCharacter() const { return cursor_char_; }
  		inline void setCursorCharacter(char c) { cursor_char_ = c; dirtyDisplayList(); }
--- 1,31 ----
! #ifndef OSGCONSOLE_CONSOLE_
  #define OSGCONSOLE_CONSOLE_
! #include <osg/Drawable>
  #include <osg/State>
! #include <osgText/Text>
  #include <osgText/Font>
! 
! #include <streambuf>
! #include <string>
! #include <deque>

! namespace osgConsole
! {
! 
! 	class Console: public osg::Drawable, public std::basic_streambuf<char> {
! 	public:

! 		Console(int x=0, int y=0, int w=1024, int h=768, int border=10);
! 		Console(const Console &copy, const osg::CopyOp &copyop = osg::CopyOp::SHALLOW_COPY);
! 
! 		META_Object(osgConsole, Console);
! 
! 		inline float getLeft() const { return left_; }
! 		inline float getBottom() const { return bottom_; }
! 		inline float getWidth() const { return width_; }
! 		inline float getHeight() const { return height_; }
  		inline void setRect(float l, float t, float w, float h);
! 		inline int getTabSize() const { return tab_size_; }
! 		inline void setTabSize(int s) { tab_size_ = s; buffer_.clear(); dirtyDisplayList(); }

! 		inline bool getCursorEnabled() const { return cursor_enabled_; }
! 		inline void setCursorEnabled(bool e) { cursor_enabled_ = e; dirtyDisplayList(); }

  		inline char getCursorCharacter() const { return cursor_char_; }
  		inline void setCursorCharacter(char c) { cursor_char_ = c; dirtyDisplayList(); }
***************
*** 74,79 ****
  
  	private:
! 		mutable osg::ref_ptr<osgText::Text> text_;
! 
  		struct Buffer_line {
  			std::string line;
--- 67,71 ----
  
  	private:
! 		mutable osg::ref_ptr<osgText::Text> text_;
		mutable osg::ref_ptr<osgText::Text> token_;
  		struct Buffer_line {
  			std::string line;

[Csp-commits] APPLICATIONS/CSPSim/Source TerrainObject.cpp,1.9,1.10 SmokeEffects.cpp,1.4,1.5 SimpleConfig.cpp,1.4,1.5 ScreenInfoManager.cpp,1.2,1.3 ScreenInfo.cpp,1.4,1.5 main.cpp,1.5,1.6 LogStream.cpp,1.3,1.4 LandingGear.cpp,1.2,1.3 CSPSim.cpp,1.11,1.12 Console.cpp,1.1,1.2 AeroDynamics.cpp,1.7,1.8

From: <de...@us...> - 2003-03-22 02:29:18

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

Modified Files:
	TerrainObject.cpp SmokeEffects.cpp SimpleConfig.cpp 
	ScreenInfoManager.cpp ScreenInfo.cpp main.cpp LogStream.cpp 
	LandingGear.cpp CSPSim.cpp Console.cpp AeroDynamics.cpp 
Log Message:
no message

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TerrainObject.cpp	21 Mar 2003 20:07:57 -0000	1.9
--- TerrainObject.cpp	22 Mar 2003 02:24:58 -0000	1.10
***************
*** 1,3 ****
- //#include <osg/Depth>
  #include <osg/Geode>
  #include <osg/StateSet>
--- 1,2 ----

Index: SmokeEffects.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SmokeEffects.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SmokeEffects.cpp	19 Feb 2003 23:00:33 -0000	1.4
--- SmokeEffects.cpp	22 Mar 2003 02:24:58 -0000	1.5
***************
*** 47,52 ****
   */
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1200)
! #include <assert.h>
  # endif
  
--- 47,52 ----
   */
  
! # if defined(_MSC_VER) && (_MSC_VER <= 1300)
! #include <cassert>
  # endif
  

Index: SimpleConfig.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SimpleConfig.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleConfig.cpp	19 Feb 2003 11:41:58 -0000	1.4
--- SimpleConfig.cpp	22 Mar 2003 02:24:58 -0000	1.5
***************
*** 40,48 ****
  #include "Platform.h"
  
  #include <string>
  #include <vector>
  #include <iostream>
  #include <fstream>
! #include <assert.h>
  
  #include "compiler.h"
--- 40,49 ----
  #include "Platform.h"
  
+ #include <algorithm>
  #include <string>
  #include <vector>
  #include <iostream>
  #include <fstream>
! #include <cassert>
  
  #include "compiler.h"

Index: ScreenInfoManager.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfoManager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScreenInfoManager.cpp	12 Mar 2003 21:39:27 -0000	1.2
--- ScreenInfoManager.cpp	22 Mar 2003 02:24:58 -0000	1.3
***************
*** 26,29 ****
--- 26,30 ----
  #include <osg/MatrixTransform>
  
+ #include "CSPSim.h"
  #include "ScreenInfoManager.h"
  
***************
*** 33,37 ****
  	//float textWidth = bitmapFont->getWidth(pause->getEncodedText());
  	osg::ref_ptr<ScreenInfo> pause = new ScreenInfo(ScreenWidth - 5 * 8, ScreenHeight,"PAUSE", "PAUSE");
! 	pause->setStatus(false);
  	osg::ref_ptr<GeneralStats> generalStats = new GeneralStats(0, ScreenHeight / 3);
  
--- 34,38 ----
  	//float textWidth = bitmapFont->getWidth(pause->getEncodedText());
  	osg::ref_ptr<ScreenInfo> pause = new ScreenInfo(ScreenWidth - 5 * 8, ScreenHeight,"PAUSE", "PAUSE");
! 	pause->setStatus(CSPSim::theSim->isPaused());
  	osg::ref_ptr<GeneralStats> generalStats = new GeneralStats(0, ScreenHeight / 3);
  

Index: ScreenInfo.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ScreenInfo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScreenInfo.cpp	21 Mar 2003 20:07:55 -0000	1.4
--- ScreenInfo.cpp	22 Mar 2003 02:24:58 -0000	1.5
***************
*** 146,150 ****
  			addDrawable( aStat );
  		}
! 		removeDrawable(m_Text);	
  	}
  }
--- 146,151 ----
  			addDrawable( aStat );
  		}
! 		if (m_Text) 
! 			removeDrawable(m_Text);	
  	}
  }

Index: main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/main.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.cpp	19 Feb 2003 23:00:35 -0000	1.5
--- main.cpp	22 Mar 2003 02:24:58 -0000	1.6
***************
*** 4,10 ****
  
  int main(int argc, char *argv[])
! {
  	if (!openConfig("../Data/CSPSim.ini")) return 0;
! 
  	CSPSim app;
  
--- 4,10 ----
  
  int main(int argc, char *argv[])
! {   
  	if (!openConfig("../Data/CSPSim.ini")) return 0;
! 	
  	CSPSim app;
  

Index: LogStream.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogStream.cpp	21 Mar 2003 23:49:34 -0000	1.3
--- LogStream.cpp	22 Mar 2003 02:24:58 -0000	1.4
***************
*** 25,29 ****
  // $Id$
  
! #include "stdinc.h"
  
  bool            logbuf::logging_enabled = true;
--- 25,29 ----
  // $Id$
  
! #include "LogStream.h"
  
  bool            logbuf::logging_enabled = true;

Index: LandingGear.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LandingGear.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LandingGear.cpp	21 Mar 2003 22:16:13 -0000	1.2
--- LandingGear.cpp	22 Mar 2003 02:24:58 -0000	1.3
***************
*** 42,49 ****
  
  using simdata::DegreesToRadians;
  using simdata::RadiansToDegrees;
  using simdata::QVRotate;
  using simdata::Vector3;
- using simdata::Dot;
  
  
--- 42,49 ----
  
  using simdata::DegreesToRadians;
+ using simdata::Dot;
  using simdata::RadiansToDegrees;
  using simdata::QVRotate;
  using simdata::Vector3;
  
  
***************
*** 190,194 ****
  	Vector3 v_normal_local = Dot(v_local, normal) * normal;
  	Vector3 v_normal_body = QVRotate(q.Bar(), v_normal_local);
! 	float v = - simdata::Dot(v_normal_body, m_Motion);
  	// restrict v to reasonable limits
  	if (v > 10.0) v = 10.0;
--- 190,194 ----
  	Vector3 v_normal_local = Dot(v_local, normal) * normal;
  	Vector3 v_normal_body = QVRotate(q.Bar(), v_normal_local);
! 	float v = - Dot(v_normal_body, m_Motion);
  	// restrict v to reasonable limits
  	if (v > 10.0) v = 10.0;
***************
*** 210,214 ****
  	Vector3 x_tangent_local = y_tangent_local ^ normal;
  
! 	float forward_speed = Dot(v_tangent_local, y_tangent_local);
  	Vector3 v_y_local = forward_speed * y_tangent_local;
  	Vector3 v_x_local = v_tangent_local - v_y_local;
--- 210,214 ----
  	Vector3 x_tangent_local = y_tangent_local ^ normal;
  
! 	double forward_speed = Dot(v_tangent_local, y_tangent_local);
  	Vector3 v_y_local = forward_speed * y_tangent_local;
  	Vector3 v_x_local = v_tangent_local - v_y_local;

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CSPSim.cpp	21 Mar 2003 20:07:55 -0000	1.11
--- CSPSim.cpp	22 Mar 2003 02:24:58 -0000	1.12
***************
*** 94,98 ****
  
  CSPSim::CSPSim()
! {
  	if (theSim == 0) {
  		theSim = this;
--- 94,98 ----
  
  CSPSim::CSPSim()
! { 
  	if (theSim == 0) {
  		theSim = this;

Index: Console.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Console.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Console.cpp	21 Mar 2003 20:07:55 -0000	1.1
--- Console.cpp	22 Mar 2003 02:24:58 -0000	1.2
***************
*** 40,43 ****
--- 40,44 ----
  :	osg::Drawable(),
  	text_(new osgText::Text(new osgText::BitmapFont("arial.ttf", 20))),
+ 	token_(new osgText::Text),
  	tab_size_(4),
  	left_(x),
***************
*** 61,64 ****
--- 62,66 ----
  :	osg::Drawable(copy, copyop),
  	text_(static_cast<osgText::Text *>(copyop(copy.text_.get()))),
+ 	token_(static_cast<osgText::Text *>(copyop(copy.token_.get()))),
  	tab_size_(copy.tab_size_),
  	left_(copy.left_),
***************
*** 73,76 ****
--- 75,79 ----
  	buffer_(copy.buffer_),
  	buf_lines_(copy.buf_lines_)
+ 
  {
  }
***************
*** 105,109 ****
  
  	glDepthMask(false);
! 	glColor4f(0, 0, 0.2, 0.4);
  	glEnable(GL_BLEND);
  
--- 108,112 ----
  
  	glDepthMask(false);
! 	glColor4f(0.0f, 0.0f, 0.2f, 0.4f);
  	glEnable(GL_BLEND);
  
***************
*** 138,148 ****
  			str[0] = *j;
  			str[1] = 0;
! 			osgText::EncodedText text;
  			if (*j == '\t') {
! 				text.setText((unsigned char*)" ");
! 				line_width += text_->getFont()->getWidth(&text) * tab_size_;
  			} else {
! 				text.setText((unsigned char*)str);
! 				line_width += text_->getFont()->getWidth(&text);
  			}
  			if (line_width >= width_ - 2*border_) {
--- 141,155 ----
  			str[0] = *j;
  			str[1] = 0;
! 			//osgText::EncodedText text;
  			if (*j == '\t') {
! 				//text.setText((unsigned char*)" ");
! 				//line_width += text_->getFont()->getWidth(&text) * tab_size_;
! 				token_->setText(" "); 
! 				line_width += text_->getFont()->getWidth(token_->getEncodedText()) * tab_size_;
  			} else {
! 				//text.setText((unsigned char*)str);
! 				//line_width += text_->getFont()->getWidth(&text);
! 				token_->setText(str); 
! 				line_width += text_->getFont()->getWidth(token_->getEncodedText());
  			}
  			if (line_width >= width_ - 2*border_) {
***************
*** 167,177 ****
  			str[0] = *buffer_.back().line.rbegin();
  			str[1] = 0;
! 			osgText::EncodedText text;
  			if (str[0] == '\t') {
! 				text.setText((unsigned char*)" ");
! 				buffer_.back().width -= text_->getFont()->getWidth(&text) * tab_size_;
  			} else {
! 				text.setText((unsigned char*)str);
! 				buffer_.back().width -= text_->getFont()->getWidth(&text);
  			}
  		}
--- 174,188 ----
  			str[0] = *buffer_.back().line.rbegin();
  			str[1] = 0;
! 			//osgText::EncodedText text;
  			if (str[0] == '\t') {
! 				//text.setText((unsigned char*)" ");
! 				//buffer_.back().width -= text_->getFont()->getWidth(&text) * tab_size_;
! 				token_->setText(" "); 
! 				buffer_.back().width -= text_->getFont()->getWidth(token_->getEncodedText()) * tab_size_;
  			} else {
! 				//text.setText((unsigned char*)str);
! 				//buffer_.back().width -= text_->getFont()->getWidth(&text);
! 				token_->setText(str); 
! 				buffer_.back().width -= text_->getFont()->getWidth(token_->getEncodedText());
  			}
  		}
***************
*** 199,206 ****
  	cursor_x_ = 0;
  	if (text_->getFont()->isCreated()) {
! 		osgText::EncodedText text;
  		std::string left(buffer_.back().line, 0, pos);
! 		text.setText((unsigned char const *)left.c_str());
! 		cursor_x_ = text_->getFont()->getWidth(&text);
  		dirtyDisplayList();
  	} 
--- 210,219 ----
  	cursor_x_ = 0;
  	if (text_->getFont()->isCreated()) {
! 		//osgText::EncodedText text;
  		std::string left(buffer_.back().line, 0, pos);
! 		//text.setText((unsigned char const *)left.c_str());
! 		//cursor_x_ = text_->getFont()->getWidth(&text);
! 		token_->setText(left); 
! 		cursor_x_ -= text_->getFont()->getWidth(token_->getEncodedText());
  		dirtyDisplayList();
  	} 
***************
*** 222,232 ****
  		str[1] = 0;
  		float char_width;
! 		osgText::EncodedText text;
  		if (c == '\t') {
! 			text.setText((unsigned char*)" ");
! 			char_width = text_->getFont()->getWidth(&text) * tab_size_;
  		} else {
! 			text.setText((unsigned char*)str);
! 			char_width = text_->getFont()->getWidth(&text);
  		}
  		float line_width = buffer_.back().width + char_width;
--- 235,249 ----
  		str[1] = 0;
  		float char_width;
! 		//osgText::EncodedText text;
  		if (c == '\t') {
! 			//text.setText((unsigned char*)" ");
! 			//char_width = text_->getFont()->getWidth(&text) * tab_size_;
! 			token_->setText(" "); 
! 			char_width = text_->getFont()->getWidth(token_->getEncodedText()) * tab_size_;
  		} else {
! 			//text.setText((unsigned char*)str);
! 			//char_width = text_->getFont()->getWidth(&text);
! 			token_->setText(str); 
! 			char_width = text_->getFont()->getWidth(token_->getEncodedText());
  		}
  		float line_width = buffer_.back().width + char_width;
***************
*** 264,270 ****
  		csr_str[1] = 0;
  		text_->setText(csr_str);
! 		osgText::EncodedText text;
! 		text.setText((unsigned char*)csr_str);
! 		float cursor_width = text_->getFont()->getWidth(&text);
  		float cursor_x = cursor_x_; //buffer_.back().width;
  		float cursor_y = y - font_height;
--- 281,289 ----
  		csr_str[1] = 0;
  		text_->setText(csr_str);
! 		//osgText::EncodedText text;
! 		//text.setText((unsigned char*)csr_str);
! 		//float cursor_width = text_->getFont()->getWidth(&text);
! 		token_->setText(csr_str); 
! 		float cursor_width = text_->getFont()->getWidth(token_->getEncodedText());
  		float cursor_x = cursor_x_; //buffer_.back().width;
  		float cursor_y = y - font_height;

Index: AeroDynamics.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AeroDynamics.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AeroDynamics.cpp	21 Mar 2003 20:07:55 -0000	1.7
--- AeroDynamics.cpp	22 Mar 2003 02:24:58 -0000	1.8
***************
*** 22,25 ****
--- 22,30 ----
   *
   **/
+ #include <algorithm>
+ 
+ #include <SimData/InterfaceRegistry.h>
+ #include <SimData/Math.h>
+ #include <SimData/Quaternion.h>
  
  #include "AeroDynamics.h"
***************
*** 27,39 ****
  #include "LogStream.h"
  
- #include <SimData/InterfaceRegistry.h>
- #include <SimData/Math.h>
- #include <SimData/Quaternion.h>
  
! #include <algorithm>
  
  using simdata::RadiansToDegrees;
  using simdata::DegreesToRadians;
  
  double	const	g	= 9.806; // acceleration due to gravity, m/s^2
  
--- 32,42 ----
  #include "LogStream.h"
  
  
! using std::min;
  
  using simdata::RadiansToDegrees;
  using simdata::DegreesToRadians;
  
+ 
  double	const	g	= 9.806; // acceleration due to gravity, m/s^2
  
***************
*** 222,226 ****
  {
  	Object::postCreate();
! 	m_depsilon = std::min(static_cast<double>(m_GMax),static_cast<double>(fabs(m_GMin))) / 2.0;
  	m_AspectRatio = m_WingSpan * m_WingSpan / m_WingArea;
  	m_CD_i = m_WingArea / (0.9 * G_PI * m_WingSpan * m_WingSpan);
--- 225,229 ----
  {
  	Object::postCreate();
! 	m_depsilon = min(static_cast<double>(m_GMax),static_cast<double>(fabs(m_GMin))) / 2.0;
  	m_AspectRatio = m_WingSpan * m_WingSpan / m_WingArea;
  	m_CD_i = m_WingArea / (0.9 * G_PI * m_WingSpan * m_WingSpan);
***************
*** 519,524 ****
  						static const float groundK = 1.0e+7;
  						static const float groundBeta = 1.0e+6;
! 						float scale;
! 						float impact = simdata::Dot(V, m_GroundN);
  						scale = - (height*groundK + impact*fabs(impact)*groundBeta);
  						if (fabs(scale)>groundK) {
--- 522,527 ----
  						static const float groundK = 1.0e+7;
  						static const float groundBeta = 1.0e+6;
! 						double scale;
! 						double impact = simdata::Dot(V, m_GroundN);
  						scale = - (height*groundK + impact*fabs(impact)*groundBeta);
  						if (fabs(scale)>groundK) {
***************
*** 539,543 ****
  							}
  						}
! 						simdata::Vector3 force = bodyn * scale;
  						
  						V -= impact * m_GroundN;
--- 542,546 ----
  							}
  						}
! 						simdata::Vector3 force = scale * bodyn;
  						
  						V -= impact * m_GroundN;

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli CSPSimAppli.vcproj,NONE,1.1

From: <de...@us...> - 2003-03-22 02:27:14

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

Added Files:
	CSPSimAppli.vcproj 
Log Message:
no message

--- NEW FILE: CSPSimAppli.vcproj ---
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.00"
	Name="CSPSimAppli"
	SccProjectName=""
	SccLocalPath="">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="1"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../Include,../../../SimData/Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include,../../SimData/include"
				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Release/CSPSimAppli.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="SDLmain.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib odbc32.lib odbccp32.lib"
				OutputFile="../../Bin/CSPSim.exe"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="C:/Python22/libs,../../../../THIRDPARTYLIBS/lib"
				SubSystem="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Release/CSPSimAppli.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1036"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
		</Configuration>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\../../Bin"
			IntermediateDirectory=".\Debug"
			ConfigurationType="1"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../Include,../../../SimData/Include,../../../../THIRDPARTYLIBS/include,../../../../THIRDPARTYLIBS/Demeter,C:/Python22/include,../../SimData/include,../../../THIRDPARTYLIBS/demeter"
				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="TRUE"
				PrecompiledHeaderFile=".\Debug/CSPSimAppli.pch"
				AssemblerOutput="4"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				BrowseInformation="1"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib _cSimDatad.lib osgTextd.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib odbc32.lib odbccp32.lib"
				OutputFile="../../Bin/CSPSimd.exe"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="C:/Python22/libs,../../../../THIRDPARTYLIBS/lib"
				IgnoreDefaultLibraryNames="msvcrt.lib"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\../../Bin/CSPSimd.pdb"
				SubSystem="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\../../Bin/CSPSimAppli.tlb"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1036"/>
			<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="..\..\Source\AeroDynamics.cpp">
			</File>
			<File
				RelativePath="..\..\Source\AircraftModel.cpp">
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="..\..\Source\AircraftObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\BaseScreen.cpp">
			</File>
			<File
				RelativePath="..\..\Source\CSPSim.cpp">
			</File>
			<File
				RelativePath="..\..\Source\CSP_wrap.cpp">
			</File>
			<File
				RelativePath="..\..\Source\Colorspace.cpp">
			</File>
			<File
				RelativePath="..\..\Source\Config.cpp">
			</File>
			<File
				RelativePath="..\..\Source\DynamicObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\DynamicalSystem.cpp">
			</File>
			<File
				RelativePath="..\..\Source\EventMapIndex.cpp">
			</File>
			<File
				RelativePath="..\..\Source\EventMapping.cpp">
			</File>
			<File
				RelativePath="..\..\Source\F16Model.cpp">
			</File>
			<File
				RelativePath="..\..\Source\GameScreen.cpp">
			</File>
			<File
				RelativePath="..\..\Source\HID.cpp">
			</File>
			<File
				RelativePath="..\..\Source\InputInterface.cpp">
			</File>
			<File
				RelativePath="..\..\Source\LogStream.cpp">
			</File>
			<File
				RelativePath="..\..\Source\LogoScreen.cpp">
			</File>
			<File
				RelativePath="..\..\Source\MenuScreen.cpp">
			</File>
			<File
				RelativePath="..\..\Source\Message.cpp">
			</File>
			<File
				RelativePath="..\..\Source\ObjectModel.cpp">
			</File>
			<File
				RelativePath="..\..\Source\ObjectRangeInfo.cpp">
			</File>
			<File
				RelativePath="..\..\Source\Platform.cpp">
			</File>
			<File
				RelativePath="..\..\Source\ScreenInfo.cpp">
			</File>
			<File
				RelativePath="..\..\Source\ScreenInfoManager.cpp">
			</File>
			<File
				RelativePath="..\..\Source\SimObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\SimpleConfig.cpp">
			</File>
			<File
				RelativePath="..\..\Source\SmokeEffects.cpp">
			</File>
			<File
				RelativePath="..\..\Source\StaticObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\TankObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\TerrainObject.cpp">
			</File>
			<File
				RelativePath="..\..\Source\Tools.cpp">
			</File>
			<File
				RelativePath="..\..\Source\VirtualBattlefield.cpp">
			</File>
			<File
				RelativePath="..\..\Source\base.cpp">
			</File>
			<File
				RelativePath="..\..\Source\main.cpp">
			</File>
			<File
				RelativePath="..\..\Source\sky.cpp">
			</File>
			<File
				RelativePath="..\..\Source\trees.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="..\..\Include\AeroDynamics.h">
			</File>
			<File
				RelativePath="..\..\Include\AircraftObject.h">
			</File>
			<File
				RelativePath="..\..\Include\BaseController.h">
			</File>
			<File
				RelativePath="..\..\Include\BasePhysics.h">
			</File>
			<File
				RelativePath="..\..\Include\BaseScreen.h">
			</File>
			<File
				RelativePath="..\..\Include\CSPSim.h">
			</File>
			<File
				RelativePath="..\..\Include\Colorspace.h">
			</File>
			<File
				RelativePath="..\..\Include\Config.h">
			</File>
			<File
				RelativePath="..\..\Include\DirVectorDrawable.h">
			</File>
			<File
				RelativePath="..\..\Include\DynamicObject.h">
			</File>
			<File
				RelativePath="..\..\Include\DynamicalSystem.h">
			</File>
			<File
				RelativePath="..\..\Include\EventMapIndex.h">
			</File>
			<File
				RelativePath="..\..\Include\EventMapping.h">
			</File>
			<File
				RelativePath="..\..\Include\FLCS.h">
			</File>
			<File
				RelativePath="..\..\Include\GlibCsp.h">
			</File>
			<File
				RelativePath="..\..\Include\HID.h">
			</File>
			<File
				RelativePath="..\..\Include\InputInterface.h">
			</File>
			<File
				RelativePath="..\..\Include\LogStream.h">
			</File>
			<File
				RelativePath="..\..\Include\LogoScreen.h">
			</File>
			<File
				RelativePath="..\..\Include\MenuScreen.h">
			</File>
			<File
				RelativePath="..\..\Include\Message.h">
			</File>
			<File
				RelativePath="..\..\Include\ObjectModel.h">
			</File>
			<File
				RelativePath="..\..\Include\ObjectRangeInfo.h">
			</File>
			<File
				RelativePath="..\..\Include\Platform.h">
			</File>
			<File
				RelativePath="..\..\Include\ScreenInfo.h">
			</File>
			<File
				RelativePath="..\..\Include\ScreenInfoManager.h">
			</File>
			<File
				RelativePath="..\..\Include\SimObject.h">
			</File>
			<File
				RelativePath="..\..\Include\SimpleConfig.h">
			</File>
			<File
				RelativePath="..\..\Include\Sky.h">
			</File>
			<File
				RelativePath="..\..\Include\SmokeEffects.h">
			</File>
			<File
				RelativePath="..\..\Include\StaticObject.h">
			</File>
			<File
				RelativePath="..\..\Include\TankObject.h">
			</File>
			<File
				RelativePath="..\..\Include\TerrainObject.h">
			</File>
			<File
				RelativePath="..\..\Include\TerrainSymbol.h">
			</File>
			<File
				RelativePath="..\..\Include\Tools.h">
			</File>
			<File
				RelativePath="..\..\Include\VehicleModel.h">
			</File>
			<File
				RelativePath="..\..\Include\VirtualBattlefield.h">
			</File>
			<File
				RelativePath="..\..\Include\compiler.h">
			</File>
			<File
				RelativePath="..\..\Include\debug_types.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
		</Filter>
		<File
			RelativePath="..\..\Source\CSP.i">
			<FileConfiguration
				Name="Release|Win32">
				<Tool
					Name="VCCustomBuildTool"
					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i"
					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
			</FileConfiguration>
			<FileConfiguration
				Name="Debug|Win32">
				<Tool
					Name="VCCustomBuildTool"
					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\..\Include -o ..\..\Source\$(InputName)_wrap.cpp ..\..\Source\$(InputName).i
"
					Outputs="..\..\Source\$(InputName)_wrap.cpp"/>
			</FileConfiguration>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio CSPSim.sln,NONE,1.1

From: <de...@us...> - 2003-03-22 02:26:42

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

Added Files:
	CSPSim.sln 
Log Message:
no message

--- NEW FILE: CSPSim.sln ---
Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimAppli", "CSPSimAppli\CSPSimAppli.vcproj", "{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSPSimDLL", "CSPSimDLL\CSPSimDLL.vcproj", "{A609C12F-9E38-4AFF-8560-B1099F051941}"
EndProject
Global
	GlobalSection(SolutionConfiguration) = preSolution
		ConfigName.0 = Debug
		ConfigName.1 = Release
	EndGlobalSection
	GlobalSection(ProjectDependencies) = postSolution
	EndGlobalSection
	GlobalSection(ProjectConfiguration) = postSolution
		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.ActiveCfg = Debug|Win32
		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Debug.Build.0 = Debug|Win32
		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.ActiveCfg = Release|Win32
		{7A1E754E-EAD6-4F36-8BF4-A5CB5ADD22A3}.Release.Build.0 = Release|Win32
		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.ActiveCfg = Debug|Win32
		{A609C12F-9E38-4AFF-8560-B1099F051941}.Debug.Build.0 = Debug|Win32
		{A609C12F-9E38-4AFF-8560-B1099F051941}.Release.ActiveCfg = Release|Win32
		{A609C12F-9E38-4AFF-8560-B1099F051941}.Release.Build.0 = Release|Win32
	EndGlobalSection
	GlobalSection(ExtensibilityGlobals) = postSolution
	EndGlobalSection
	GlobalSection(ExtensibilityAddIns) = postSolution
	EndGlobalSection
EndGlobal

Flat | Threaded

<< < 1 .. 99 100 101 102 103 .. 115 > >> (Page 101 of 115)