Merge remote-tracking branch 'upstream/master'

glumpy · Sep 17, 2017 · a04b9a7 · a04b9a7
2 parents eacfde5 + 3ede4f2
commit a04b9a7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/glumpy/library/colormaps/ice.glsl b/glumpy/library/colormaps/ice.glsl
@@ -6,7 +6,9 @@
 
 vec3 colormap_ice(float t)
 {
-   return vec3(t, t, 1.0);
+   t = 1 - t;
+   return mix(mix(vec3(1,1,1), vec3(0,1,1), t),
+               mix(vec3(0,1,1), vec3(0,0,1), t*t), t);
 }
 
 vec3 colormap_ice(float t, vec3 under, vec3 over)