Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv9165/Include
Modified Files:
Tag: systems
CSPSim.h
Log Message:
Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** CSPSim.h 29 Sep 2003 06:46:11 -0000 1.16.2.1
--- CSPSim.h 11 Oct 2003 17:38:14 -0000 1.16.2.2
***************
*** 36,42 ****
#include <osg/ref_ptr>
- #include <Producer/RenderSurface>
#include <SDL/SDL_joystick.h>
struct SDL_Surface;
--- 36,45 ----
#include <osg/ref_ptr>
#include <SDL/SDL_joystick.h>
+ #include <Producer/RenderSurface>
+ // Producer includes windows.h, which leaks a #define min
+ #undef min
+
struct SDL_Surface;
***************
*** 89,94 ****
VirtualScene const * getScene() const;
simdata::Ref<Theater> getTheater() const;
!
! EventMapIndex *getInterfaceMaps() { return m_InterfaceMaps; }
void togglePause();
--- 92,96 ----
VirtualScene const * getScene() const;
simdata::Ref<Theater> getTheater() const;
! simdata::Ref<EventMapIndex> getInterfaceMaps() const;
void togglePause();
***************
*** 150,155 ****
* The current input device interface
*/
! VirtualHID *m_Interface;
! EventMapIndex *m_InterfaceMaps;
simdata::Ref<DynamicObject> m_ActiveObject;
--- 152,157 ----
* The current input device interface
*/
! simdata::Ref<VirtualHID> m_Interface;
! simdata::Ref<EventMapIndex> m_InterfaceMaps;
simdata::Ref<DynamicObject> m_ActiveObject;
***************
*** 170,174 ****
--- 172,178 ----
simdata::Ref<PyShell> m_Shell;
+ #ifndef CSP_OSG_094
osg::ref_ptr<Producer::RenderSurface> m_RenderSurface;
+ #endif
};
|
