Edges work when they aren't transparent.

This is now at the same state as the slower transparency.

Author: cbrightsci

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

@@ -378,7 +378,7 @@ namespace SCIRun {
         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 (int i = 0; i <= 6; ++i)
         {
           std::string name = ibo.name;
 
@@ -387,62 +387,69 @@ namespace SCIRun {
             dir = Core::Geometry::Vector(1.0, 0.0, 0.0);
             name += "X";
           }
-          else if (i == 1)
+          if (i == 1)
           {
             dir = Core::Geometry::Vector(0.0, 1.0, 0.0);
             name += "Y";
           }
-          else if (i == 2)
+          if (i == 2)
           {
             dir = Core::Geometry::Vector(0.0, 0.0, 1.0);
             name += "Z";
           }
-          else if (i == 3)
+          if (i == 3)
           {
             dir = Core::Geometry::Vector(-1.0, 0.0, 0.0);
             name += "NegX";
           }
-          else if (i == 4)
+          if (i == 4)
           {
             dir = Core::Geometry::Vector(0.0, -1.0, 0.0);
             name += "NegY";
           }
-          else if (i == 5)
+          if (i == 5)
           {
             dir = Core::Geometry::Vector(0.0, 0.0, -1.0);
             name += "NegZ";
           }
-
-          for (size_t j = 0; j < num_triangles; j++)
+          if (i < 6)
           {
-            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]);
+            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++)
+            iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
+          }
+          else
           {
-            memcpy(sbuffer + j * tri_size, ibuffer + rel_depth[j].mIndex * tri_size, tri_size);
+            int numPrimitives = ibo.data->getBufferSize() / ibo.indexSize;
+            iboMan.addInMemoryIBO(ibo.data->getBuffer(), ibo.data->getBufferSize(), primitive, primType, numPrimitives, ibo.name);
           }
-
-          iboMan.addInMemoryIBO(sbuffer, ibo.data->getBufferSize(), primitive, primType, numPrimitives, name);
         }        
 			}
 
@@ -464,7 +471,7 @@ namespace SCIRun {
 				{   
           //reorderIBO(pass);
 					addVBOToEntity(entityID, pass.vboName);
-          for (int i = 0; i < 6; ++i)
+          for (int i = 0; i <= 6; ++i)
           {
             std::string name = pass.iboName;
             if (i == 0)

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

@@ -103,6 +103,15 @@ class RenderBasicSys :
       return;
     }
 
+    GLuint iboID = ibo.front().glid;
+
+    int index = 0;
+    for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
+    {
+      if (index == 6)
+        iboID = it->glid;
+    }
+
     // Setup *everything*. We don't want to enter multiple conditional
     // statements if we can avoid it. So we assume everything has not been
     // setup (including uniforms) if the simple geom hasn't been setup.
@@ -158,7 +167,7 @@ class RenderBasicSys :
 
     // Bind VBO and IBO
     GL(glBindBuffer(GL_ARRAY_BUFFER, vbo.front().glid));
-    GL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo.front().glid));
+    GL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, iboID));
 
     bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
     bool cullFace = glIsEnabled(GL_CULL_FACE);

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

@@ -103,6 +103,15 @@ class RenderColorMapSys :
       return;
     }
 
+    GLuint iboID = ibo.front().glid;
+
+    int index = 0;
+    for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
+    {
+      if (index == 6)
+        iboID = it->glid;
+    }
+
     // Setup *everything*. We don't want to enter multiple conditional
     // statements if we can avoid it. So we assume everything has not been
     // setup (including uniforms) if the simple geom hasn't been setup.
@@ -158,7 +167,7 @@ class RenderColorMapSys :
 
     // Bind VBO and IBO
     GL(glBindBuffer(GL_ARRAY_BUFFER, vbo.front().glid));
-    GL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo.front().glid));
+    GL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, iboID));
 
     // Bind any common uniforms.
     if (commonUniforms.size() > 0)

src/Modules/Visualization/ShowField.cc

@@ -420,6 +420,7 @@ void ShowFieldModule::renderFacesLinear(
     //TODO fix so the withNormals tp be woth lighting is called correctly, and the meshes are fixed.
     if (withNormals)
     {
+      /// Fix normal of Quads
       if (points.size() == 4)
       {
         Core::Geometry::Vector edge1 = points[1] - points[0];
@@ -436,6 +437,7 @@ void ShowFieldModule::renderFacesLinear(
           normals[i] = norm;
         }
       }
+      /// Fix Normals of Tris
       else
       {
         Core::Geometry::Vector edge1 = points[1] - points[0];
@@ -448,6 +450,7 @@ void ShowFieldModule::renderFacesLinear(
         {
           normals[i] = norm;
         }
+        //For future reference for a try at smoother rendering
         /*
         for (size_t i = 0; i < nodes.size(); i++)
         {