switch the prevdir for each object.

Author: cbrightsci

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

@@ -83,18 +83,20 @@ class RenderBasicSysTrans :
   public:
     std::string mName;
     GLuint mSortedID;
+    Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
 
     SortedObject() :
       mSortedID(0)
     {}
 
-    SortedObject(const std::string& name, GLuint ID) :
+    SortedObject(const std::string& name, GLuint ID, Core::Geometry::Vector& dir) :
       mName(name),
-      mSortedID(ID)
+      mSortedID(ID),
+      prevDir(dir)
     {}
   };
 
-  Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
+  //Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
   std::vector<SortedObject> sortedObjects;
 
   class DepthIndex {
@@ -217,11 +219,6 @@ class RenderBasicSysTrans :
       camera.front().data.worldToView[1][2],
       camera.front().data.worldToView[2][2]);
 
-    if (sortedObjects.size() <= 0)
-    {
-      prevDir = dir;
-    }
-
     if (!drawLines)
     {
       switch (pass.front().renderState.mSortType)
@@ -247,18 +244,18 @@ class RenderBasicSysTrans :
           if (!indexed)
           {
             index = sortedObjects.size();
-            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));
+            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0, dir));
           }
 
-          Core::Geometry::Vector diff = prevDir - dir;
+          Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;
           float distance = sqrtf(Core::Geometry::Dot(diff, diff));
           if (distance >= 1.23 || sortedObjects[index].mSortedID == 0)
           {
             if (sortedObjects[index].mSortedID != 0)
             {
               iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);
             }
-            prevDir = dir;
+            sortedObjects[index].prevDir = dir;
             sortedObjects[index].mSortedID = sortObjects(dir, ibo, pass, iboMan);
           }
           iboID = sortedObjects[index].mSortedID;

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

@@ -80,18 +80,20 @@ class RenderColorMapSysTrans :
   public:
     std::string mName;
     GLuint mSortedID;
+    Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);;
 
     SortedObject() :
       mSortedID(0)
     {}
 
-    SortedObject(const std::string& name, GLuint ID) :
+    SortedObject(const std::string& name, GLuint ID, Core::Geometry::Vector& dir) :
       mName(name),
-      mSortedID(ID)
+      mSortedID(ID),
+      prevDir(dir)
     {}
   };
 
-  Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
+  //Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
   std::vector<SortedObject> sortedObjects;
 
   class DepthIndex {
@@ -214,12 +216,7 @@ class RenderColorMapSysTrans :
     Core::Geometry::Vector dir(camera.front().data.worldToView[0][2],
                                camera.front().data.worldToView[1][2],
                                camera.front().data.worldToView[2][2]);
-
-    if (sortedObjects.size() <=0)
-    {
-      prevDir = dir;
-    }
-
+    
     if (!drawLines)
     {
       switch (pass.front().renderState.mSortType)
@@ -245,18 +242,18 @@ class RenderColorMapSysTrans :
           if (!indexed)
           {
             index = sortedObjects.size();
-            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));
+            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0, dir));
           }
 
-          Core::Geometry::Vector diff = prevDir - dir;
+          Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;
           float distance = sqrtf(Core::Geometry::Dot(diff, diff));
           if (distance >= 1.23 || sortedObjects[index].mSortedID == 0)
           {
             if (sortedObjects[index].mSortedID != 0)
             {
               iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);
             }
-            prevDir = dir;
+            sortedObjects[index].prevDir = dir;
             sortedObjects[index].mSortedID = sortObjects(dir, ibo, pass, iboMan);
           }
           iboID = sortedObjects[index].mSortedID;