Merge pull request #880 from SCIInstitute/intermittent-trans

dcwhite · dcwhite · commit 6a4014e1c421 · 2015-02-13T23:58:40.000-07:00
Intermittent trans
diff --git a/src/Interface/Modules/Render/ES/SRInterface.cc b/src/Interface/Modules/Render/ES/SRInterface.cc
@@ -96,7 +96,7 @@ namespace SCIRun {
 
       showOrientation_ = true;
       autoRotate_ = false;
-      mRenderSortType = RenderState::TransparencySortType::CONTINUOUS_SORT;
+      mRenderSortType = RenderState::TransparencySortType::UPDATE_SORT;
 			// Construct ESCore. We will need to bootstrap the core. We should also
 			// probably add utility static classes.
 			setupCore();
diff --git a/src/Interface/Modules/Render/ES/systems/RenderTransBasicSys.cc b/src/Interface/Modules/Render/ES/systems/RenderTransBasicSys.cc
@@ -83,18 +83,19 @@ 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);
   std::vector<SortedObject> sortedObjects;
 
   class DepthIndex {
@@ -214,13 +215,8 @@ class RenderBasicSysTrans :
     GLuint iboID = ibo.front().glid;
 
     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;
-    }
+                               camera.front().data.worldToView[1][2],
+                               camera.front().data.worldToView[2][2]);
 
     if (!drawLines)
     {
@@ -229,7 +225,6 @@ class RenderBasicSysTrans :
         case RenderState::TransparencySortType::CONTINUOUS_SORT:
         {
           iboID = sortObjects(dir, ibo, pass, iboMan);
-          //std::cout << "continuous" << std::endl;
           break;
         }
         case RenderState::TransparencySortType::UPDATE_SORT:
@@ -247,22 +242,21 @@ 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;
-          float distance = sqrtf(Core::Geometry::Dot(diff, diff));
+          Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;
+          double 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;
-          //::cout << "update" << std::endl;
           break;
         }
         case RenderState::TransparencySortType::LISTS_SORT:
@@ -291,11 +285,6 @@ class RenderBasicSysTrans :
               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]));
@@ -305,17 +294,16 @@ class RenderBasicSysTrans :
 
           if (orZ == absDir.x())
           {
-            iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+            iboID = dir.x() < orZ ? iboNegXID : iboXID;
           }
           if (orZ == absDir.y())
           {
-            iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
+            iboID = dir.y() < orZ ? iboNegYID : iboYID;
           }
           if (orZ == absDir.z())
           {
-            iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+            iboID = dir.z() < orZ ? iboNegZID : iboZID;
           }
-          //std::cout << "lists" << std::endl;
           break;
         }
       }
diff --git a/src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc b/src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc
@@ -80,18 +80,19 @@ 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);
   std::vector<SortedObject> sortedObjects;
 
   class DepthIndex {
@@ -214,20 +215,14 @@ 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)
       {
         case RenderState::TransparencySortType::CONTINUOUS_SORT:
         {
           iboID = sortObjects(dir, ibo, pass, iboMan);
-          //std::cout << "continuous" << std::endl;
           break;
         }
         case RenderState::TransparencySortType::UPDATE_SORT:
@@ -245,22 +240,21 @@ 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;
-          float distance = sqrtf(Core::Geometry::Dot(diff, diff));
+          Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;
+          double 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;
-          //::cout << "update" << std::endl;
           break;
         }
         case RenderState::TransparencySortType::LISTS_SORT:
@@ -289,11 +283,6 @@ class RenderColorMapSysTrans :
               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]));
@@ -303,17 +292,16 @@ class RenderColorMapSysTrans :
 
           if (orZ == absDir.x())
           {
-            iboID = currentDir.x() < orZ ? iboNegXID : iboXID;
+            iboID = dir.x() < orZ ? iboNegXID : iboXID;
           }
           if (orZ == absDir.y())
           {
-            iboID = currentDir.y() < orZ ? iboNegYID : iboYID;
+            iboID = dir.y() < orZ ? iboNegYID : iboYID;
           }
           if (orZ == absDir.z())
           {
-            iboID = currentDir.z() < orZ ? iboNegZID : iboZID;
+            iboID = dir.z() < orZ ? iboNegZID : iboZID;
           }
-          //std::cout << "lists" << std::endl;
           break;
         }
       }
diff --git a/src/Interface/Modules/Render/ViewSceneControls.ui b/src/Interface/Modules/Render/ViewSceneControls.ui
@@ -102,7 +102,7 @@
           <string>Continuous Sort</string>
          </property>
          <property name="checked">
-          <bool>true</bool>
+          <bool>false</bool>
          </property>
         </widget>
         <widget class="QRadioButton" name="updateSortRadioButton_">
@@ -117,6 +117,9 @@
          <property name="text">
           <string>Intermittent Sort</string>
          </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
         </widget>
         <widget class="QRadioButton" name="listSortRadioButton_">
          <property name="geometry">
diff --git a/src/Interface/Modules/Render/ViewSceneControlsDock.cc b/src/Interface/Modules/Render/ViewSceneControlsDock.cc
@@ -68,6 +68,9 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo
   //View Tab
   groupBox->setVisible(false);
 
+  //Render Tab
+  groupBox_6->setVisible(false);
+
 }
 
 void ViewSceneControlsDock::setSampleColor(const QColor& color)

Original file line number	Diff line number	Diff line change
`@@ -83,18 +83,19 @@ class RenderBasicSysTrans :`
`83`	`83`	`public:`
`84`	`84`	`std::string mName;`
`85`	`85`	`GLuint mSortedID;`
	`86`	`+ Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);`
`86`	`87`
`87`	`88`	`SortedObject() :`
`88`	`89`	`mSortedID(0)`
`89`	`90`	`{}`
`90`	`91`
`91`		`- SortedObject(const std::string& name, GLuint ID) :`
	`92`	`+ SortedObject(const std::string& name, GLuint ID, Core::Geometry::Vector& dir) :`
`92`	`93`	`mName(name),`
`93`		`- mSortedID(ID)`
	`94`	`+ mSortedID(ID),`
	`95`	`+ prevDir(dir)`
`94`	`96`	`{}`
`95`	`97`	`};`
`96`	`98`
`97`		`- Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);`
`98`	`99`	`std::vector<SortedObject> sortedObjects;`
`99`	`100`
`100`	`101`	`class DepthIndex {`
`@@ -214,13 +215,8 @@ class RenderBasicSysTrans :`
`214`	`215`	`GLuint iboID = ibo.front().glid;`
`215`	`216`
`216`	`217`	`Core::Geometry::Vector dir(camera.front().data.worldToView[0][2],`
`217`		`- camera.front().data.worldToView[1][2],`
`218`		`- camera.front().data.worldToView[2][2]);`
`219`		`-`
`220`		`- if (sortedObjects.size() <= 0)`
`221`		`- {`
`222`		`- prevDir = dir;`
`223`		`- }`
	`218`	`+ camera.front().data.worldToView[1][2],`
	`219`	`+ camera.front().data.worldToView[2][2]);`
`224`	`220`
`225`	`221`	`if (!drawLines)`
`226`	`222`	`{`
`@@ -229,7 +225,6 @@ class RenderBasicSysTrans :`
`229`	`225`	`case RenderState::TransparencySortType::CONTINUOUS_SORT:`
`230`	`226`	`{`
`231`	`227`	`iboID = sortObjects(dir, ibo, pass, iboMan);`
`232`		`- //std::cout << "continuous" << std::endl;`
`233`	`228`	`break;`
`234`	`229`	`}`
`235`	`230`	`case RenderState::TransparencySortType::UPDATE_SORT:`
`@@ -247,22 +242,21 @@ class RenderBasicSysTrans :`
`247`	`242`	`if (!indexed)`
`248`	`243`	`{`
`249`	`244`	`index = sortedObjects.size();`
`250`		`- sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));`
	`245`	`+ sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0, dir));`
`251`	`246`	`}`
`252`	`247`
`253`		`- Core::Geometry::Vector diff = prevDir - dir;`
`254`		`- float distance = sqrtf(Core::Geometry::Dot(diff, diff));`
	`248`	`+ Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;`
	`249`	`+ double distance = sqrtf(Core::Geometry::Dot(diff, diff));`
`255`	`250`	`if (distance >= 1.23 \|\| sortedObjects[index].mSortedID == 0)`
`256`	`251`	`{`
`257`	`252`	`if (sortedObjects[index].mSortedID != 0)`
`258`	`253`	`{`
`259`	`254`	`iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);`
`260`	`255`	`}`
`261`		`- prevDir = dir;`
	`256`	`+ sortedObjects[index].prevDir = dir;`
`262`	`257`	`sortedObjects[index].mSortedID = sortObjects(dir, ibo, pass, iboMan);`
`263`	`258`	`}`
`264`	`259`	`iboID = sortedObjects[index].mSortedID;`
`265`		`- //::cout << "update" << std::endl;`
`266`	`260`	`break;`
`267`	`261`	`}`
`268`	`262`	`case RenderState::TransparencySortType::LISTS_SORT:`
`@@ -291,11 +285,6 @@ class RenderBasicSysTrans :`
`291`	`285`	`iboNegZID = it->glid;`
`292`	`286`	`}`
`293`	`287`
`294`		`- Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],`
`295`		`- camera.front().data.worldToView[1][2],`
`296`		`- camera.front().data.worldToView[2][2]);`
`297`		`-`
`298`		`-`
`299`	`288`	`Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),`
`300`	`289`	`abs(camera.front().data.worldToView[1][2]),`
`301`	`290`	`abs(camera.front().data.worldToView[2][2]));`
`@@ -305,17 +294,16 @@ class RenderBasicSysTrans :`
`305`	`294`
`306`	`295`	`if (orZ == absDir.x())`
`307`	`296`	`{`
`308`		`- iboID = currentDir.x() < orZ ? iboNegXID : iboXID;`
	`297`	`+ iboID = dir.x() < orZ ? iboNegXID : iboXID;`
`309`	`298`	`}`
`310`	`299`	`if (orZ == absDir.y())`
`311`	`300`	`{`
`312`		`- iboID = currentDir.y() < orZ ? iboNegYID : iboYID;`
	`301`	`+ iboID = dir.y() < orZ ? iboNegYID : iboYID;`
`313`	`302`	`}`
`314`	`303`	`if (orZ == absDir.z())`
`315`	`304`	`{`
`316`		`- iboID = currentDir.z() < orZ ? iboNegZID : iboZID;`
	`305`	`+ iboID = dir.z() < orZ ? iboNegZID : iboZID;`
`317`	`306`	`}`
`318`		`- //std::cout << "lists" << std::endl;`
`319`	`307`	`break;`
`320`	`308`	`}`
`321`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,18 +80,19 @@ class RenderColorMapSysTrans :`
`80`	`80`	`public:`
`81`	`81`	`std::string mName;`
`82`	`82`	`GLuint mSortedID;`
	`83`	`+ Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);;`
`83`	`84`
`84`	`85`	`SortedObject() :`
`85`	`86`	`mSortedID(0)`
`86`	`87`	`{}`
`87`	`88`
`88`		`- SortedObject(const std::string& name, GLuint ID) :`
	`89`	`+ SortedObject(const std::string& name, GLuint ID, Core::Geometry::Vector& dir) :`
`89`	`90`	`mName(name),`
`90`		`- mSortedID(ID)`
	`91`	`+ mSortedID(ID),`
	`92`	`+ prevDir(dir)`
`91`	`93`	`{}`
`92`	`94`	`};`
`93`	`95`
`94`		`- Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);`
`95`	`96`	`std::vector<SortedObject> sortedObjects;`
`96`	`97`
`97`	`98`	`class DepthIndex {`
`@@ -214,20 +215,14 @@ class RenderColorMapSysTrans :`
`214`	`215`	`Core::Geometry::Vector dir(camera.front().data.worldToView[0][2],`
`215`	`216`	`camera.front().data.worldToView[1][2],`
`216`	`217`	`camera.front().data.worldToView[2][2]);`
`217`		`-`
`218`		`- if (sortedObjects.size() <=0)`
`219`		`- {`
`220`		`- prevDir = dir;`
`221`		`- }`
`222`		`-`
	`218`	`+`
`223`	`219`	`if (!drawLines)`
`224`	`220`	`{`
`225`	`221`	`switch (pass.front().renderState.mSortType)`
`226`	`222`	`{`
`227`	`223`	`case RenderState::TransparencySortType::CONTINUOUS_SORT:`
`228`	`224`	`{`
`229`	`225`	`iboID = sortObjects(dir, ibo, pass, iboMan);`
`230`		`- //std::cout << "continuous" << std::endl;`
`231`	`226`	`break;`
`232`	`227`	`}`
`233`	`228`	`case RenderState::TransparencySortType::UPDATE_SORT:`
`@@ -245,22 +240,21 @@ class RenderColorMapSysTrans :`
`245`	`240`	`if (!indexed)`
`246`	`241`	`{`
`247`	`242`	`index = sortedObjects.size();`
`248`		`- sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));`
	`243`	`+ sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0, dir));`
`249`	`244`	`}`
`250`	`245`
`251`		`- Core::Geometry::Vector diff = prevDir - dir;`
`252`		`- float distance = sqrtf(Core::Geometry::Dot(diff, diff));`
	`246`	`+ Core::Geometry::Vector diff = sortedObjects[index].prevDir - dir;`
	`247`	`+ double distance = sqrtf(Core::Geometry::Dot(diff, diff));`
`253`	`248`	`if (distance >= 1.23 \|\| sortedObjects[index].mSortedID == 0)`
`254`	`249`	`{`
`255`	`250`	`if (sortedObjects[index].mSortedID != 0)`
`256`	`251`	`{`
`257`	`252`	`iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);`
`258`	`253`	`}`
`259`		`- prevDir = dir;`
	`254`	`+ sortedObjects[index].prevDir = dir;`
`260`	`255`	`sortedObjects[index].mSortedID = sortObjects(dir, ibo, pass, iboMan);`
`261`	`256`	`}`
`262`	`257`	`iboID = sortedObjects[index].mSortedID;`
`263`		`- //::cout << "update" << std::endl;`
`264`	`258`	`break;`
`265`	`259`	`}`
`266`	`260`	`case RenderState::TransparencySortType::LISTS_SORT:`
`@@ -289,11 +283,6 @@ class RenderColorMapSysTrans :`
`289`	`283`	`iboNegZID = it->glid;`
`290`	`284`	`}`
`291`	`285`
`292`		`- Core::Geometry::Vector currentDir(camera.front().data.worldToView[0][2],`
`293`		`- camera.front().data.worldToView[1][2],`
`294`		`- camera.front().data.worldToView[2][2]);`
`295`		`-`
`296`		`-`
`297`	`286`	`Core::Geometry::Vector absDir(abs(camera.front().data.worldToView[0][2]),`
`298`	`287`	`abs(camera.front().data.worldToView[1][2]),`
`299`	`288`	`abs(camera.front().data.worldToView[2][2]));`
`@@ -303,17 +292,16 @@ class RenderColorMapSysTrans :`
`303`	`292`
`304`	`293`	`if (orZ == absDir.x())`
`305`	`294`	`{`
`306`		`- iboID = currentDir.x() < orZ ? iboNegXID : iboXID;`
	`295`	`+ iboID = dir.x() < orZ ? iboNegXID : iboXID;`
`307`	`296`	`}`
`308`	`297`	`if (orZ == absDir.y())`
`309`	`298`	`{`
`310`		`- iboID = currentDir.y() < orZ ? iboNegYID : iboYID;`
	`299`	`+ iboID = dir.y() < orZ ? iboNegYID : iboYID;`
`311`	`300`	`}`
`312`	`301`	`if (orZ == absDir.z())`
`313`	`302`	`{`
`314`		`- iboID = currentDir.z() < orZ ? iboNegZID : iboZID;`
	`303`	`+ iboID = dir.z() < orZ ? iboNegZID : iboZID;`
`315`	`304`	`}`
`316`		`- //std::cout << "lists" << std::endl;`
`317`	`305`	`break;`
`318`	`306`	`}`
`319`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo`
`68`	`68`	`//View Tab`
`69`	`69`	`groupBox->setVisible(false);`
`70`	`70`
	`71`	`+ //Render Tab`
	`72`	`+ groupBox_6->setVisible(false);`
	`73`	`+`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`void ViewSceneControlsDock::setSampleColor(const QColor& color)`