Commit 8bc05e46 authored by schurade's avatar schurade

[CHANGE] atlas colormap produces brighter colors now

parent 88a2e07e
...@@ -134,27 +134,70 @@ vec3 atlasColorMap ( in float value ) ...@@ -134,27 +134,70 @@ vec3 atlasColorMap ( in float value )
float r = 0.0; float r = 0.0;
float g = 0.0; float g = 0.0;
float b = 0.0; float b = 0.0;
float mult = 1.0;
if ( val == 0.0 )
{
return vec3( 0.0 );
}
if ( isBitSet( val, 0.0 ) ) if ( isBitSet( val, 0.0 ) )
r = 0.4; b = 1.0;
if ( isBitSet( val, 1.0 ) ) if ( isBitSet( val, 1.0 ) )
g = 0.4; g = 1.0;
if ( isBitSet( val, 2.0 ) ) if ( isBitSet( val, 2.0 ) )
b = 0.4; r = 1.0;
if ( isBitSet( val, 3.0 ) ) if ( isBitSet( val, 3.0 ) )
b += 0.3; {
mult -= 0.15;
if ( r < 1.0 && g < 1.0 && b < 1.0 )
{
r = 1.0;
g = 1.0;
}
}
if ( isBitSet( val, 4.0 ) ) if ( isBitSet( val, 4.0 ) )
r += 0.3; {
mult -= 0.15;
if ( r < 1.0 && g < 1.0 && b < 1.0 )
{
b = 1.0;
g = 1.0;
}
}
if ( isBitSet( val, 5.0 ) ) if ( isBitSet( val, 5.0 ) )
g += 0.3; {
mult -= 0.15;
if ( r < 1.0 && g < 1.0 && b < 1.0 )
{
r = 1.0;
b = 1.0;
}
}
if ( isBitSet( val, 6.0 ) ) if ( isBitSet( val, 6.0 ) )
r += 0.3; {
mult -= 0.15;
if ( r < 1.0 && g < 1.0 && b < 1.0 )
{
g = 1.0;
}
}
if ( isBitSet( val, 7.0 ) ) if ( isBitSet( val, 7.0 ) )
b += 0.3; {
mult -= 0.15;
if ( r < 1.0 && g < 1.0 && b < 1.0 )
{
r = 1.0;
}
}
r *= 1.5; r *= mult;
g *= 1.5; g *= mult;
b *= 1.5; b *= mult;
clamp( r, 0., 1.); clamp( r, 0., 1.);
clamp( g, 0., 1.); clamp( g, 0., 1.);
...@@ -163,6 +206,8 @@ vec3 atlasColorMap ( in float value ) ...@@ -163,6 +206,8 @@ vec3 atlasColorMap ( in float value )
return vec3( r, g, b ); return vec3( r, g, b );
} }
vec3 colorMap5( in float value ) vec3 colorMap5( in float value )
{ {
vec4 color0 = vec4(255./255., 255./255., 217./255., 1.); vec4 color0 = vec4(255./255., 255./255., 217./255., 1.);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment