From 5ad0befcc241206a004c0af88975566585b3408f Mon Sep 17 00:00:00 2001 From: Joseph Klinger Date: Fri, 26 May 2017 13:53:28 -0400 Subject: [PATCH 1/2] Fixed a bug where billboards with sizeInMeters set to true would move upwards when zooming out. --- Source/Shaders/BillboardCollectionVS.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Shaders/BillboardCollectionVS.glsl b/Source/Shaders/BillboardCollectionVS.glsl index 7e5ede6fd049..aa4c4e15baae 100644 --- a/Source/Shaders/BillboardCollectionVS.glsl +++ b/Source/Shaders/BillboardCollectionVS.glsl @@ -72,7 +72,7 @@ vec4 computePositionWindowCoordinates(vec4 positionEC, vec2 imageSize, float sca if (sizeInMeters) { - originTranslate += originTranslate / czm_metersPerPixel(positionEC); + originTranslate /= czm_metersPerPixel(positionEC); } positionWC.xy += originTranslate; From 29b520477805774b4801be38886344ab78156f10 Mon Sep 17 00:00:00 2001 From: Joseph Klinger Date: Fri, 26 May 2017 15:17:06 -0400 Subject: [PATCH 2/2] Updated CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index cf5760b0eaa5..444e581ddba5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ Change Log * Fixed an issue where using the depth fail material for polylines would cause a crash in Edge. [#5359](https://github.com/AnalyticalGraphicsInc/cesium/pull/5359) * Fixed a crash where EllipsoidGeometry and EllipsoidOutlineGeometry were given floating point values when expecting integers. [#5260](https://github.com/AnalyticalGraphicsInc/cesium/issues/5260) * Fixed an issue where billboards were not properly aligned. [#2487](https://github.com/AnalyticalGraphicsInc/cesium/issues/2487) +* Fixed a bug where billboards with sizeInMeters set to true would move upwards when zooming out. [#5373](https://github.com/AnalyticalGraphicsInc/cesium/issues/5373) ### 1.33 - 2017-05-01