From bfa9dd5060286f87e4cc3b59d2cc77deb2466c4a Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sat, 29 Oct 2022 18:09:18 -0700 Subject: [PATCH] Clean up --- addons/xterm-addon-webgl/src/GlyphRenderer.ts | 7 ++----- src/browser/renderer/shared/TextureAtlas.ts | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/xterm-addon-webgl/src/GlyphRenderer.ts b/addons/xterm-addon-webgl/src/GlyphRenderer.ts index 35b6770c..b43f9722 100644 --- a/addons/xterm-addon-webgl/src/GlyphRenderer.ts +++ b/addons/xterm-addon-webgl/src/GlyphRenderer.ts @@ -355,12 +355,9 @@ export class GlyphRenderer extends Disposable { } public setAtlas(atlas: ITextureAtlas): void { - const gl = this._gl; this._atlas = atlas; - - // TODO: Share code - for (let i = 0; i < this._atlas.pages.length; i++) { - this._bindAtlasPageTexture(gl, atlas, i); + for (let i = 0; i < atlas.pages.length; i++) { + this._bindAtlasPageTexture(this._gl, atlas, i); } } diff --git a/src/browser/renderer/shared/TextureAtlas.ts b/src/browser/renderer/shared/TextureAtlas.ts index 018c8f08..ba469025 100644 --- a/src/browser/renderer/shared/TextureAtlas.ts +++ b/src/browser/renderer/shared/TextureAtlas.ts @@ -56,7 +56,6 @@ export class TextureAtlas implements ITextureAtlas { private _workBoundingBox: IBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 }; private _workAttributeData: AttributeData = new AttributeData(); - // TODO: Register private readonly _onAddTextureAtlasCanvas = new EventEmitter(); public readonly onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event; @@ -81,6 +80,7 @@ export class TextureAtlas implements ITextureAtlas { for (const page of this.pages) { page.canvas.remove(); } + this._onAddTextureAtlasCanvas.dispose(); } public warmUp(): void {