Changeset 5119 for geovis/trunk/ColorMap.cpp

Timestamp:

Mar 11, 2015, 3:11:07 AM (9 years ago)

Author:

ldelgass

Message:

Add legend option for blending against a background color

File:

• geovis/trunk/ColorMap.cpp (modified) (5 diffs)

geovis/trunk/ColorMap.cpp

@@ -34 +34 @@
             float x = (float)i/(height-1);
             float val = min + (max - min) * x;
-            osg::Vec4f rgb = map->getColor(val);
+            osg::Vec4f rgba = map->getColor(val);
+            float opacity = rgba[3];
             unsigned char color[3];
             if (opaque) {
-                color[0] = (unsigned char)(255. * (bgr ? rgb[2] : rgb[0]));
-                color[1] = (unsigned char)(255. * rgb[1]);
-                color[2] = (unsigned char)(255. * (bgr ? rgb[0] : rgb[2]));
+                color[0] = (unsigned char)(255. * (bgr ? rgba[2] : rgba[0]));
+                color[1] = (unsigned char)(255. * rgba[1]);
+                color[2] = (unsigned char)(255. * (bgr ? rgba[0] : rgba[2]));
             } else {
-                float opacity = rgb[3];
-                color[0] = (unsigned char)(255. * (bgColor[0] * (1.0 - opacity) + (bgr ? rgb[2] : rgb[0]) * opacity));
-                color[1] = (unsigned char)(255. * (bgColor[1] * (1.0 - opacity) + rgb[1] * opacity));
-                color[2] = (unsigned char)(255. * (bgColor[2] * (1.0 - opacity) + (bgr ? rgb[0] : rgb[2]) * opacity));
+                color[0] = (unsigned char)(255. * (bgColor[0] * (1.0 - opacity) + (bgr ? rgba[2] : rgba[0]) * opacity));
+                color[1] = (unsigned char)(255. * (bgColor[1] * (1.0 - opacity) + rgba[1] * opacity));
+                color[2] = (unsigned char)(255. * (bgColor[2] * (1.0 - opacity) + (bgr ? rgba[0] : rgba[2]) * opacity));
             }
             for (int j = 0; j < width; j++) {
@@ -50 +50 @@
                 dst += 3;
                 if (bytesPerPixel == 4) {
-                    *(dst++) = (unsigned char)255.;
+                    *(dst++) = (unsigned char)(255. * (opaque ? 1.0 : opacity));
                 }
             }
@@ -60 +60 @@
                 float val = min + (max - min) * x;
                 osg::Vec4f rgb = map->getColor(val);
+                double opacity = rgb[3];
                 unsigned char color[3];
                 if (opaque) {
@@ -66 +67 @@
                     color[2] = (unsigned char)(255. * (bgr ? rgb[0] : rgb[2]));
                 } else {
-                    double opacity = rgb[3];
                     color[0] = (unsigned char)(255. * (bgColor[0] * (1.0 - opacity) + (bgr ? rgb[2] : rgb[0]) * opacity));
                     color[1] = (unsigned char)(255. * (bgColor[1] * (1.0 - opacity) + rgb[1] * opacity));
@@ -74 +74 @@
                 dst += 3;
                 if (bytesPerPixel == 4) {
-                    *(dst++) = (unsigned char)255.;
+                    *(dst++) = (unsigned char)(255. * (opaque ? 1.0 : opacity));
                 }
             }