Merge branch '4.1' into 4.2-beta

# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
This commit is contained in:
Mario Zechner 2022-08-19 18:06:40 +02:00
commit 2802b489e1

View File

@ -51,6 +51,8 @@ export class GLTexture extends Texture implements Disposable, Restorable {
this.bind();
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, minFilter);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, GLTexture.validateMagFilter(magFilter));
this.useMipMaps = GLTexture.usesMipMaps(minFilter);
if (this.useMipMaps) gl.generateMipmap(gl.TEXTURE_2D);
}
static validateMagFilter (magFilter: TextureFilter) {
@ -66,6 +68,19 @@ export class GLTexture extends Texture implements Disposable, Restorable {
}
}
static usesMipMaps(filter: TextureFilter) {
switch (filter) {
case TextureFilter.MipMap:
case TextureFilter.MipMapLinearLinear:
case TextureFilter.MipMapLinearNearest:
case TextureFilter.MipMapNearestLinear:
case TextureFilter.MipMapNearestNearest:
return true;
default:
return false;
}
}
setWraps (uWrap: TextureWrap, vWrap: TextureWrap) {
let gl = this.context.gl;
this.bind();