basic perspective rendering #1049
Conversation
Conflicts: js/geo/transform.js js/render/draw_line.js js/render/draw_symbol.js js/render/painter.js js/style/style.js js/ui/easings.js shaders/line.fragment.glsl shaders/line.vertex.glsl
Since projection is more complex with support for perspective views, pointCoordinate is less precise. The tests were failing because it expected exactly `row: 1` and got `row: 1.0000000000000069`. This loaded an extra tile in the tests, which is acceptable for cases the tile edge is right at the edge of the screen.
| transform.width = 512; | ||
| transform.height = 512; | ||
| transform.width = 511; | ||
| transform.height = 511; |
There was a problem hiding this comment.
See commit message here e5ee155 The tests were too sensitive.
There was a problem hiding this comment.
Hmm, I'd rather fix the tests to check row equality within a margin when perspective is set.
The tests are affected by which tiles are in the view's covering tiles. I didn't see an easy way to allow a certain margin of error in the output, so I just changed the size of the test view so that it wouldn't test a case where multiple possible results would be ok.
|
This is so awesome, can't wait for this to get merged! |
|
sweeeeeet |
| @@ -194,7 +194,7 @@ util.extend(exports, { | |||
| this.flyTo(center, zoom, 0, options); | |||
| }, | |||
|
|
|||
| easeTo: function(latlng, zoom, bearing, options) { | |||
| easeTo: function(latlng, zoom, bearing, pitch, options) { | |||
There was a problem hiding this comment.
Should we change this to accept a single options argument?
There was a problem hiding this comment.
I think so. Especially if we want to expose altitude too.
Or maybe separating the view from the ease options make sense: easeTo(view, options)?
|
Is this ready to merge? |
|
@ansis Could we get an example and/or an update to |
This merges current work on perspective rendering so that it doesn't get more stale.
Two transform properties are added:
pitch
The angle at which the camera is looking at the ground. 0 is straight down, 90 would be horizontal. The bigger the pitch, the more vertically squashed everything gets.
examples (with altitude 1.5):
pitch = 0pitch = 30pitch = 60altitude
How high above the surface the camera is. The altitude units are "canvas heights". So an altitude of 3 should be 3x the vertical distance shown on the canvas. Decreasing the altitude makes everything more perspectivy.
examples (with pitch 55):
altitude = 0.75altitude = 1.5altitude = 100Apple uses the names pitch and altitude in their sdk. Google calls pitch viewing angle and doesn't expose altitude.
A pitch argument was added to
setView()andeaseTo.setPitch()andgetPitch()also added.The implementation has three parts:
cc @jfirebaugh
Todo: