Merge branch 'master' into webgl2

This commit is contained in:
Daniel Imms
2019-05-18 14:38:42 -07:00
68 changed files with 2372 additions and 460 deletions
+2 -1
View File
@@ -8,8 +8,9 @@ import { IColorManager, IRenderDimensions, IColor } from '../Types';
import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';
import { IRenderModel, IWebGLVertexArrayObject, IWebGL2RenderingContext, ISelectionRenderModel } from './Types';
import { fill } from '../../common/TypedArrayUtils';
import { INVERTED_DEFAULT_COLOR, DEFAULT_COLOR } from '../atlas/Types';
import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
import { is256Color } from '../atlas/CharAtlasUtils';
import { DEFAULT_COLOR } from '../../common/Types';
const enum VertexAttribLocations {
POSITION = 0,