Skip to content

Commit

Permalink
Merge pull request #5373 from klingerj/billboard-sizeInMeters-fix
Browse files Browse the repository at this point in the history
Fixed a bug where billboards with sizeInMeters set to true would move upwards when zooming out.
  • Loading branch information
emackey authored May 26, 2017
2 parents d432983 + 29b5204 commit f1e4729
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Source/Shaders/BillboardCollectionVS.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f1e4729

Please sign in to comment.