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

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index c45bcfb02ac9e586bc6dfe4ecf249a123058157e..9091c3b5a1ca3896f772ed8a259d2cf0b7e8d1f2 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -29,7 +29,7 @@
 SG_USING_STD(vector);
 SG_USING_STD(set);
 
-
+bool sgUseDisplayList = true;
 \f
 ////////////////////////////////////////////////////////////////////////
 // Global state
@@ -329,7 +329,7 @@ sgLoad3DModel( const string &fg_root, const string &path,
   }
 
 #if PLIB_VERSION > 183
-  if ( model != 0 ) {
+  if ( model != 0 && sgUseDisplayList ) {
      makeDList( model, ignore_branches );
   }
 #endif

diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index e995c1208d09a8aa20124ef9dbcafe6fe3778b87..a4220cdbfa2d7356b660418823756fd082451530 100644 (file)
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -74,4 +74,9 @@ sgMakeAnimation( ssgBranch * model,
 bool
 sgSetModelFilter( bool filter );
 
+/**
+ * Enable or disable Display list usage
+ */
+extern bool sgUseDisplayList;
+
 #endif // __MODEL_HXX