[Csp-commits] APPLICATIONS/CSPFlightSim/Source CSPFlightSim.cpp,1.8,1.9

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

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

Modified Files:
	CSPFlightSim.cpp 
Log Message:
no message

Index: CSPFlightSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/CSPFlightSim.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CSPFlightSim.cpp	19 Dec 2002 17:01:23 -0000	1.8
--- CSPFlightSim.cpp	11 Jan 2003 11:07:32 -0000	1.9
***************
*** 8,11 ****
--- 8,14 ----
  #include <osg/Timer>
  
+ #include <osgDB/FileUtils>
+ #include <osgDB/ReadFile>
+ 
  
  #include "SDL.h"
***************
*** 84,90 ****
  	_timeStep = 1.0;
      } 
!     if (_timeStep < 0.01) {
      	// todo: microsleep
!     	_timeStep = 0.01;
      	_timeLag = 0.0;
      } else {
--- 87,93 ----
  	_timeStep = 1.0;
      } 
!     if (_timeStep < 0.001) {
      	// todo: microsleep
!     	_timeStep = 0.001;
      	_timeLag = 0.0;
      } else {
***************
*** 158,163 ****
      InitConsole();
  
!     g_pObjectFactory->initialize();
  
  
      g_pBattlefield->create();
--- 161,180 ----
      InitConsole();
  
! #ifdef _WIN32
! 	std::string sep = ";";
! #else
! 	std::string sep = ":";
! #endif
! 
! 	osgDB::setDataFilePathList("../Data" + sep + "../Data/Models" + sep + "../Data/Images" + sep + "../Data/Fonts");
  
+ 	// we don't need this on Linux since libs are usually
+ 	// installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
+ 	// OSG can find itself the plugins.
+ #ifdef _WIN32
+ 	osgDB::setLibraryFilePathList("../Bin");
+ #endif
+ 
+     g_pObjectFactory->initialize();
  
      g_pBattlefield->create();