From 7b4179d2575d71d7d45e3de163d3fc8fd6521707 Mon Sep 17 00:00:00 2001 From: Leonard Holst Date: Tue, 30 Jun 2020 17:29:41 +0200 Subject: [PATCH 1/3] add translucency to outlineColor fix for https://github.com/CesiumGS/cesium/issues/8553 PR adds translucency to outlineColor in BillboardCollectionVS update contributors to include Geoplex GIS GmbH members --- CONTRIBUTORS.md | 3 +++ Source/Shaders/BillboardCollectionVS.glsl | 1 + 2 files changed, 4 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1fa6b409270..adbc4c24afd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -154,6 +154,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu - [Jonathan Nogueira](https://github.com/LuminousPath) - [Palantir Technologies, Inc.](https://palantir.com) - [Joey Rafidi](https://github.com/jrafidi) +- [Geoplex GIS GmbH](https://www.geoplex.de) + - [Hannes Gräuler](https://github.com/lordi) + - [Leonard Holst](https://github.com/LHolst) ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf) diff --git a/Source/Shaders/BillboardCollectionVS.glsl b/Source/Shaders/BillboardCollectionVS.glsl index 604405bd8b7..5408b2606fb 100644 --- a/Source/Shaders/BillboardCollectionVS.glsl +++ b/Source/Shaders/BillboardCollectionVS.glsl @@ -423,6 +423,7 @@ if (lengthSq < disableDepthTestDistance) { v_outlineWidth = outlineWidth / 255.0; v_outlineColor = outlineColor; + v_outlineColor.a *= translucency; #endif v_pickColor = pickColor; From eb4c6a1f524cddbb0866f2ac24d500af5d1ca76b Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 20 Jul 2020 16:13:08 -0400 Subject: [PATCH 2/3] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index adbc4c24afd..226ca8644ae 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -155,7 +155,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu - [Palantir Technologies, Inc.](https://palantir.com) - [Joey Rafidi](https://github.com/jrafidi) - [Geoplex GIS GmbH](https://www.geoplex.de) - - [Hannes Gräuler](https://github.com/lordi) - [Leonard Holst](https://github.com/LHolst) ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf) From a9d810a12d6ea49c2cfe3a8893766e51e6ae2b02 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Mon, 20 Jul 2020 16:21:56 -0400 Subject: [PATCH 3/3] CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 37f9ed3848c..3b4b9bd430a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - Fixed 3D Tileset replacement refinement when leaf is empty. [#8996](https://github.com/CesiumGS/cesium/pull/8996) - Fixed a bug in the assessment of terrain tile visibility [#9033](https://github.com/CesiumGS/cesium/issues/9033) - Fixed vertical polylines with `arcType: ArcType.RHUMB`, including lines drawn via GeoJSON. [#9028](https://github.com/CesiumGS/cesium/pull/9028) +- Fixed `translucencyByDistance` for label outline color [#9003](https://github.com/CesiumGS/cesium/pull/9003) ### 1.71 - 2020-07-01