Changing extent structure back to single array: [minX, minY, maxX, maxY]
This means we'll have to have a new structure and new methods for 3D envelopes.
This commit is contained in:
@@ -113,8 +113,8 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =
|
||||
1);
|
||||
goog.vec.Mat4.translate(
|
||||
transform,
|
||||
(imageExtent[0][0] - viewCenter[0]) / imageResolution,
|
||||
(viewCenter[1] - imageExtent[1][1]) / imageResolution,
|
||||
(imageExtent[0] - viewCenter[0]) / imageResolution,
|
||||
(viewCenter[1] - imageExtent[3]) / imageResolution,
|
||||
0);
|
||||
|
||||
this.updateAttributions(frameState.attributions, image.getAttributions());
|
||||
|
||||
@@ -348,8 +348,8 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
||||
for (tileCoordKey in tilesToDraw) {
|
||||
tile = tilesToDraw[tileCoordKey];
|
||||
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
|
||||
x = (tileExtent[0][0] - origin[0]) / tileResolution;
|
||||
y = (origin[1] - tileExtent[1][1]) / tileResolution;
|
||||
x = (tileExtent[0] - origin[0]) / tileResolution;
|
||||
y = (origin[1] - tileExtent[3]) / tileResolution;
|
||||
width = scale * tileSize[0];
|
||||
height = scale * tileSize[1];
|
||||
tileState = tile.getState();
|
||||
|
||||
@@ -477,10 +477,10 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
|
||||
tilesToRender[key] = tileCoord;
|
||||
} else if (idle) {
|
||||
tileExtent = tileGrid.getTileCoordExtent(tileCoord);
|
||||
tileExtent[0][0] -= tileGutter;
|
||||
tileExtent[1][0] += tileGutter;
|
||||
tileExtent[0][1] -= tileGutter;
|
||||
tileExtent[1][1] += tileGutter;
|
||||
tileExtent[0] -= tileGutter;
|
||||
tileExtent[2] += tileGutter;
|
||||
tileExtent[1] -= tileGutter;
|
||||
tileExtent[3] += tileGutter;
|
||||
tileHasFeatures = false;
|
||||
for (i = 0; i < numTypes; ++i) {
|
||||
type = types[i];
|
||||
|
||||
@@ -99,8 +99,8 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame =
|
||||
1);
|
||||
goog.vec.Mat4.translate(
|
||||
transform,
|
||||
(imageExtent[0][0] - viewCenter[0]) / imageResolution,
|
||||
(viewCenter[1] - imageExtent[1][1]) / imageResolution,
|
||||
(imageExtent[0] - viewCenter[0]) / imageResolution,
|
||||
(viewCenter[1] - imageExtent[3]) / imageResolution,
|
||||
0);
|
||||
if (image != this.image_) {
|
||||
var imageElement = image.getImageElement(this);
|
||||
|
||||
@@ -169,12 +169,12 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ =
|
||||
2 / canvasExtentWidth, 2 / canvasExtentHeight, 1);
|
||||
goog.vec.Mat4.rotateZ(projectionMatrix, -viewRotation);
|
||||
goog.vec.Mat4.translate(projectionMatrix,
|
||||
imageExtent[0][0] - viewCenter[0],
|
||||
imageExtent[0][1] - viewCenter[1],
|
||||
imageExtent[0] - viewCenter[0],
|
||||
imageExtent[1] - viewCenter[1],
|
||||
0);
|
||||
goog.vec.Mat4.scale(projectionMatrix,
|
||||
(imageExtent[1][0] - imageExtent[0][0]) / 2,
|
||||
(imageExtent[1][1] - imageExtent[0][1]) / 2,
|
||||
(imageExtent[2] - imageExtent[0]) / 2,
|
||||
(imageExtent[3] - imageExtent[1]) / 2,
|
||||
1);
|
||||
goog.vec.Mat4.translate(projectionMatrix, 1, 1, 0);
|
||||
|
||||
|
||||
@@ -161,8 +161,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
||||
var minX = origin[0] + tileRange.minX * tileSize[0] * tileResolution;
|
||||
var minY = origin[1] + tileRange.minY * tileSize[1] * tileResolution;
|
||||
framebufferExtent = [
|
||||
[minX, minY],
|
||||
[minX + framebufferExtentDimension, minY + framebufferExtentDimension]
|
||||
minX, minY,
|
||||
minX + framebufferExtentDimension, minY + framebufferExtentDimension
|
||||
];
|
||||
|
||||
this.bindFramebuffer(frameState, framebufferDimension);
|
||||
@@ -246,13 +246,13 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
||||
for (tileKey in tilesToDraw) {
|
||||
tile = tilesToDraw[tileKey];
|
||||
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
|
||||
sx = 2 * (tileExtent[1][0] - tileExtent[0][0]) /
|
||||
sx = 2 * (tileExtent[2] - tileExtent[0]) /
|
||||
framebufferExtentDimension;
|
||||
sy = 2 * (tileExtent[1][1] - tileExtent[0][1]) /
|
||||
sy = 2 * (tileExtent[3] - tileExtent[1]) /
|
||||
framebufferExtentDimension;
|
||||
tx = 2 * (tileExtent[0][0] - framebufferExtent[0][0]) /
|
||||
tx = 2 * (tileExtent[0] - framebufferExtent[0]) /
|
||||
framebufferExtentDimension - 1;
|
||||
ty = 2 * (tileExtent[0][1] - framebufferExtent[0][1]) /
|
||||
ty = 2 * (tileExtent[1] - framebufferExtent[1]) /
|
||||
framebufferExtentDimension - 1;
|
||||
goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
|
||||
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
|
||||
@@ -296,17 +296,17 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
||||
var texCoordMatrix = this.texCoordMatrix;
|
||||
goog.vec.Mat4.makeIdentity(texCoordMatrix);
|
||||
goog.vec.Mat4.translate(texCoordMatrix,
|
||||
(center[0] - framebufferExtent[0][0]) /
|
||||
(framebufferExtent[1][0] - framebufferExtent[0][0]),
|
||||
(center[1] - framebufferExtent[0][1]) /
|
||||
(framebufferExtent[1][1] - framebufferExtent[0][1]),
|
||||
(center[0] - framebufferExtent[0]) /
|
||||
(framebufferExtent[2] - framebufferExtent[0]),
|
||||
(center[1] - framebufferExtent[1]) /
|
||||
(framebufferExtent[3] - framebufferExtent[1]),
|
||||
0);
|
||||
goog.vec.Mat4.rotateZ(texCoordMatrix, view2DState.rotation);
|
||||
goog.vec.Mat4.scale(texCoordMatrix,
|
||||
frameState.size[0] * view2DState.resolution /
|
||||
(framebufferExtent[1][0] - framebufferExtent[0][0]),
|
||||
(framebufferExtent[2] - framebufferExtent[0]),
|
||||
frameState.size[1] * view2DState.resolution /
|
||||
(framebufferExtent[1][1] - framebufferExtent[0][1]),
|
||||
(framebufferExtent[3] - framebufferExtent[1]),
|
||||
1);
|
||||
goog.vec.Mat4.translate(texCoordMatrix,
|
||||
-0.5,
|
||||
|
||||
Reference in New Issue
Block a user