Menu
▾
▴
[Csp-commits] APPLICATIONS/CSPSim/Source GameScreen.cpp,1.4,1.5 CSPSim.cpp,1.5,1.6
|
From: <de...@us...> - 2003-02-19 23:01:34
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv17321
Modified Files:
GameScreen.cpp CSPSim.cpp
Log Message:
New display code
Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GameScreen.cpp 19 Feb 2003 11:41:58 -0000 1.4
--- GameScreen.cpp 19 Feb 2003 23:01:25 -0000 1.5
***************
*** 23,30 ****
**/
-
#include "stdinc.h"
#include <SimData/Types.h>
#include "GameScreen.h"
#include "EventMapIndex.h"
--- 23,33 ----
**/
#include "stdinc.h"
+ #include <osg/Depth>
+ #include <osg/State>
+
#include <SimData/Types.h>
+
#include "GameScreen.h"
#include "EventMapIndex.h"
***************
*** 33,51 ****
!
! double const GameScreen::angleOffset = 0.02;
simdata::Vector3 m_normalDirection;
-
-
void GameScreen::NormalView()
{
m_fangleRotX = 0.0;
m_fangleRotZ = 0.0;
! m_fangleOffsetX = 0.0;
! m_fangleOffsetZ = 0.0;
m_fdisToObject = 30.0;
- m_fscaleFactor = 1.0;
}
--- 36,51 ----
! double const GameScreen::OffsetRate = 30.0 * (G_PI / 180.0); // x deg / s, even if it is used for Zoom also ...
simdata::Vector3 m_normalDirection;
void GameScreen::NormalView()
{
m_fangleRotX = 0.0;
m_fangleRotZ = 0.0;
! m_PanRateX = 0.0;
! m_PanRateZ = 0.0;
! m_ZoomRate = 0.0;
m_fdisToObject = 30.0;
}
***************
*** 58,61 ****
--- 58,62 ----
BIND_ACTION("QUIT", on_Quit);
BIND_ACTION("PAUSE", on_Pause);
+ BIND_ACTION("STATS", on_Stats);
BIND_ACTION("CHANGE_VEHICLE", on_ChangeVehicle);
BIND_ACTION("CAMERA_VIEW_0", on_View0);
***************
*** 99,102 ****
--- 100,125 ----
CSP_LOG( CSP_APP , CSP_ERROR, "No HID interface maps defined, '__gamescreen__' not found.");
}
+
+ // add a layer for texts on screen
+ m_rpInfosView = new osgUtil::SceneView();
+ m_rpInfosView->setDefaults();
+
+ int ScreenWidth = CSPSim::theSim->GetSDLScreen()->w;
+ int ScreenHeight = CSPSim::theSim->GetSDLScreen()->h;
+
+ m_rpInfosView->setViewport(0,0,ScreenWidth,ScreenHeight);
+
+ osg::Depth* depth = new osg::Depth;
+ depth->setRange(0.0,0.0);
+ osg::StateSet* State = new osg::StateSet();
+ State->setAttribute(depth);
+
+ m_rpInfosView->getRenderStage()->setClearMask(0x0);
+
+ m_ScreenInfoManager = new ScreenInfoManager(ScreenWidth,ScreenHeight);
+ m_ScreenInfoManager->setName("ScreenInfoManager");
+ m_ScreenInfoManager->setStateSet(State);
+
+ m_rpInfosView->setSceneData(m_ScreenInfoManager.get() );
}
***************
*** 107,116 ****
}
! void GameScreen::TurnViewAboutZ(double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutZ: m_fangleViewZ = " << m_fangleRotZ
! << "; m_fangleOffsetZ = " << m_fangleOffsetZ);
! m_fangleRotZ += m_fangleOffsetZ;
/*if ( m_fangleRotZ > fangleMax )
if ( fangleMax == pi )
--- 130,139 ----
}
! void GameScreen::TurnViewAboutZ(double dt, double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutZ: m_fangleViewZ = " << m_fangleRotZ
! << "; m_PanRateZ = " << m_PanRateZ);
! m_fangleRotZ += m_PanRateZ * dt;
/*if ( m_fangleRotZ > fangleMax )
if ( fangleMax == pi )
***************
*** 125,134 ****
}
! void GameScreen::TurnViewAboutX(double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutX: m_fangleViewX = " << m_fangleRotX
! << "; m_fangleOffsetX = " << m_fangleOffsetX);
! m_fangleRotX += m_fangleOffsetX;
/*if ( m_fangleRotX > fangleMax )
m_fangleRotX = fangleMax;
--- 148,157 ----
}
! void GameScreen::TurnViewAboutX(double dt, double fangleMax)
{
CSP_LOG( CSP_APP , CSP_DEBUG, "TurnViewAboutX: m_fangleViewX = " << m_fangleRotX
! << "; m_PanRateX = " << m_PanRateX);
! m_fangleRotX += m_PanRateX * dt;
/*if ( m_fangleRotX > fangleMax )
m_fangleRotX = fangleMax;
***************
*** 137,145 ****
}
! void GameScreen::ScaleView()
{
! if ( (m_fdisToObject > 2.0 && m_fscaleFactor < 1.0) ||
! (m_fdisToObject < 2000.0 && m_fscaleFactor > 1.0) ) {
! m_fdisToObject *= m_fscaleFactor;
}
if (m_fdisToObject < 2.0) {
--- 160,169 ----
}
! void GameScreen::ScaleView(double dt)
{
! double ScaleFactor = 1.0 + m_ZoomRate * dt;
! if ( (m_fdisToObject > 2.0 && ScaleFactor < 1.0) ||
! (m_fdisToObject < 2000.0 && ScaleFactor > 1.0) ) {
! m_fdisToObject *= ScaleFactor;
}
if (m_fdisToObject < 2.0) {
***************
*** 187,194 ****
}
! void GameScreen::OnRender()
{
- SetCamera();
-
if (m_ActiveObject.valid()) {
if (m_bPreviousState^m_bInternalView)
--- 211,216 ----
}
! void GameScreen::onRender()
{
if (m_ActiveObject.valid()) {
if (m_bPreviousState^m_bInternalView)
***************
*** 207,219 ****
}
}
-
// Draw the whole scene
if (m_Battlefield) {
m_Battlefield->drawScene();
}
}
! void GameScreen::OnUpdateObjects(double dt)
{
}
--- 229,244 ----
}
}
// Draw the whole scene
if (m_Battlefield) {
m_Battlefield->drawScene();
}
+ m_rpInfosView->cull();
+ m_rpInfosView->draw();
}
! void GameScreen::onUpdate(double dt)
{
+ SetCamera(dt);
+ m_rpInfosView->update();
}
***************
*** 233,237 ****
float h = 0;
if (m_Battlefield) {
! m_Battlefield->getElevation(objectPos.x, objectPos.y);
}
if ( camPos.z < h ) camPos.z = h;
--- 258,262 ----
float h = 0;
if (m_Battlefield) {
! h = m_Battlefield->getElevation(objectPos.x, objectPos.y);
}
if ( camPos.z < h ) camPos.z = h;
***************
*** 313,316 ****
--- 338,348 ----
{
CSPSim::theSim->togglePause();
+ m_ScreenInfoManager->setStatus("PAUSE", !m_ScreenInfoManager->getStatus("PAUSE"));
+ }
+
+ void GameScreen::on_Stats()
+ {
+ m_ScreenInfoManager->setStatus("GENERAL STATS", !m_ScreenInfoManager->getStatus("GENERAL STATS"));
+ m_ScreenInfoManager->setStatus("OBJECT STATS", !m_ScreenInfoManager->getStatus("OBJECT STATS"));
}
***************
*** 325,329 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetZ = - angleOffset;
}
--- 357,361 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateZ = - OffsetRate;
}
***************
*** 331,335 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetZ = + angleOffset;
}
--- 363,367 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateZ = + OffsetRate;
}
***************
*** 337,341 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetZ < 0.0) m_fangleOffsetZ = 0.0;
}
--- 369,373 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateZ < 0.0) m_PanRateZ = 0.0;
}
***************
*** 343,347 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetZ > 0.0) m_fangleOffsetZ = 0.0;
}
--- 375,379 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateZ > 0.0) m_PanRateZ = 0.0;
}
***************
*** 349,353 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetX < 0.0) m_fangleOffsetX = 0.0;
}
--- 381,385 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateX < 0.0) m_PanRateX = 0.0;
}
***************
*** 355,359 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_fangleOffsetX > 0.0) m_fangleOffsetX = 0.0;
}
--- 387,391 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! if (m_PanRateX > 0.0) m_PanRateX = 0.0;
}
***************
*** 361,365 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = 1.0;
}
--- 393,397 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = 0.0;
}
***************
*** 367,371 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetX = - angleOffset;
}
--- 399,403 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateX = - OffsetRate;
}
***************
*** 373,377 ****
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_fangleOffsetX = angleOffset;
}
--- 405,409 ----
{
if ( m_iViewMode == 1 || m_iViewMode == 2 || m_iViewMode == 3 )
! m_PanRateX = OffsetRate;
}
***************
*** 379,383 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = (1.00 / 1.05);
}
--- 411,415 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = - OffsetRate;
}
***************
*** 385,389 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fscaleFactor = 1.05;
}
--- 417,421 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_ZoomRate = OffsetRate;
}
***************
*** 391,395 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 0.75;
}
--- 423,427 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 0.8 ;
}
***************
*** 397,406 ****
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 1.25;
}
void GameScreen::on_ViewFovStepDec()
{
! float fov = m_Battlefield->getViewAngle() * 0.80;
if (fov > 10.0) {
m_Battlefield->setViewAngle(fov);
--- 429,438 ----
{
if ( m_iViewMode == 2 || m_iViewMode == 3 )
! m_fdisToObject *= 1.20;
}
void GameScreen::on_ViewFovStepDec()
{
! float fov = m_Battlefield->getViewAngle() * 0.8;
if (fov > 10.0) {
m_Battlefield->setViewAngle(fov);
***************
*** 433,438 ****
void GameScreen::on_MouseView(int x, int y, int dx, int dy)
{
! m_fangleOffsetX = 0.0;
! m_fangleOffsetZ = 0.0;
m_fangleRotZ += dx * 0.001;
m_fangleRotX += dy * 0.001;
--- 465,470 ----
void GameScreen::on_MouseView(int x, int y, int dx, int dy)
{
! m_PanRateX = 0.0;
! m_PanRateZ = 0.0;
m_fangleRotZ += dx * 0.001;
m_fangleRotX += dy * 0.001;
***************
*** 558,562 ****
// TODO All references to planes should be made generic!
! void GameScreen::SetCamera()
{
simdata::Vector3 eyePos;
--- 590,594 ----
// TODO All references to planes should be made generic!
! void GameScreen::SetCamera(double dt)
{
simdata::Vector3 eyePos;
***************
*** 567,572 ****
// temporary view if there are no active objects... probably
// should switch to an "action" view mode in this case.
! TurnViewAboutX();
! TurnViewAboutZ();
eyePos = simdata::Vector3(483000.0, 499000.0, 2000.0);
//lookPos = simdata::Vector3(483000.0, 499005.0, 2000.0);
--- 599,604 ----
// temporary view if there are no active objects... probably
// should switch to an "action" view mode in this case.
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
eyePos = simdata::Vector3(483000.0, 499000.0, 2000.0);
//lookPos = simdata::Vector3(483000.0, 499005.0, 2000.0);
***************
*** 584,589 ****
case 1: // view_mode one is normal inside the cockpit view
{
! TurnViewAboutX(M_PI / 3);
! TurnViewAboutZ(M_PI / 3);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
--- 616,621 ----
case 1: // view_mode one is normal inside the cockpit view
{
! TurnViewAboutX(dt,M_PI / 3);
! TurnViewAboutZ(dt,M_PI / 3);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
***************
*** 600,606 ****
case 2: // view mode two is external view; normal view is behind the plane
{
! TurnViewAboutX();
! TurnViewAboutZ();
! ScaleView();
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
--- 632,638 ----
case 2: // view mode two is external view; normal view is behind the plane
{
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
! ScaleView(dt);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Vector3 planeDir = m_ActiveObject->getDirection();
***************
*** 619,625 ****
case 3: // view mode three is external fixed view around the plane
{
! TurnViewAboutX();
! TurnViewAboutZ();
! ScaleView();
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Matrix3 RotZ, RotX;
--- 651,657 ----
case 3: // view mode three is external fixed view around the plane
{
! TurnViewAboutX(dt);
! TurnViewAboutZ(dt);
! ScaleView(dt);
simdata::Vector3 planePos = m_ActiveObject->getGlobalPosition();
simdata::Matrix3 RotZ, RotX;
Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CSPSim.cpp 19 Feb 2003 11:41:57 -0000 1.5
--- CSPSim.cpp 19 Feb 2003 23:01:27 -0000 1.6
***************
*** 32,45 ****
#include <osg/Timer>
-
#include <SDL/SDL.h>
- #include <SDL/CON_console.h> // console is using SDL_OPENGLBLIT :-( switch to osgConsole?
- #include <SDL/DT_drawtext.h>
- #include "CON_consolecommands.h"
#include "DemeterException.h"
! #include "Config.h"
! #include "ConsoleCommands.h"
#include "CSPSim.h"
#include "EventMapIndex.h"
--- 32,40 ----
#include <osg/Timer>
#include <SDL/SDL.h>
#include "DemeterException.h"
! #include "Config.h"
#include "CSPSim.h"
#include "EventMapIndex.h"
***************
*** 93,97 ****
CSPSim *CSPSim::theSim = 0;
-
CSPSim::CSPSim()
{
--- 88,91 ----
***************
*** 108,116 ****
m_MainMenuScreen = NULL;
- m_pConsole = NULL;
-
- m_bConsoleDisplay = false;
m_bFreezeSim = true;
- m_bShowStats = true;
m_Interface = NULL;
--- 102,106 ----
***************
*** 155,170 ****
}
!
! void CSPSim::unpause() {
! m_bFreezeSim = false;
}
! void CSPSim::pause() {
! m_bFreezeSim = true;
}
void CSPSim::togglePause() {
m_bFreezeSim = !m_bFreezeSim;
! }
void CSPSim::Init()
--- 145,160 ----
}
! simdata::Pointer<DynamicObject> const CSPSim::getActiveObject() const {
! return m_ActiveObject;
}
! VirtualBattlefield * const CSPSim::getBattlefield() const
! {
! return m_Battlefield;
}
void CSPSim::togglePause() {
m_bFreezeSim = !m_bFreezeSim;
! }
void CSPSim::Init()
***************
*** 197,206 ****
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
! logoScreen.OnRender();
SDL_GL_SwapBuffers();
// do rest of initialization
! InitConsole();
// load all interface maps and create a virtual hid for the active object
--- 187,196 ----
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
! logoScreen.onRender();
SDL_GL_SwapBuffers();
// do rest of initialization
! //InitConsole(); // should be replaced by osgConsole if necessary
// load all interface maps and create a virtual hid for the active object
***************
*** 233,237 ****
// create a couple test objects
-
simdata::Pointer<AircraftObject> ao = m_DataArchive->getObject("vehicles.aircraft.m2k");
assert(ao.valid());
--- 223,226 ----
***************
*** 265,269 ****
ChangeScreen(m_GameScreen);
!
logoScreen.OnExit();
}
--- 254,258 ----
ChangeScreen(m_GameScreen);
!
logoScreen.OnExit();
}
***************
*** 320,324 ****
CSP_LOG(CSP_APP, CSP_DEBUG, "CSPSim::Run...");
! m_bShowStats = false;
m_bFreezeSim = false;
--- 309,313 ----
CSP_LOG(CSP_APP, CSP_DEBUG, "CSPSim::Run...");
! //m_bShowStats = true;
m_bFreezeSim = false;
***************
*** 354,374 ****
UpdateObjects(dt);
}
!
// Display (render) current Screen
! if (m_CurrentScreen)
! m_CurrentScreen->OnRender();
!
// Do Console
! if (m_bConsoleDisplay)
! CON_DrawConsole(m_pConsole);
!
! if (m_bFreezeSim)
! ShowPaused();
- // Do fps and other stuff.
- if (m_bShowStats) {
- ShowStats(m_FrameRate);
- // ShowPlaneInfo();
- }
// Swap OpenGL buffers
SDL_GL_SwapBuffers();
--- 343,359 ----
UpdateObjects(dt);
}
!
!
!
// Display (render) current Screen
! if (m_CurrentScreen) {
! m_CurrentScreen->onUpdate(dt);
! m_CurrentScreen->onRender();
! }
!
// Do Console
! //if (m_bConsoleDisplay)
! // CON_DrawConsole(m_pConsole);
// Swap OpenGL buffers
SDL_GL_SwapBuffers();
***************
*** 376,385 ****
// remove marked objects, this should be done at the end of the main loop.
m_Battlefield->removeObjectsMarkedForDelete();
-
- m_bShowStats = true;
}
m_Battlefield->dumpObjectHistory();
}
!
catch(DemeterException * pEx) {
CSP_LOG(CSP_APP, CSP_ERROR, "Caught Demeter Exception: " << pEx->GetErrorMessage());
--- 361,368 ----
// remove marked objects, this should be done at the end of the main loop.
m_Battlefield->removeObjectsMarkedForDelete();
}
m_Battlefield->dumpObjectHistory();
}
!
catch(DemeterException * pEx) {
CSP_LOG(CSP_APP, CSP_ERROR, "Caught Demeter Exception: " << pEx->GetErrorMessage());
***************
*** 452,462 ****
return;
}
! if (m_bConsoleDisplay) {
! // handle console key events
! // if (event.type == SDL_KEYUP || event.type == SDL_KEYDN) {
! // char *key = SDL_GetKeyName(event.key.keysym.sym);
! // ...
! // }
! }
if (m_CurrentScreen) {
VirtualHID *i = m_CurrentScreen->getInterface();
--- 435,439 ----
return;
}
!
if (m_CurrentScreen) {
VirtualHID *i = m_CurrentScreen->getInterface();
***************
*** 468,473 ****
handled = m_Interface->OnEvent(event);
}
}
-
}
--- 445,497 ----
handled = m_Interface->OnEvent(event);
}
+ #if 0
+ switch (event.key.keysym.sym) {
+ case SDLK_ESCAPE:
+ {
+ m_bFinished = TRUE;
+ break;
+ }
+ case SDLK_F9:
+ {
+ m_bConsoleDisplay = !m_bConsoleDisplay;
+ if (m_bConsoleDisplay) {
+ m_bFreezeSim = true;
+ CON_Topmost(m_pConsole);
+ SDL_EnableUNICODE(1);
+ } else {
+ m_bFreezeSim = false;
+ CON_Topmost(NULL);
+ SDL_EnableUNICODE(0);
+ }
+ break;
+ }
+ case SDLK_F10:
+ {
+ m_bShowStats = !m_bShowStats;
+ break;
+ }
+ case SDLK_p:
+ {
+ // don't do pause while in console mode.
+ if (!m_bConsoleDisplay) {
+ // todo: call m_CurrentTime.pause/unpause()
+ if (!m_bFreezeSim)
+ m_bFreezeSim = true;
+ else
+ m_bFreezeSim = false;
+ }
+ }
+ default:
+ {
+ // Send the event to the console
+ if (m_bConsoleDisplay)
+ CON_Events(&event);
+ break;
+ }
+ }
+ }
+ #endif
+ // break;
}
}
***************
*** 513,518 ****
CSP_LOG(CSP_APP, CSP_ERROR, "Initializing video at " << bpp << " BitsPerPixel.");
! Uint32 flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_OPENGLBLIT;
! //Uint32 flags = SDL_OPENGL | SDL_HWSURFACE;
if (fullscreen) {
--- 537,541 ----
CSP_LOG(CSP_APP, CSP_ERROR, "Initializing video at " << bpp << " BitsPerPixel.");
! Uint32 flags = SDL_OPENGL | SDL_HWSURFACE | SDL_DOUBLEBUF;
if (fullscreen) {
***************
*** 521,524 ****
--- 544,550 ----
m_SDLScreen = SDL_SetVideoMode(width, height, bpp, flags);
+ SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 32 );
+ SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
+
if (m_SDLScreen == NULL) {
printf("Unable to set video mode: %s\n", SDL_GetError());
***************
*** 532,536 ****
CSP_LOG(CSP_APP, CSP_ERROR, SDL_GetError());
}
!
SDL_EnableUNICODE(1);
--- 558,562 ----
CSP_LOG(CSP_APP, CSP_ERROR, SDL_GetError());
}
!
SDL_EnableUNICODE(1);
***************
*** 538,541 ****
--- 564,568 ----
}
+ /*
int CSPSim::InitConsole()
{
***************
*** 655,656 ****
--- 682,684 ----
+ */
|
