Changeset 1340 for trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc (modified) (5 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.42 2010/06/03 08:23:02 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.43 2010/11/05 06:25:23 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -106 +106 @@
   if (fMemoryForDisplayLists) {
     fDisplayListId = glGenLists (1);
-    if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?
+    if (glGetError() == GL_OUT_OF_MEMORY ||
+        fDisplayListId > fDisplayListLimit + fDisplayListBase) {
       G4cout <<
         "********************* WARNING! ********************"
-        "\nUnable to allocate any more display lists in OpenGL."
-        "\n     Continuing drawing in IMMEDIATE MODE."
+        "\n  Display list limit reached in OpenGL."
+        "\n  Continuing drawing in IMMEDIATE MODE."
+        "\n  Current limit: "
+             << fDisplayListLimit <<
+        ".  Change with \"/vis/ogl/set/displayListLimit\"."
         "\n***************************************************"
              << G4endl;
@@ -351 +355 @@
     glDeleteLists(fTOList[i].fDisplayListId, 1);
   fTOList.clear ();
+
+  fDisplayListBase = fDisplayListId;
 }
 
@@ -361 +367 @@
     glDeleteLists(fTOList[i].fDisplayListId, 1);
   fTOList.clear ();
+
+  fDisplayListBase = fDisplayListId;
 
   // Make sure screen corresponds to graphical database...
@@ -463 +471 @@
 G4int G4OpenGLStoredSceneHandler::fSceneIdCount = 0;
 
+G4int G4OpenGLStoredSceneHandler::fDisplayListLimit = 50000;
+
+G4int G4OpenGLStoredSceneHandler::fDisplayListBase = 0;
+
 #endif