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

Jump to bottom

sharper image in ImageLayer, fix maptalks/issues#450 #2089

Merged
merged 1 commit into from
Sep 24, 2023
Merged

sharper image in ImageLayer, fix maptalks/issues#450 #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/layer/tile/TileLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ const options = {
'tileStackDepth': 3,

'awareOfTerrain': true,
'bufferPixel': 0.5
'bufferPixel': 0.5,
'mipmapTexture': true
};

const URL_PATTERN = /\{ *([\w_]+) *\}/g;
Expand Down
32 changes: 21 additions & 11 deletions src/renderer/layer/ImageGLRenderable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,14 @@ const ImageGLRenderable = Base => {
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
if (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height)) {
const genMipmap = this.layer.options['mipmapTexture'];
if (genMipmap && (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height))) {
image = resize(image);
}
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
gl.generateMipmap(gl.TEXTURE_2D);

if (genMipmap) {
gl.generateMipmap(gl.TEXTURE_2D);
}
return texture;
}

Expand Down Expand Up @@ -396,12 +398,14 @@ const ImageGLRenderable = Base => {
image.texture = texture;
}
gl.bindTexture(gl.TEXTURE_2D, texture);
if (map.isMoving() && map.getRenderer().isViewChanged()) {
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_LINEAR);
} else {
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
const genMipmap = this.layer.options['mipmapTexture'];
if (genMipmap) {
if (map.isMoving() && map.getRenderer().isViewChanged()) {
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_LINEAR);
} else {
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
}
}

return texture;
}

Expand Down Expand Up @@ -636,15 +640,17 @@ function resize(image) {
let width = image.width;
let height = image.height;
if (!isPowerOfTwo(width)) {
width = floorPowerOfTwo(width);
width = ceilPowerOfTwo(width);
}
if (!isPowerOfTwo(height)) {
height = floorPowerOfTwo(height);
height = ceilPowerOfTwo(height);
}
const canvas = document.createElement('canvas');
canvas.width = width;
canvas.height = height;
canvas.getContext('2d').drawImage(image, 0, 0, width, height);
const ctx = canvas.getContext('2d');
ctx.imageSmoothingEnabled = false;
ctx.drawImage(image, 0, 0, width, height);
return canvas;
}

Expand All @@ -655,3 +661,7 @@ export function isPowerOfTwo(value) {
export function floorPowerOfTwo(value) {
return Math.pow(2, Math.floor(Math.log(value) / Math.LN2));
}

function ceilPowerOfTwo(value) {
return Math.pow(2, Math.ceil(Math.log(value) / Math.LN2));
}