From ab69bfbb3260a791e65ea59e00bd935bcab03a2c Mon Sep 17 00:00:00 2001
From: Benjamin Woodruff <github@benjam.info>
Date: Wed, 7 Mar 2018 22:23:19 -0800
Subject: [PATCH] Move rest of atlas implementations to atlas dirs

Moves CharAtlas into src/renderer/atlas/ and CharAtlasGenerator into
src/shared/atlas/.
---
 src/renderer/BaseRenderLayer.ts              |  2 +-
 src/renderer/{ => atlas}/CharAtlas.ts        | 12 ++++++------
 src/shared/{ => atlas}/CharAtlasGenerator.ts |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename src/renderer/{ => atlas}/CharAtlas.ts (88%)
 rename src/shared/{ => atlas}/CharAtlasGenerator.ts (97%)

diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 8a236ada..7957eed0 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -7,7 +7,7 @@ import { IRenderLayer, IColorSet, IRenderDimensions } from './Types';
 import { CharData, ITerminal, ITerminalOptions } from '../Types';
 import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from './atlas/Types';
 import { CHAR_ATLAS_CELL_SPACING } from '../shared/atlas/Types';
-import { acquireCharAtlas } from './CharAtlas';
+import { acquireCharAtlas } from './atlas/CharAtlas';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from '../Buffer';
 
 export abstract class BaseRenderLayer implements IRenderLayer {
diff --git a/src/renderer/CharAtlas.ts b/src/renderer/atlas/CharAtlas.ts
similarity index 88%
rename from src/renderer/CharAtlas.ts
rename to src/renderer/atlas/CharAtlas.ts
index c157ff3d..d688d328 100644
--- a/src/renderer/CharAtlas.ts
+++ b/src/renderer/atlas/CharAtlas.ts
@@ -3,12 +3,12 @@
  * @license MIT
  */
 
-import { ITerminal } from '../Types';
-import { IColorSet } from './Types';
-import { ICharAtlasConfig } from './atlas/Types';
-import { isFirefox } from '../shared/utils/Browser';
-import { generateCharAtlas, ICharAtlasRequest } from '../shared/CharAtlasGenerator';
-import { generateConfig, configEquals } from './atlas/CharAtlasUtils';
+import { ITerminal } from '../../Types';
+import { IColorSet } from '../Types';
+import { ICharAtlasConfig } from './Types';
+import { isFirefox } from '../../shared/utils/Browser';
+import { generateCharAtlas, ICharAtlasRequest } from '../../shared/atlas/CharAtlasGenerator';
+import { generateConfig, configEquals } from './CharAtlasUtils';
 
 interface ICharAtlasCacheEntry {
   bitmap: HTMLCanvasElement | Promise<ImageBitmap>;
diff --git a/src/shared/CharAtlasGenerator.ts b/src/shared/atlas/CharAtlasGenerator.ts
similarity index 97%
rename from src/shared/CharAtlasGenerator.ts
rename to src/shared/atlas/CharAtlasGenerator.ts
index fbf66ac3..cf17bbb8 100644
--- a/src/shared/CharAtlasGenerator.ts
+++ b/src/shared/atlas/CharAtlasGenerator.ts
@@ -4,8 +4,8 @@
  */
 
 import { FontWeight } from 'xterm';
-import { CHAR_ATLAS_CELL_SPACING } from './atlas/Types';
-import { isFirefox } from './utils/Browser';
+import { CHAR_ATLAS_CELL_SPACING } from './Types';
+import { isFirefox } from '../utils/Browser';
 
 declare const Promise: any;