diff --git a/src/core/src/downloader/query.rs b/src/core/src/downloader/query.rs index d616d5c2..27065041 100644 --- a/src/core/src/downloader/query.rs +++ b/src/core/src/downloader/query.rs @@ -106,7 +106,7 @@ impl PixelMetadata { let format = cfg.get_format(); let ext = format.get_ext_file(); - let url = format!("{}/Norder0/Dir0/Npix0.{}", hips_url, ext); + let url = format!("{}/Norder3/Allsky.{}", hips_url, ext); PixelMetadata { hips_url, diff --git a/src/core/src/renderable/labels.rs b/src/core/src/renderable/labels.rs index 0657689e..a63c4f89 100644 --- a/src/core/src/renderable/labels.rs +++ b/src/core/src/renderable/labels.rs @@ -370,7 +370,7 @@ impl RenderManager for TextRenderManager { self.gl.enable(WebGl2RenderingContext::BLEND); self.gl.blend_func_separate( WebGl2RenderingContext::SRC_ALPHA, - WebGl2RenderingContext::ONE, + WebGl2RenderingContext::ONE_MINUS_SRC_ALPHA, WebGl2RenderingContext::ONE, WebGl2RenderingContext::ONE, ); // premultiplied alpha diff --git a/src/glsl/webgl2/text/text_frag.glsl b/src/glsl/webgl2/text/text_frag.glsl index 39c66726..ceef0ef0 100644 --- a/src/glsl/webgl2/text/text_frag.glsl +++ b/src/glsl/webgl2/text/text_frag.glsl @@ -10,6 +10,7 @@ uniform sampler2D u_sampler_font; void main() { // The texture is set up with `SRGB8_ALPHA8`, so no need to decode here! float alpha = texture(u_sampler_font, v_tc).r; + alpha = smoothstep(0.1, 0.9, alpha); // Multiply vertex color with texture color (in linear space). // Linear color is written and blended in Framebuffer and converted to sRGB later diff --git a/src/js/HpxImageSurvey.js b/src/js/HpxImageSurvey.js index ae5fc8c0..0fb8bc5b 100644 --- a/src/js/HpxImageSurvey.js +++ b/src/js/HpxImageSurvey.js @@ -235,7 +235,7 @@ export let HpxImageSurvey = (function() { // HiPS grayscale this.colored = false; - if (metadata.dataproduct_subtype && metadata.dataproduct_subtype === "color") { + if (metadata.dataproduct_subtype && (metadata.dataproduct_subtype === "color" || metadata.dataproduct_subtype[0] === "color") ) { this.colored = true; }