[Csp-commits] APPLICATIONS/CSPSim/Include VirtualBattlefield.h,1.10,1.11 Theater.h,1.1,1.2 LogoScreen.h,1.6,1.7 CSPSim.h,1.14,1.15 Atmosphere.h,1.4,1.5 AeroDynamics.h,1.9,1.10

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

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

Modified Files:
	VirtualBattlefield.h Theater.h LogoScreen.h CSPSim.h 
	Atmosphere.h AeroDynamics.h 
Log Message:
no message

Index: VirtualBattlefield.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualBattlefield.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** VirtualBattlefield.h	3 May 2003 09:47:54 -0000	1.10
--- VirtualBattlefield.h	4 May 2003 11:30:10 -0000	1.11
***************
*** 28,32 ****
  #include <list>
  #include <string>
- #include <algorithm>
  
  #include <SimData/Ref.h>
--- 28,31 ----

Index: Theater.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Theater.h	3 May 2003 09:47:54 -0000	1.1
--- Theater.h	4 May 2003 11:30:10 -0000	1.2
***************
*** 41,45 ****
  #include <list>
  #include <string>
- #include <algorithm>
  
  #include <SimData/Ref.h>
--- 41,44 ----

Index: LogoScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LogoScreen.h	23 Apr 2003 10:02:11 -0000	1.6
--- LogoScreen.h	4 May 2003 11:30:10 -0000	1.7
***************
*** 30,34 ****
  
  
! class SDL_Surface;
  
  /**
--- 30,34 ----
  
  
! struct SDL_Surface;
  
  /**

Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CSPSim.h	3 May 2003 09:47:54 -0000	1.14
--- CSPSim.h	4 May 2003 11:30:10 -0000	1.15
***************
*** 39,43 ****
  #include <SDL/SDL_joystick.h>
  
! class SDL_Surface;
  
  class PyShell;
--- 39,43 ----
  #include <SDL/SDL_joystick.h>
  
! struct SDL_Surface;
  
  class PyShell;

Index: Atmosphere.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Atmosphere.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Atmosphere.h	26 Mar 2003 10:19:44 -0000	1.4
--- Atmosphere.h	4 May 2003 11:30:10 -0000	1.5
***************
*** 78,82 ****
  	Atmosphere();
  	double getGravity(double alt) const { return 9.806; }
! 	double getTemperature(double alt) const;
  	double getPressure(double alt) const;
  	double getDensity(double alt) const;
--- 78,82 ----
  	Atmosphere();
  	double getGravity(double alt) const { return 9.806; }
! 	float getTemperature(double alt) const;
  	double getPressure(double alt) const;
  	double getDensity(double alt) const;
***************
*** 90,96 ****
  
  	inline double getMach(double speed, double altitude) const;
! 	double getSpeedOfSound(double altitude) const;
! 	double getPreciseCAS(double mach, double altitude) const;
! 	double getCAS(double mach, double altitude) const;
  	
  protected:
--- 90,96 ----
  
  	inline double getMach(double speed, double altitude) const;
! 	float getSpeedOfSound(double altitude) const;
! 	float getPreciseCAS(double mach, double altitude) const;
! 	float getCAS(double mach, double altitude) const;
  	
  protected:
***************
*** 138,143 ****
  }
  
! inline double Atmosphere::getCAS(double mach, double altitude) const {
! 	return m_CAS.getValue(mach, altitude);
  }
  
--- 138,143 ----
  }
  
! inline float Atmosphere::getCAS(double mach, double altitude) const {
! 	return m_CAS.getValue(float(mach), float(altitude));
  }
  

Index: AeroDynamics.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/AeroDynamics.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AeroDynamics.h	23 Apr 2003 10:02:05 -0000	1.9
--- AeroDynamics.h	4 May 2003 11:30:10 -0000	1.10
***************
*** 131,140 ****
  	double m_stallAOA;  // stall AOA 
  	
! 	float m_DeMax;
! 	float m_DeMin;
! 	float m_DaMax;
! 	float m_DaMin;
! 	float m_DrMax;
! 	float m_DrMin;
  
  	// the folowing parameters are both structural and controlled in nature
--- 131,140 ----
  	double m_stallAOA;  // stall AOA 
  	
! 	double m_DeMax;
! 	double m_DeMin;
! 	double m_DaMax;
! 	double m_DaMin;
! 	double m_DrMax;
! 	double m_DrMin;
  
  	// the folowing parameters are both structural and controlled in nature