From 82e8c017cbe9ccf668b2f9252975ee4f11ab0f06 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Mon, 14 Aug 2017 17:38:54 +1000 Subject: [PATCH 1/3] Use the drawing buffer width instead of the canvas width for imagery splitting --- Source/Renderer/UniformState.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Renderer/UniformState.js b/Source/Renderer/UniformState.js index 665b7317d7ea..0b2850daae4a 100644 --- a/Source/Renderer/UniformState.js +++ b/Source/Renderer/UniformState.js @@ -1016,7 +1016,7 @@ define([ this._temeToPseudoFixed = Transforms.computeTemeToPseudoFixedMatrix(frameState.time, this._temeToPseudoFixed); // Convert the relative imagerySplitPosition to absolute pixel coordinates - this._imagerySplitPosition = frameState.imagerySplitPosition * canvas.clientWidth; + this._imagerySplitPosition = frameState.imagerySplitPosition * frameState.context.drawingBufferWidth; var fov = camera.frustum.fov; var viewport = this._viewport; var pixelSizePerMeter; From 3396f28fb0cc2459eb15521bccc8a20b7d086a4b Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Mon, 14 Aug 2017 17:50:34 +1000 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index a655183f5dd9..2d41d86e39b3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Change Log * Fixed issue where the `Model` glTF cache loses reference to the model's buffer data. [#5720](https://github.com/AnalyticalGraphicsInc/cesium/issues/5720) * Fixed some issues with `disableDepthTestDistance` [#5501](https://github.com/AnalyticalGraphicsInc/cesium/issues/5501) [#5331](https://github.com/AnalyticalGraphicsInc/cesium/issues/5331) [#5621](https://github.com/AnalyticalGraphicsInc/cesium/issues/5621) * Added several new Bing Maps styles: `CANVAS_DARK`, `CANVAS_LIGHT`, and `CANVAS_GRAY`. +* Fixed a bug that could cause imagery splitting to work incorrectly when CSS pixels are not equivalent to WebGL drawing buffer pixels, such as on high DPI displays in Microsoft Edge and Internet Explorer. ### 1.36 - 2017-08-01 From 8c4515c78880457a19ef64ef0ff9bc5967789569 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Mon, 14 Aug 2017 17:54:18 +1000 Subject: [PATCH 3/3] Clean up CHANGES.md. --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2d41d86e39b3..f498f159c1c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Change Log * Fixed issue where the `Model` glTF cache loses reference to the model's buffer data. [#5720](https://github.com/AnalyticalGraphicsInc/cesium/issues/5720) * Fixed some issues with `disableDepthTestDistance` [#5501](https://github.com/AnalyticalGraphicsInc/cesium/issues/5501) [#5331](https://github.com/AnalyticalGraphicsInc/cesium/issues/5331) [#5621](https://github.com/AnalyticalGraphicsInc/cesium/issues/5621) * Added several new Bing Maps styles: `CANVAS_DARK`, `CANVAS_LIGHT`, and `CANVAS_GRAY`. -* Fixed a bug that could cause imagery splitting to work incorrectly when CSS pixels are not equivalent to WebGL drawing buffer pixels, such as on high DPI displays in Microsoft Edge and Internet Explorer. +* Fixed a bug that caused imagery splitting to work incorrectly when CSS pixels were not equivalent to WebGL drawing buffer pixels, such as on high DPI displays in Microsoft Edge and Internet Explorer. ### 1.36 - 2017-08-01