Fixed so lists aren't created unless that rendering type is selected

Author: cbrightsci

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

@@ -384,84 +384,93 @@ namespace SCIRun {
 					primitive = GL_TRIANGLES;
 					break;
 				}
-        /// Create sorted lists of Buffers for transparency in each direction of the axis
-        uint32_t* ibo_buffer = reinterpret_cast<uint32_t*>(ibo.data->getBuffer());
-        size_t num_triangles = ibo.data->getBufferSize() / (sizeof(uint32_t) * 3);
-        Core::Geometry::Vector dir(0.0, 0.0, 0.0);
 
-        std::vector<DepthIndex> rel_depth(num_triangles);
-        for (int i = 0; i <= 6; ++i)
+        if (mRenderSortType == RenderState::TransparencySortType::LISTS_SORT)
         {
-          std::string name = ibo.name;
-          if (i == 0)
-          {
-            int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
-            iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
-          }          
-          if (i == 1)
-          {
-            dir = Core::Geometry::Vector(1.0, 0.0, 0.0);
-            name += "X";
-          }
-          if (i == 2)
-          {
-            dir = Core::Geometry::Vector(0.0, 1.0, 0.0);
-            name += "Y";
-          }
-          if (i == 3)
-          {
-            dir = Core::Geometry::Vector(0.0, 0.0, 1.0);
-            name += "Z";
-          }
-          if (i == 4)
-          {
-            dir = Core::Geometry::Vector(-1.0, 0.0, 0.0);
-            name += "NegX";
-          }
-          if (i == 5)
-          {
-            dir = Core::Geometry::Vector(0.0, -1.0, 0.0);
-            name += "NegY";
-          }
-          if (i == 6)
-          {
-            dir = Core::Geometry::Vector(0.0, 0.0, -1.0);
-            name += "NegZ";
-          }
-          if (i > 0)
+          /// Create sorted lists of Buffers for transparency in each direction of the axis
+          uint32_t* ibo_buffer = reinterpret_cast<uint32_t*>(ibo.data->getBuffer());
+          size_t num_triangles = ibo.data->getBufferSize() / (sizeof(uint32_t) * 3);
+          Core::Geometry::Vector dir(0.0, 0.0, 0.0);
+
+          std::vector<DepthIndex> rel_depth(num_triangles);
+          for (int i = 0; i <= 6; ++i)
           {
-            for (size_t j = 0; j < num_triangles; j++)
+            std::string name = ibo.name;
+            if (i == 0)
+            {
+              int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
+              iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
+            }
+            if (i == 1)
+            {
+              dir = Core::Geometry::Vector(1.0, 0.0, 0.0);
+              name += "X";
+            }
+            if (i == 2)
+            {
+              dir = Core::Geometry::Vector(0.0, 1.0, 0.0);
+              name += "Y";
+            }
+            if (i == 3)
+            {
+              dir = Core::Geometry::Vector(0.0, 0.0, 1.0);
+              name += "Z";
+            }
+            if (i == 4)
+            {
+              dir = Core::Geometry::Vector(-1.0, 0.0, 0.0);
+              name += "NegX";
+            }
+            if (i == 5)
             {
-              float* vertex1 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3]));
-              Core::Geometry::Point node1(vertex1[0], vertex1[1], vertex1[2]);
+              dir = Core::Geometry::Vector(0.0, -1.0, 0.0);
+              name += "NegY";
+            }
+            if (i == 6)
+            {
+              dir = Core::Geometry::Vector(0.0, 0.0, -1.0);
+              name += "NegZ";
+            }
+            if (i > 0)
+            {
+              for (size_t j = 0; j < num_triangles; j++)
+              {
+                float* vertex1 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3]));
+                Core::Geometry::Point node1(vertex1[0], vertex1[1], vertex1[2]);
 
-              float* vertex2 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 1]));
-              Core::Geometry::Point node2(vertex2[0], vertex2[1], vertex2[2]);
+                float* vertex2 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 1]));
+                Core::Geometry::Point node2(vertex2[0], vertex2[1], vertex2[2]);
 
-              float* vertex3 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 2]));
-              Core::Geometry::Point node3(vertex3[0], vertex3[1], vertex3[2]);
+                float* vertex3 = reinterpret_cast<float*>(vbo_buffer[nameIndex] + stride_vbo[nameIndex] * (ibo_buffer[j * 3 + 2]));
+                Core::Geometry::Point node3(vertex3[0], vertex3[1], vertex3[2]);
 
-              rel_depth[j].mDepth = Core::Geometry::Dot(dir, node1) + Core::Geometry::Dot(dir, node2) + Core::Geometry::Dot(dir, node3);
-              rel_depth[j].mIndex = j;
-            }
+                rel_depth[j].mDepth = Core::Geometry::Dot(dir, node1) + Core::Geometry::Dot(dir, node2) + Core::Geometry::Dot(dir, node3);
+                rel_depth[j].mIndex = j;
+              }
 
-            std::sort(rel_depth.begin(), rel_depth.end());
+              std::sort(rel_depth.begin(), rel_depth.end());
 
-            int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
+              int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
 
-            std::vector<char> sorted_buffer(ibo.data->getBufferSize());
-            char* ibuffer = reinterpret_cast<char*>(ibo.data->getBuffer());
-            char* sbuffer = reinterpret_cast<char*>(&sorted_buffer[0]);
-            size_t tri_size = ibo.data->getBufferSize() / num_triangles;
+              std::vector<char> sorted_buffer(ibo.data->getBufferSize());
+              char* ibuffer = reinterpret_cast<char*>(ibo.data->getBuffer());
+              char* sbuffer = reinterpret_cast<char*>(&sorted_buffer[0]);
+              size_t tri_size = ibo.data->getBufferSize() / num_triangles;
 
-            for (size_t j = 0; j < num_triangles; j++)
-            {
-              memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
-            }
+              for (size_t j = 0; j < num_triangles; j++)
+              {
+                memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
+              }
 
-            iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
+              iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
+            }
           }
-        }        
+        }
+        else
+        {
+          int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
+          iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
+        }
 			}
 
 			// Add default identity transform to the object globally (instead of per-pass)
@@ -481,23 +490,30 @@ namespace SCIRun {
 				if (pass.renderType == Core::Datatypes::GeometryObject::RENDER_VBO_IBO)
 				{   
 					addVBOToEntity(entityID, pass.vboName);
-          for (int i = 0; i <= 6; ++i)
+          if (mRenderSortType == RenderState::TransparencySortType::LISTS_SORT)
           {
-            std::string name = pass.iboName;
-            if (i == 1)
-              name += "X";
-            if (i == 2)
-              name += "Y";
-            if (i == 3)
-              name += "Z";
-            if (i == 4)
-              name += "NegX";
-            if (i == 5)
-              name += "NegY";
-            if (i == 6)
-              name += "NegZ";
-
-            addIBOToEntity(entityID, name);
+            for (int i = 0; i <= 6; ++i)
+            {
+              std::string name = pass.iboName;
+              if (i == 1)
+                name += "X";
+              if (i == 2)
+                name += "Y";
+              if (i == 3)
+                name += "Z";
+              if (i == 4)
+                name += "NegX";
+              if (i == 5)
+                name += "NegY";
+              if (i == 6)
+                name += "NegZ";
+
+              addIBOToEntity(entityID, name);
+            }
+          }
+          else
+          {
+            addIBOToEntity(entityID, pass.iboName);
           }
 				}
 				else

src/Interface/Modules/Render/ES/systems/RenderTransBasicSys.cc

@@ -157,18 +157,23 @@ class RenderBasicSysTrans :
 
     std::vector<char> sorted_buffer(pass.front().ibo.data->getBufferSize());
     char* ibuffer = reinterpret_cast<char*>(pass.front().ibo.data->getBuffer());
-    char* sbuffer = reinterpret_cast<char*>(&sorted_buffer[0]);
-    size_t tri_size = pass.front().ibo.data->getBufferSize() / num_triangles;
-
-    for (size_t j = 0; j < num_triangles; j++)
+    char* sbuffer = !sorted_buffer.empty() ? reinterpret_cast<char*>(&sorted_buffer[0]) : 0;
+    GLuint result = ibo.front().glid;
+    if (sbuffer && num_triangles > 0)
     {
-      memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
-    }
+      size_t tri_size = pass.front().ibo.data->getBufferSize() / num_triangles;
 
-    std::string transIBOName = pass.front().ibo.name + "trans";
+      for (size_t j = 0; j < num_triangles; j++)
+      {
+        memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
+      }
+
+      std::string transIBOName = pass.front().ibo.name + "trans";
+      result = iboMan.front().instance->addInMemoryIBO(sbuffer, pass.front().ibo.data->getBufferSize(), ibo.front().primMode, ibo.front().primType,
+        numPrimitives, transIBOName);
+    }
 
-    return iboMan.front().instance->addInMemoryIBO(sbuffer, pass.front().ibo.data->getBufferSize(), ibo.front().primMode, ibo.front().primType,
-      numPrimitives, transIBOName);
+    return result;
   }
 
   void groupExecute(

src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc

@@ -154,18 +154,23 @@ class RenderColorMapSysTrans :
 
     std::vector<char> sorted_buffer(pass.front().ibo.data->getBufferSize());
     char* ibuffer = reinterpret_cast<char*>(pass.front().ibo.data->getBuffer());
-    char* sbuffer = reinterpret_cast<char*>(&sorted_buffer[0]);
-    size_t tri_size = pass.front().ibo.data->getBufferSize() / num_triangles;
-
-    for (size_t j = 0; j < num_triangles; j++)
+    char* sbuffer = !sorted_buffer.empty() ? reinterpret_cast<char*>(&sorted_buffer[0]) : 0;
+    GLuint result = ibo.front().glid;
+    if (sbuffer && num_triangles > 0)
     {
-      memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
-    }
+      size_t tri_size = pass.front().ibo.data->getBufferSize() / num_triangles;
 
-    std::string transIBOName = pass.front().ibo.name + "trans";
+      for (size_t j = 0; j < num_triangles; j++)
+      {
+        memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
+      }
 
-    return iboMan.front().instance->addInMemoryIBO(sbuffer, pass.front().ibo.data->getBufferSize(), ibo.front().primMode, ibo.front().primType,
-      numPrimitives, transIBOName);
+      std::string transIBOName = pass.front().ibo.name + "trans";
+      result = iboMan.front().instance->addInMemoryIBO(sbuffer, pass.front().ibo.data->getBufferSize(), ibo.front().primMode, ibo.front().primType,
+        numPrimitives, transIBOName);
+    }
+   
+    return result;
   }
 
   void groupExecute(