Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the drawing buffer width instead of the canvas width for imagery splitting #5743

Merged
merged 5 commits into from
Aug 14, 2017
Merged

Use the drawing buffer width instead of the canvas width for imagery splitting #5743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82e8c01
Use the drawing buffer width instead of the canvas width for imagery …
kring Aug 14, 2017
3396f28
Update CHANGES.md
kring Aug 14, 2017
8c4515c
Clean up CHANGES.md.
kring Aug 14, 2017
3a763d7
Merge remote-tracking branch 'origin/master' into imagerySplitHighDpi
kring Aug 14, 2017
1d3632b
Merge branch 'master' into imagerySplitHighDpi
emackey Aug 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.
* Added `Cesium3DTileset.loadJson` to support overriding the default tileset loading behavior. [#5685](https://github.com/AnalyticalGraphicsInc/cesium/pull/5685)

### 1.36 - 2017-08-01
Expand Down
2 changes: 1 addition & 1 deletion Source/Renderer/UniformState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down