Transparent Edges work Closes #820

Author: cbrightsci

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

@@ -101,7 +101,7 @@ class RenderBasicSysTrans :
     if (!srstate.front().state.get(RenderState::USE_TRANSPARENCY))
     {
       return;
-    }
+    }   
 
     GLuint iboID = ibo.front().glid;
     GLuint iboXID = ibo.front().glid;
@@ -110,6 +110,7 @@ class RenderBasicSysTrans :
     GLuint iboNegXID = ibo.front().glid;
     GLuint iboNegYID = ibo.front().glid;
     GLuint iboNegZID = ibo.front().glid;
+    GLuint iboLinesID = ibo.front().glid;
 
     int index = 0;
     for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
@@ -126,30 +127,39 @@ class RenderBasicSysTrans :
         iboNegYID = it->glid;
       if (index == 5)
         iboNegZID = it->glid;
+      if (index == 6)
+        iboLinesID = it->glid;
     }
 
-    Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],
-                                      camera.front().data.worldToView[1][2],
-                                      camera.front().data.worldToView[2][2]);
-
-    Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),
-                                      abs(camera.front().data.worldToView[1][2]),
-                                      abs(camera.front().data.worldToView[2][2]));
-
-    double xORy = absDir.x() > absDir.y() ? absDir.x() : absDir.y();
-    double orZ = absDir.z() > xORy ? absDir.z() : xORy;
-
-    if (orZ == absDir.x())
+    if (ibo.front().primMode == Core::Datatypes::GeometryObject::SpireIBO::LINES)
     {
-      iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+      iboID = iboLinesID;
     }
-    if (orZ == absDir.y())
-    {
-      iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
-    }
-    if (orZ == absDir.z())
+    else
     {
-      iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+      Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],
+        camera.front().data.worldToView[1][2],
+        camera.front().data.worldToView[2][2]);
+
+      Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),
+        abs(camera.front().data.worldToView[1][2]),
+        abs(camera.front().data.worldToView[2][2]));
+
+      double xORy = absDir.x() > absDir.y() ? absDir.x() : absDir.y();
+      double orZ = absDir.z() > xORy ? absDir.z() : xORy;
+
+      if (orZ == absDir.x())
+      {
+        iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+      }
+      if (orZ == absDir.y())
+      {
+        iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
+      }
+      if (orZ == absDir.z())
+      {
+        iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+      }
     }
 
     // Setup *everything*. We don't want to enter multiple conditional

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

@@ -110,6 +110,7 @@ class RenderColorMapSysTrans :
     GLuint iboNegXID = ibo.front().glid;
     GLuint iboNegYID = ibo.front().glid;
     GLuint iboNegZID = ibo.front().glid;
+    GLuint iboLinesID = ibo.front().glid;
 
     int index = 0;
     for (auto it = ibo.begin(); it != ibo.end(); ++it, ++index)
@@ -126,30 +127,39 @@ class RenderColorMapSysTrans :
         iboNegYID = it->glid;
       if (index == 5)
         iboNegZID = it->glid;
-    } 
-
-    Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],
-                                      camera.front().data.worldToView[1][2],
-                                      camera.front().data.worldToView[2][2]);
-    
-    Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),
-                                      abs(camera.front().data.worldToView[1][2]),
-                                      abs(camera.front().data.worldToView[2][2]));
-
-    double xORy = absDir.x() > absDir.y() ? absDir.x() : absDir.y();
-    double orZ = absDir.z() > xORy ? absDir.z() : xORy;
-
-    if (orZ == absDir.x())
-    {
-      iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+      if (index == 6)
+        iboLinesID = it->glid;
     }
-    if (orZ == absDir.y())
+
+    if (ibo.front().primMode == Core::Datatypes::GeometryObject::SpireIBO::LINES)
     {
-      iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
+      iboID = iboLinesID;
     }
-    if (orZ == absDir.z())
+    else
     {
-      iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+      Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],
+        camera.front().data.worldToView[1][2],
+        camera.front().data.worldToView[2][2]);
+
+      Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),
+        abs(camera.front().data.worldToView[1][2]),
+        abs(camera.front().data.worldToView[2][2]));
+
+      double xORy = absDir.x() > absDir.y() ? absDir.x() : absDir.y();
+      double orZ = absDir.z() > xORy ? absDir.z() : xORy;
+
+      if (orZ == absDir.x())
+      {
+        iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+      }
+      if (orZ == absDir.y())
+      {
+        iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
+      }
+      if (orZ == absDir.z())
+      {
+        iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+      }
     }
 
     // Setup *everything*. We don't want to enter multiple conditional