color map parameters work on geometry

Author: Brig Bagley

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

@@ -24,25 +24,41 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
-*/
+ */
 #ifdef OPENGL_ES
-  #ifdef GL_FRAGMENT_PRECISION_HIGH
-    // Default precision
-    precision highp float;
-  #else
-    precision mediump float;
-  #endif
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+// Default precision
+precision highp float;
+#else
+precision mediump float;
+#endif
 #endif
 
 uniform sampler1D uTX0;
-varying float	fFieldData;
+uniform float   uCMInvert;
+uniform float   uCMShift;
+uniform float   uCMResolution;
+varying float  fFieldData;
 
 // Transparency to use along side the color map.
 uniform float uTransparency;
 
 void main()
 {
-  vec4 color    = texture1D(uTX0, fFieldData);
-  color.a       = uTransparency;
-	gl_FragColor  = color;
+   float param = fFieldData;
+   float shift = uCMShift;
+   if (uCMInvert != 0.) {
+      param = 1. - param;
+      shift = shift * -1.;
+   }
+   //apply the resolution
+   int res = int(uCMResolution);
+   param = float(int(param * (float(res)))) / float(res - 1);
+   // the shift is a gamma.
+   float bp = 1. / tan((3.14159265359 / 2.) *  ( 0.5 - shift * 0.5));
+   param = pow(param,bp);
+
+   vec4 color = texture1D( uTX0, param );
+   color.a       = uTransparency;
+   gl_FragColor  = color;
 }

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

@@ -24,24 +24,27 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
-*/
+ */
 #ifdef OPENGL_ES
-  #ifdef GL_FRAGMENT_PRECISION_HIGH
-    // Default precision
-    precision highp float;
-  #else
-    precision mediump float;
-  #endif
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+// Default precision
+precision highp float;
+#else
+precision mediump float;
+#endif
 #endif
 
 uniform vec3    uCamViewVec;        // Camera 'at' vector in world space
 uniform vec4    uAmbientColor;      // Ambient color
-uniform vec4    uSpecularColor;     // Specular color     
+uniform vec4    uSpecularColor;     // Specular color
 uniform vec4    uDiffuseColor;      // Diffuse color
 uniform float   uSpecularPower;     // Specular power
 uniform vec3    uLightDirWorld;     // Directional light (world space).
 uniform float   uTransparency;
 uniform sampler1D uTX0;
+uniform float   uCMInvert;
+uniform float   uCMShift;
+uniform float   uCMResolution;
 
 // Lighting in world space. Generally, it's better to light in eye space if you
 // are dealing with point lights. Since we are only dealing with directional
@@ -51,31 +54,43 @@ varying float vFieldData;
 
 void main()
 {
-  // Remember to always negate the light direction for these lighting
-  // calculations. The dot product takes on its greatest values when the angle
-  // between the two vectors diminishes.
-  vec3  invLightDir = -uLightDirWorld;
-  vec3  normal      = normalize(vNormal);
-  float diffuse     = max(0.0, dot(normal, invLightDir));
-
-  // Note, the following is a hack due to legacy meshes still being supported.
-  // We light the object as if it was double sided. We choose the normal based
-  // on the normal that yields the largest diffuse component.
-  float diffuseInv  = max(0.0, dot(-normal, invLightDir));
-
-  if (diffuse < diffuseInv)
-  {
-    diffuse = diffuseInv;
-    normal = -normal;
-  }
-
-  vec3  reflection  = reflect(invLightDir, normal);
-  float spec        = max(0.0, dot(reflection, uCamViewVec));
-
-  vec4 diffuseColor = texture1D( uTX0, vFieldData );
-  //diffuseColor.a    = uTransparency;
-
-  spec              = pow(spec, uSpecularPower);
-  gl_FragColor      = vec4((diffuse * spec * uSpecularColor + diffuse * diffuseColor + uAmbientColor).rgb, uTransparency);
+   // Remember to always negate the light direction for these lighting
+   // calculations. The dot product takes on its greatest values when the angle
+   // between the two vectors diminishes.
+   vec3  invLightDir = -uLightDirWorld;
+   vec3  normal      = normalize(vNormal);
+   float diffuse     = max(0.0, dot(normal, invLightDir));
+
+   // Note, the following is a hack due to legacy meshes still being supported.
+   // We light the object as if it was double sided. We choose the normal based
+   // on the normal that yields the largest diffuse component.
+   float diffuseInv  = max(0.0, dot(-normal, invLightDir));
+
+   if (diffuse < diffuseInv)
+   {
+      diffuse = diffuseInv;
+      normal = -normal;
+   }
+
+   vec3  reflection  = reflect(invLightDir, normal);
+   float spec        = max(0.0, dot(reflection, uCamViewVec));
+
+   float param = vFieldData;
+   float shift = uCMShift;
+   if (uCMInvert != 0.) {
+      param = 1. - param;
+      shift = shift * -1.;
+   }
+   //apply the resolution
+   int res = int(uCMResolution);
+   param = float(int(param * (float(res)))) / float(res - 1);
+   // the shift is a gamma.
+   float bp = 1. / tan((3.14159265359 / 2.) *  ( 0.5 - shift * 0.5));
+   param = pow(param,bp);
+
+   vec4 diffuseColor = texture1D( uTX0, param );
+
+   spec              = pow(spec, uSpecularPower);
+   gl_FragColor      = vec4((diffuse * spec * uSpecularColor + diffuse * diffuseColor + uAmbientColor).rgb, uTransparency);
 }
 

src/Interface/Modules/Render/ES/shaders/DirPhongCMap.vs

@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 // Uniforms
 uniform mat4    uProjIVObject;      // Projection transform * Inverse View
@@ -43,9 +43,9 @@ varying float   vFieldData;
 
 void main( void )
 {
-  // Todo: Add gamma correction factor of 2.2. For textures, we assume that it
-  // was generated in gamma space, and we need to convert it to linear space.
-  vNormal  = vec3(uObject * vec4(aNormal, 0.0));
-  vFieldData  = (aFieldData - uMinVal) / (uMaxVal - uMinVal);
-  gl_Position = uProjIVObject * vec4(aPos, 1.0);
+   // Todo: Add gamma correction factor of 2.2. For textures, we assume that it
+   // was generated in gamma space, and we need to convert it to linear space.
+   vNormal  = vec3(uObject * vec4(aNormal, 0.0));
+   vFieldData = (aFieldData - uMinVal) / (uMaxVal - uMinVal);
+   gl_Position = uProjIVObject * vec4(aPos, 1.0);
 }

src/Modules/Visualization/ShowField.cc

@@ -1436,6 +1436,11 @@ void ShowFieldModule::renderEdges(
   if (colorScheme == GeometryObject::COLOR_MAP) {
     shader = state.get(RenderState::USE_CYLINDER) ? "Shaders/DirPhongCMap" : "Shaders/ColorMap";
     attribs.push_back(GeometryObject::SpireVBO::AttributeData("aFieldData", 1 * sizeof(float)));
+    //push the color map parameters
+    ColorMap * map = colorMap.get().get();
+    uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMInvert",map->getColorMapInvert()?1.f:0.f));
+    uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMShift",static_cast<float>(map->getColorMapShift())));
+    uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMResolution",static_cast<float>(map->getColorMapResolution())));
   }
   else if (colorScheme == GeometryObject::COLOR_IN_SITU) {
     if (state.get(RenderState::USE_CYLINDER)) {