[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.cpp,1.38,1.39

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

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

Modified Files:
	CSPSim.cpp 
Log Message:
see CHANGES.current

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** CSPSim.cpp	21 Oct 2003 21:13:01 -0000	1.38
--- CSPSim.cpp	28 Dec 2003 19:56:30 -0000	1.39
***************
*** 22,26 ****
   *
   */
! #include <Python.h>
  
  #include "CSPSim.h"
--- 22,33 ----
   *
   */
! 
! #ifdef _DEBUG
! #undef _DEBUG
! #include <python.h>
! #define _DEBUG
! #else
! #include <python.h>
! #endif
  
  #include "CSPSim.h"
***************
*** 221,227 ****
  		// installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
  		// OSG can find itself the plugins.
! #ifdef _WIN32
! 		osgDB::setLibraryFilePathList(".");
! #endif
  
  		// open the primary data archive
--- 228,234 ----
  		// installed in /usr/local/lib/osgPlugins or /usr/lib/osgPlugins.
  		// OSG can find itself the plugins.
! //#ifdef _WIN32
! //		osgDB::setLibraryFilePathList(".");
! //#endif
  
  		// open the primary data archive
***************
*** 258,264 ****
  
  		logoScreen.onRender();
- 
- 		//--m_RenderSurface.swapBuffers();
  		SDL_GL_SwapBuffers();
  
  		m_Clean = false;
--- 265,270 ----
  
  		logoScreen.onRender();
  		SDL_GL_SwapBuffers();
+ 		//--m_RenderSurface.swapBuffers();
  
  		m_Clean = false;
***************
*** 271,274 ****
--- 277,284 ----
  		m_Interface = new VirtualHID();
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: theater");
  
***************
*** 287,290 ****
--- 297,304 ----
  		m_Atmosphere.setPosition(lat, lon);
  		
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: scene");
  
***************
*** 293,296 ****
--- 307,314 ----
  		m_Scene->setTerrain(m_Terrain);
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: battlefield");
  
***************
*** 300,303 ****
--- 318,325 ----
  		m_Battlefield->setTheater(m_Theater);
  
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: scene configuration");
  
***************
*** 350,353 ****
--- 372,379 ----
  
  #endif
+ 		logoScreen.onUpdate(0.0);
+ 		logoScreen.onRender();
+ 		SDL_GL_SwapBuffers();
+ 
  		CSP_LOG(APP, DEBUG, "INIT:: gamescreen");