Merge branch 'master' into webgl2

This commit is contained in:
Daniel Imms
2019-06-14 21:52:46 -07:00
27 changed files with 110 additions and 105 deletions
@@ -4,7 +4,8 @@
*/
import { IRenderLayer } from './Types';
import { ICellData, DEFAULT_COLOR } from '../../../common/Types';
import { ICellData } from '../../../common/Types';
import { DEFAULT_COLOR } from '../../../common/buffer/Constants';
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, IGlyphIdentifier } from '../atlas/Types';
import BaseCharAtlas from '../atlas/BaseCharAtlas';
import { acquireCharAtlas } from '../atlas/CharAtlasCache';