Don't mess with formatting
This commit is contained in:
@@ -152,7 +152,7 @@ export class TextureAtlas implements ITextureAtlas {
|
|||||||
// microtask to ensure it does not interrupt textures that will be rendered in the current
|
// microtask to ensure it does not interrupt textures that will be rendered in the current
|
||||||
// animation frame which would result in blank rendered areas. This is actually not that
|
// animation frame which would result in blank rendered areas. This is actually not that
|
||||||
// expensive relative to drawing the glyphs, so there is no need to wait for an idle callback.
|
// expensive relative to drawing the glyphs, so there is no need to wait for an idle callback.
|
||||||
if (TextureAtlas.maxAtlasPages && this._pages.length >= TextureAtlas.maxAtlasPages) {
|
if (TextureAtlas.maxAtlasPages && this._pages.length >= Math.max(4, TextureAtlas.maxAtlasPages)) {
|
||||||
// Find the set of the largest 4 images, below the maximum size, with the highest
|
// Find the set of the largest 4 images, below the maximum size, with the highest
|
||||||
// percentages used
|
// percentages used
|
||||||
const pagesBySize = this._pages.filter(e => {
|
const pagesBySize = this._pages.filter(e => {
|
||||||
@@ -181,26 +181,31 @@ export class TextureAtlas implements ITextureAtlas {
|
|||||||
// effectively reduce page count and merging would cause issues.
|
// effectively reduce page count and merging would cause issues.
|
||||||
if (mergingPages.length < 4 || mergingPages.some(p => p.canvas.width !== mergingPages[0].canvas.width)) {
|
if (mergingPages.length < 4 || mergingPages.some(p => p.canvas.width !== mergingPages[0].canvas.width)) {
|
||||||
this._evictAllPages();
|
this._evictAllPages();
|
||||||
} else {
|
const newPage = new AtlasPage(this._document, this._textureSize);
|
||||||
const sortedMergingPagesIndexes = mergingPages.map(e => e.glyphs[0].texturePage).sort((a, b) => a - b);
|
this._pages.push(newPage);
|
||||||
const mergedPageIndex = this.pages.length - mergingPages.length;
|
this._activePages.push(newPage);
|
||||||
|
this._onAddTextureAtlasCanvas.fire(newPage.canvas);
|
||||||
// Merge into the new page
|
return newPage;
|
||||||
const mergedPage = this._mergePages(mergingPages, mergedPageIndex);
|
|
||||||
mergedPage.version = ++AtlasPage.nextVersion;
|
|
||||||
|
|
||||||
// Delete the pages, shifting glyph texture pages as needed
|
|
||||||
for (let i = sortedMergingPagesIndexes.length - 1; i >= 0; i--) {
|
|
||||||
this._deletePage(sortedMergingPagesIndexes[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add the new merged page to the end
|
|
||||||
this.pages.push(mergedPage);
|
|
||||||
|
|
||||||
// Request the model to be cleared to refresh all texture pages.
|
|
||||||
this._pageLayoutVersion++;
|
|
||||||
this._onAddTextureAtlasCanvas.fire(mergedPage.canvas);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const sortedMergingPagesIndexes = mergingPages.map(e => e.glyphs[0].texturePage).sort((a, b) => a - b);
|
||||||
|
const mergedPageIndex = this.pages.length - mergingPages.length;
|
||||||
|
|
||||||
|
// Merge into the new page
|
||||||
|
const mergedPage = this._mergePages(mergingPages, mergedPageIndex);
|
||||||
|
mergedPage.version = ++AtlasPage.nextVersion;
|
||||||
|
|
||||||
|
// Delete the pages, shifting glyph texture pages as needed
|
||||||
|
for (let i = sortedMergingPagesIndexes.length - 1; i >= 0; i--) {
|
||||||
|
this._deletePage(sortedMergingPagesIndexes[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the new merged page to the end
|
||||||
|
this.pages.push(mergedPage);
|
||||||
|
|
||||||
|
// Request the model to be cleared to refresh all texture pages.
|
||||||
|
this._pageLayoutVersion++;
|
||||||
|
this._onAddTextureAtlasCanvas.fire(mergedPage.canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
// All new atlas pages are created small as they are highly dynamic
|
// All new atlas pages are created small as they are highly dynamic
|
||||||
|
|||||||
Reference in New Issue
Block a user