[Csp-commits] APPLICATIONS/CSPSim/Include VirtualBattlefield.h,1.3,1.4 SmokeEffects.h,1.2,1.3 SimpleConfig.h,1.5,1.6 SimObject.h,1.3,1.4 MenuScreen.h,1.2,1.3 LogoScreen.h,1.3,1.4 CSPSim.h,1.4,1.5 BaseScreen.h,1.2,1.3

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

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

Modified Files:
	VirtualBattlefield.h SmokeEffects.h SimpleConfig.h SimObject.h 
	MenuScreen.h LogoScreen.h CSPSim.h BaseScreen.h 
Log Message:
Fixes under windows

Index: VirtualBattlefield.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VirtualBattlefield.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VirtualBattlefield.h	19 Feb 2003 11:41:56 -0000	1.3
--- VirtualBattlefield.h	19 Feb 2003 22:57:58 -0000	1.4
***************
*** 46,49 ****
--- 46,50 ----
  const int MAX_NUM_VISIBLE_TRIANGLES = 30000; // Chosen based on the expected number of triangles that will be visible on-screen at any one time (the terrain mesh will typically have far more triangles than are seen at one time, especially with dynamic tessellation)
  
+ class DynamicObject;
  
  /**

Index: SmokeEffects.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SmokeEffects.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SmokeEffects.h	19 Feb 2003 11:41:56 -0000	1.2
--- SmokeEffects.h	19 Feb 2003 22:57:59 -0000	1.3
***************
*** 38,41 ****
--- 38,43 ----
  #include <string>
  
+ using std::string;
+ 
  namespace osgParticle {
  	class ParticleSystem;

Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleConfig.h	19 Feb 2003 11:41:56 -0000	1.5
--- SimpleConfig.h	19 Feb 2003 22:57:59 -0000	1.6
***************
*** 41,46 ****
  #include <iostream>
  #include <fstream>
! #include <cstdio>
! #include <cstdlib>
  
  #include <SimData/hash_map.h>
--- 41,46 ----
  #include <iostream>
  #include <fstream>
! //#include <cstdio>
! //#include <cstdlib>
  
  #include <SimData/hash_map.h>

Index: SimObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimObject.h	2 Feb 2003 20:53:27 -0000	1.3
--- SimObject.h	19 Feb 2003 22:58:00 -0000	1.4
***************
*** 39,49 ****
  
  
- class VirtualBattlefield;
- 
- 
  /**
   * class SimObject - Base class for all objects in the simulation.
   *
   */
  
  class SimObject: public simdata::Object
--- 39,47 ----
  
  
  /**
   * class SimObject - Base class for all objects in the simulation.
   *
   */
+ class VirtualBattlefield;
  
  class SimObject: public simdata::Object

Index: MenuScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/MenuScreen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MenuScreen.h	26 Jan 2003 23:34:13 -0000	1.2
--- MenuScreen.h	19 Feb 2003 22:58:00 -0000	1.3
***************
*** 42,46 ****
      virtual void OnExit();
  
!     virtual void OnRender();
  
      virtual bool OnKeyDown(char * key);
--- 42,46 ----
      virtual void OnExit();
  
!     virtual void onRender();
  
      virtual bool OnKeyDown(char * key);

Index: LogoScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LogoScreen.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogoScreen.h	2 Feb 2003 20:53:27 -0000	1.3
--- LogoScreen.h	19 Feb 2003 22:58:00 -0000	1.4
***************
*** 45,50 ****
  	virtual void OnExit();
  
! 	virtual void OnRender();
! 	virtual void OnUpdateObjects(double dt)  {;  }
  
  
--- 45,50 ----
  	virtual void OnExit();
  
! 	virtual void onRender();
! 	virtual void onUpdate(double dt)  {;  }
  
  

Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CSPSim.h	19 Feb 2003 11:41:56 -0000	1.4
--- CSPSim.h	19 Feb 2003 22:58:00 -0000	1.5
***************
*** 28,41 ****
  #define __CSPSIM_H__
  
- 
- #include "TerrainObject.h"
- #include "DynamicObject.h"
- 
  #include <SDL/SDL.h>
  #include <SDL/SDL_joystick.h>
- #include <SDL/CON_console.h>
  
  #include <SimData/Types.h>
  
  
  class VirtualBattlefield;
--- 28,39 ----
  #define __CSPSIM_H__
  
  #include <SDL/SDL.h>
  #include <SDL/SDL_joystick.h>
  
  #include <SimData/Types.h>
  
+ #include "DynamicObject.h"
+ #include "TerrainObject.h"
+ 
  
  class VirtualBattlefield;
***************
*** 69,79 ****
  
  	simdata::SimDate & getCurrentTime() { return m_CurrentTime; }
  
  	void setActiveObject(simdata::Pointer<DynamicObject> object);
  
  	EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
  
- 	void pause();
- 	void unpause();
  	void togglePause();
  
--- 67,79 ----
  
  	simdata::SimDate & getCurrentTime() { return m_CurrentTime; }
+ 	simdata::SimTime const & getFrameRate() const{ return m_FrameRate; }
  
  	void setActiveObject(simdata::Pointer<DynamicObject> object);
+ 	simdata::Pointer<DynamicObject> const getActiveObject() const;
+ 	VirtualBattlefield * const getBattlefield() const;
+ 
  
  	EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
  
  	void togglePause();
  
***************
*** 84,91 ****
  	void InitSim();
  	int InitSDL();
- 	int InitConsole();
- 	void ShowStats(float fps);
- 	void ShowPlaneInfo();
- 	void ShowPaused();
  
  	void DoInput();
--- 84,87 ----
***************
*** 108,116 ****
  	int m_ScreenHeight;
  
- 	ConsoleInformation * m_pConsole;
- 
- 	bool m_bConsoleDisplay;
  	bool m_bFreezeSim;
- 	bool m_bShowStats;
  	bool m_bFinished;
  
--- 104,108 ----
***************
*** 137,142 ****
  	simdata::Pointer<DynamicObject> m_ActiveObject;
  
- 	int m_ConsoleFont;
- 
  	/**
  	 * The virtual battlefield
--- 129,132 ----
***************
*** 148,152 ****
  	simdata::DataArchive *m_DataArchive;
  };
- 
  
  #endif // __CSPSIM_H__
--- 138,141 ----

Index: BaseScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/BaseScreen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseScreen.h	26 Jan 2003 23:34:13 -0000	1.2
--- BaseScreen.h	19 Feb 2003 22:58:00 -0000	1.3
***************
*** 33,37 ****
  // Each screen within the Game/Sim should
  // Derive a class from class. Each Screen
! // class must support a OnRender() function
  // that knows how to draw the screen.
  
--- 33,37 ----
  // Each screen within the Game/Sim should
  // Derive a class from class. Each Screen
! // class must support a onRender() function
  // that knows how to draw the screen.
  
***************
*** 51,56 ****
  	virtual void OnExit() = 0;
  
! 	virtual void OnUpdateObjects(double dt) = 0;
! 	virtual void OnRender() = 0;
  
  	virtual VirtualHID *getInterface();
--- 51,56 ----
  	virtual void OnExit() = 0;
  
! 	virtual void onUpdate(double dt) = 0;
! 	virtual void onRender() = 0;
  
  	virtual VirtualHID *getInterface();