refactored core

Author: Haydelj

src/Interface/Modules/Render/ES/Core.cc

@@ -110,6 +110,18 @@ std::string ESCore::toString(std::string prefix) const
   return output;
 }
 
+bool ESCore::hasGeomPromise()
+{
+  for(auto& comp : mComponents)
+    if(comp.second->getNumComponents() > 0)
+    {
+      if(mComponentIDNameMap.find(comp.first) != mComponentIDNameMap.end() &&
+         mComponentIDNameMap.at(comp.first) == "ren:GeomPromise")
+        return true;
+    }
+  return false;
+}
+
 void ESCore::execute(double currentTime, double constantFrameTime)
 {
   ++mCoreSequence;
@@ -148,22 +160,11 @@ void ESCore::execute(double currentTime, double constantFrameTime)
   renormalize(true);
   mSystems->renormalize();
 
-  // Perform garbage collection if requested.
+  // Perform garbage collection if requested and safe
   if(runGC)
   {
-    bool run = true;
-    for(auto& comp : mComponents)
-      if(comp.second->getNumComponents() > 0)
-      {
-        if(mComponentIDNameMap.find(comp.first) != mComponentIDNameMap.end() &&
-           mComponentIDNameMap.at(comp.first) == "ren:GeomPromise")
-        {
-          run = false;
-          break;
-        }
-      }
-    if(run) runCompleteGC();
-    else std::cout << "abourted GC\n";
+    if(!hasGeomPromise())
+      runCompleteGC();
     runGC = false;
   }
 

src/Interface/Modules/Render/ES/Core.h

@@ -49,6 +49,7 @@ namespace Render {
   void runGCOnNextExecution(){runGC = true;}
 
 private:
+  bool hasGeomPromise();
 
   int64_t         mCoreSequence;    ///< Sequence number (frame) since start.
   spire::GLState  mDefaultGLState;  ///< Default OpenGL state.

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -834,11 +834,13 @@ namespace SCIRun {
 
       DEBUG_LOG_LINE_INFO
 
-      if(!mCore.getStaticComponent<ren::StaticVBOMan>() ||
-         !mCore.getStaticComponent<ren::StaticIBOMan>()) return;
+      auto vmc = mCore.getStaticComponent<ren::StaticVBOMan>();
+      auto imc = mCore.getStaticComponent<ren::StaticIBOMan>();
+      if(!vmc || !imc) return;
 
-      std::weak_ptr<ren::VBOMan> vm = mCore.getStaticComponent<ren::StaticVBOMan>()->instance_;
-      std::weak_ptr<ren::IBOMan> im = mCore.getStaticComponent<ren::StaticIBOMan>()->instance_;
+      std::weak_ptr<ren::VBOMan> vm = vmc->instance_;
+      std::weak_ptr<ren::IBOMan> im = imc->instance_;
+      
       if (std::shared_ptr<ren::VBOMan> vboMan = vm.lock())
       {
         DEBUG_LOG_LINE_INFO;