Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib
# Conflicts: # dist/iwmlib.pixi.js
This commit is contained in:
commit
b09eb63785
4
dist/iwmlib.pixi.js
vendored
4
dist/iwmlib.pixi.js
vendored
@ -8916,8 +8916,8 @@
|
||||
if (event.data.success) {
|
||||
let { url, col, row, buffer } = event.data;
|
||||
//console.log("WorkerTileLoader.loaded", url, buffer)
|
||||
let CompressedImage = PIXI.compressedTextures.CompressedImage;
|
||||
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url);
|
||||
//let CompressedImage = PIXI.compressedTextures.CompressedImage
|
||||
let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url);
|
||||
let base = new PIXI.BaseTexture(compressed);
|
||||
let texture = new PIXI.Texture(base);
|
||||
this._textureAvailable(url, col, row, texture);
|
||||
|
@ -324,8 +324,8 @@ export class WorkerTileLoader extends TileLoader {
|
||||
if (event.data.success) {
|
||||
let { url, col, row, buffer } = event.data
|
||||
//console.log("WorkerTileLoader.loaded", url, buffer)
|
||||
let CompressedImage = PIXI.compressedTextures.CompressedImage
|
||||
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url)
|
||||
//let CompressedImage = PIXI.compressedTextures.CompressedImage
|
||||
let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url)
|
||||
let base = new PIXI.BaseTexture(compressed)
|
||||
let texture = new PIXI.Texture(base)
|
||||
this._textureAvailable(url, col, row, texture)
|
||||
|
Loading…
Reference in New Issue
Block a user