Frederic Bouvier:
This is a patch to make display list usage optional. They are on by default. Use --prop:/sim/rendering/use-display-list=false to use immediate mode. There is also a change in exception handling in main.cxx and bootstrap.cxx
This commit is contained in:
parent
e3d4f556b0
commit
2b6b970b80
2 changed files with 6 additions and 9 deletions
|
@ -188,7 +188,8 @@ int main ( int argc, char **argv ) {
|
|||
// disabled.
|
||||
cerr << "Fatal error: " << t.getFormattedMessage()
|
||||
<< "\n (received from " << t.getOrigin() << ')' << endl;
|
||||
exit(1);
|
||||
} catch (...) {
|
||||
cerr << "Unknown exception in the main loop. Aborting..." << endl;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -110,7 +110,6 @@ FGGeneral general;
|
|||
int idle_state = 0;
|
||||
long global_multi_loop;
|
||||
|
||||
|
||||
SGTimeStamp last_time_stamp;
|
||||
SGTimeStamp current_time_stamp;
|
||||
|
||||
|
@ -722,6 +721,8 @@ bool fgMainInit( int argc, char **argv ) {
|
|||
exit(-1);
|
||||
}
|
||||
|
||||
sgUseDisplayList = fgGetBool( "/sim/rendering/use-display-list", true );
|
||||
|
||||
// Initialize the Aircraft directory to "" (UIUC)
|
||||
aircraft_dir = "";
|
||||
|
||||
|
@ -938,13 +939,8 @@ bool fgMainInit( int argc, char **argv ) {
|
|||
// build our custom render states
|
||||
globals->get_renderer()->build_states();
|
||||
|
||||
try {
|
||||
// pass control off to the master event handler
|
||||
fgOSMainLoop();
|
||||
} catch (...) {
|
||||
SG_LOG( SG_ALL, SG_ALERT,
|
||||
"Unknown exception in the main loop. Aborting..." );
|
||||
}
|
||||
// pass control off to the master event handler
|
||||
fgOSMainLoop();
|
||||
|
||||
// we never actually get here ... but to avoid compiler warnings,
|
||||
// etc.
|
||||
|
|
Loading…
Add table
Reference in a new issue