added transparency to colormaps

Author: Haydelj

src/Core/Datatypes/ColorMap.cc

@@ -199,21 +199,23 @@ ColorRGB ColorMap::getColorMapVal(double v) const
   //return colorWithoutAlpha;
 }
 
-ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha)
+ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha) const
 {
   double a = alpha(transformed);
   return ColorRGB(colorWithoutAlpha.r(), colorWithoutAlpha.g(), colorWithoutAlpha.b(), a);
 }
 
-double ColorMap::alpha(double transformedValue)
+double ColorMap::alpha(double transformedValue) const
 {
+  transformedValue *= 364.0;
   std::cout << transformedValue << "\n";
+  if(alphaLookup_.size() == 0) return 0.5;
   int i;
-  for(i = 0; (i < alphaLookup_.size()) && (transformedValue < alphaLookup_[i]); i += 2);
+  for(i = 0; (i < alphaLookup_.size()) && (alphaLookup_[i] < transformedValue); i += 2);
 
   double startx = 0.0;
   double starty = 40.0;
-  double endx = 360.0;
+  double endx = 364.0;
   double endy = 40.0;
 
   if(i == 0)
@@ -223,16 +225,22 @@ double ColorMap::alpha(double transformedValue)
   }
   else if(i == alphaLookup_.size())
   {
-    startx = alphaLookup_[i];
+    startx = alphaLookup_[i - 2];
     starty = alphaLookup_[i - 1];
   }
   else
   {
+    std::cout << "normal\n";
     startx = alphaLookup_[i - 2];
     starty = alphaLookup_[i - 1];
     endx = alphaLookup_[i + 0];
     endy = alphaLookup_[i + 1];
   }
+
+  double interp = (transformedValue - startx) / (endx - startx);
+  double value = ((1.0f - interp) * starty + (interp) * endy) / 80.0;
+  std::cout << startx << " : " << endx << " : " << interp << "\n";
+  return value;
 }
 
 

src/Core/Datatypes/ColorMap.h

@@ -63,6 +63,7 @@ namespace Datatypes {
     bool getColorMapInvert() const;
     double getColorMapRescaleScale() const;
     double getColorMapRescaleShift() const;
+    std::vector<double> getAlphaLookup() const {return alphaLookup_;}
 
     ColorRGB valueToColor(double scalar) const;
     ColorRGB valueToColor(Core::Geometry::Tensor &tensor) const;
@@ -74,8 +75,8 @@ namespace Datatypes {
     ///<< Internal functions.
     Core::Datatypes::ColorRGB getColorMapVal(double v) const;
     double getTransformedValue(double v) const;
-    ColorRGB applyAlpha(double transformed, ColorRGB colorWithoutAlpha);
-    double alpha(double transformedValue);
+    ColorRGB applyAlpha(double transformed, ColorRGB colorWithoutAlpha) const;
+    double alpha(double transformedValue) const;
 
     ColorMapStrategyHandle color_;
     ///<< The colormap's name.

src/Interface/Modules/Render/ES/shaders/Flat_ColorMap.fs

@@ -119,7 +119,7 @@ void main()
   else               colorMapValue = texture2D(uTX0, vec2(vTexCoords.x, 0.0));
 
   vec3 diffuseColor = colorMapValue.rgb;
-  float transparency = uTransparency;
+  float transparency = colorMapValue.a;
 
   gl_FragColor = vec4(diffuseColor, transparency);
 

src/Interface/Modules/Render/ES/shaders/Phong_ColorMap.fs

@@ -143,7 +143,7 @@ void main()
   vec3 diffuseColor = colorMapValue.rgb;
   vec3 specularColor = uSpecularColor.rgb;
   vec3 ambientColor = uAmbientColor.rgb;
-  float transparency = uTransparency;
+  float transparency = colorMapValue.a;
 
   vec3 normal = normalize(vNormal);
   if (gl_FrontFacing) normal = -normal;

src/Modules/Visualization/CreateStandardColorMap.cc

@@ -77,7 +77,7 @@ void CreateStandardColorMap::execute()
     //just in case there is a problem with the QT values...
     res = std::min(std::max(res,2),256);
     shift = std::min(std::max(shift,-1.),1.);
-    sendOutput(ColorMapObject, StandardColorMapFactory::create(name, res, shift, inv));
+    sendOutput(ColorMapObject, StandardColorMapFactory::create(name, res, shift, inv, 0.5, 1.0, points));
   }
 }
 

src/Modules/Visualization/ShowField.cc

@@ -481,7 +481,7 @@ namespace
 
     textureMap = StandardColorMapFactory::create(realColorMap->getColorMapName(),
       realColorMap->getColorMapResolution(), realColorMap->getColorMapShift(),
-      realColorMap->getColorMapInvert());
+      realColorMap->getColorMapInvert(), 0.5, 1.0, realColorMap->getAlphaLookup());
 
     coordinateMap = StandardColorMapFactory::create("Grayscale", 256, 0, false,
       realColorMap->getColorMapRescaleScale(), realColorMap->getColorMapRescaleShift());