Properly dispose of atlas event
This commit is contained in:
@@ -15,7 +15,7 @@ import { ReadonlyColorSet } from 'browser/Types';
|
|||||||
import { CellData } from 'common/buffer/CellData';
|
import { CellData } from 'common/buffer/CellData';
|
||||||
import { WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
|
import { WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
|
||||||
import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
|
import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services';
|
||||||
import { ICellData } from 'common/Types';
|
import { ICellData, IDisposable } from 'common/Types';
|
||||||
import { Terminal } from 'xterm';
|
import { Terminal } from 'xterm';
|
||||||
import { IRenderLayer } from './Types';
|
import { IRenderLayer } from './Types';
|
||||||
import { CellColorResolver } from 'browser/renderer/shared/CellColorResolver';
|
import { CellColorResolver } from 'browser/renderer/shared/CellColorResolver';
|
||||||
@@ -38,9 +38,9 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer
|
|||||||
private _bitmapGenerator: (BitmapGenerator | undefined)[] = [];
|
private _bitmapGenerator: (BitmapGenerator | undefined)[] = [];
|
||||||
|
|
||||||
protected _charAtlas!: ITextureAtlas;
|
protected _charAtlas!: ITextureAtlas;
|
||||||
|
private _charAtlasDisposable?: IDisposable;
|
||||||
|
|
||||||
public get canvas(): HTMLCanvasElement { return this._canvas; }
|
public get canvas(): HTMLCanvasElement { return this._canvas; }
|
||||||
// TODO: Support multiple pages
|
|
||||||
public get cacheCanvas(): HTMLCanvasElement { return this._charAtlas?.pages[0].canvas!; }
|
public get cacheCanvas(): HTMLCanvasElement { return this._charAtlas?.pages[0].canvas!; }
|
||||||
|
|
||||||
private readonly _onAddTextureAtlasCanvas = this.register(new EventEmitter<HTMLCanvasElement>());
|
private readonly _onAddTextureAtlasCanvas = this.register(new EventEmitter<HTMLCanvasElement>());
|
||||||
@@ -121,9 +121,9 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer
|
|||||||
if (this._deviceCharWidth <= 0 && this._deviceCharHeight <= 0) {
|
if (this._deviceCharWidth <= 0 && this._deviceCharHeight <= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
this._charAtlasDisposable?.dispose();
|
||||||
this._charAtlas = acquireTextureAtlas(this._terminal, colorSet, this._deviceCellWidth, this._deviceCellHeight, this._deviceCharWidth, this._deviceCharHeight, this._coreBrowserService.dpr);
|
this._charAtlas = acquireTextureAtlas(this._terminal, colorSet, this._deviceCellWidth, this._deviceCellHeight, this._deviceCharWidth, this._deviceCharHeight, this._coreBrowserService.dpr);
|
||||||
// TODO: Dispose this when there's a new atlas
|
this._charAtlasDisposable = forwardEvent(this._charAtlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas);
|
||||||
forwardEvent(this._charAtlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas);
|
|
||||||
this._charAtlas.warmUp();
|
this._charAtlas.warmUp();
|
||||||
for (let i = 0; i < this._charAtlas.pages.length; i++) {
|
for (let i = 0; i < this._charAtlas.pages.length; i++) {
|
||||||
this._bitmapGenerator[i] = new BitmapGenerator(this._charAtlas.pages[i].canvas);
|
this._bitmapGenerator[i] = new BitmapGenerator(this._charAtlas.pages[i].canvas);
|
||||||
@@ -383,7 +383,6 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer
|
|||||||
this._bitmapGenerator[glyph.texturePage]?.refresh();
|
this._bitmapGenerator[glyph.texturePage]?.refresh();
|
||||||
this._charAtlas.pages[glyph.texturePage].hasCanvasChanged = false;
|
this._charAtlas.pages[glyph.texturePage].hasCanvasChanged = false;
|
||||||
}
|
}
|
||||||
// TODO: Create generator if there's a new page
|
|
||||||
this._ctx.drawImage(
|
this._ctx.drawImage(
|
||||||
this._bitmapGenerator[glyph.texturePage]?.bitmap || this._charAtlas!.pages[glyph.texturePage].canvas,
|
this._bitmapGenerator[glyph.texturePage]?.bitmap || this._charAtlas!.pages[glyph.texturePage].canvas,
|
||||||
glyph.texturePosition.x,
|
glyph.texturePosition.x,
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { EventEmitter, forwardEvent } from 'common/EventEmitter';
|
|||||||
import { Disposable, toDisposable } from 'common/Lifecycle';
|
import { Disposable, toDisposable } from 'common/Lifecycle';
|
||||||
import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
|
import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
|
||||||
import { CharData, IBufferLine, ICellData } from 'common/Types';
|
import { CharData, IBufferLine, ICellData } from 'common/Types';
|
||||||
import { Terminal } from 'xterm';
|
import { IDisposable, Terminal } from 'xterm';
|
||||||
import { GlyphRenderer } from './GlyphRenderer';
|
import { GlyphRenderer } from './GlyphRenderer';
|
||||||
import { RectangleRenderer } from './RectangleRenderer';
|
import { RectangleRenderer } from './RectangleRenderer';
|
||||||
import { CursorRenderLayer } from './renderLayer/CursorRenderLayer';
|
import { CursorRenderLayer } from './renderLayer/CursorRenderLayer';
|
||||||
@@ -30,6 +30,7 @@ import { IWebGL2RenderingContext } from './Types';
|
|||||||
|
|
||||||
export class WebglRenderer extends Disposable implements IRenderer {
|
export class WebglRenderer extends Disposable implements IRenderer {
|
||||||
private _renderLayers: IRenderLayer[];
|
private _renderLayers: IRenderLayer[];
|
||||||
|
private _charAtlasDisposable: IDisposable | undefined;
|
||||||
private _charAtlas: ITextureAtlas | undefined;
|
private _charAtlas: ITextureAtlas | undefined;
|
||||||
private _devicePixelRatio: number;
|
private _devicePixelRatio: number;
|
||||||
|
|
||||||
@@ -264,9 +265,10 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|||||||
this._coreBrowserService.dpr
|
this._coreBrowserService.dpr
|
||||||
);
|
);
|
||||||
if (this._charAtlas !== atlas) {
|
if (this._charAtlas !== atlas) {
|
||||||
|
|
||||||
|
this._charAtlasDisposable?.dispose();
|
||||||
this._onChangeTextureAtlas.fire(atlas.pages[0].canvas);
|
this._onChangeTextureAtlas.fire(atlas.pages[0].canvas);
|
||||||
// TODO: Dispose this when there's a new atlas
|
this._charAtlasDisposable = forwardEvent(atlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas);
|
||||||
forwardEvent(atlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas);
|
|
||||||
}
|
}
|
||||||
this._charAtlas = atlas;
|
this._charAtlas = atlas;
|
||||||
this._charAtlas.warmUp();
|
this._charAtlas.warmUp();
|
||||||
|
|||||||
Reference in New Issue
Block a user