rainbow

Author: Xuan Huang

src/Core/Algorithms/Visualization/OsprayDataAlgorithm.cc

@@ -347,17 +347,7 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::addVol(FieldHandle field, ColorM
     if (vfield->num_values() > 0)
     {
       vfield->get_value(value, node.index());
-      //if (colorMap)
-      {
-        obj->tfn.colors.push_back(0);
-        obj->tfn.colors.push_back(0);
-        obj->tfn.colors.push_back(1);
-        obj->tfn.colors.push_back(1);
-        obj->tfn.colors.push_back(0);
-        obj->tfn.colors.push_back(0);
-        obj->tfn.opacities.push_back(0.5);
-        obj->tfn.opacities.push_back(0.5);
-      }
+      
 
       voxels.push_back(value);
     }
@@ -366,6 +356,30 @@ OsprayGeometryObjectHandle OsprayDataAlgorithm::addVol(FieldHandle field, ColorM
     vertex_new.push_back(static_cast<float>(point.z()));
 
   }
+  
+  //if (colorMap)
+  {
+    obj->tfn.colors.push_back(0);
+    obj->tfn.colors.push_back(0);
+    obj->tfn.colors.push_back(1);
+    //obj->tfn.colors.push_back(0);
+    //obj->tfn.colors.push_back(.75);
+    //obj->tfn.colors.push_back(.75);
+    
+    obj->tfn.colors.push_back(0);
+    obj->tfn.colors.push_back(1);
+    obj->tfn.colors.push_back(0);
+    
+    //obj->tfn.colors.push_back(1);
+    //obj->tfn.colors.push_back(.5);
+    //obj->tfn.colors.push_back(0);
+    obj->tfn.colors.push_back(1);
+    obj->tfn.colors.push_back(0);
+    obj->tfn.colors.push_back(0);
+    
+    obj->tfn.opacities.push_back(0.5);
+    obj->tfn.opacities.push_back(0.5);
+  }
   fieldData.color = voxels;
   fieldData.vertex = vertex_new;
 

src/Interface/Modules/Render/OsprayViewerDialog.cc

@@ -250,7 +250,9 @@ namespace
 
     const auto& func = obj->tfn;
     OSPTransferFunction transferFunction = ospNewTransferFunction("piecewise_linear");
-    OSPData cData = ospNewData(func.colors.size(), OSP_FLOAT3, func.colors.data());
+    
+    
+    OSPData cData = ospNewData(func.colors.size()/3, OSP_FLOAT3, func.colors.data());
     OSPData oData = ospNewData(func.opacities.size(), OSP_FLOAT, func.opacities.data());
 
     ospSetData(transferFunction, "colors", cData);