Chore/more typescript

src/geometries/Flat.js → src/geometries/Flat.ts

@@ -25,6 +25,7 @@ import cmp from '../util/cmp';
 import type from '../util/type';
 import { vec2 as vec2 } from 'gl-matrix';
 import { vec4 as vec4 } from 'gl-matrix';
+import { Size, Tile } from '../jsdoc-extras';
 
 var neighborsCacheSize = 64;
 
@@ -44,6 +45,14 @@ var neighborOffsets = [
  * A tile in a {@link FlatGeometry}.
  */
 class FlatTile {
+  x: any;
+  y: any;
+  z: any;
+  _geometry: any;
+  _level: any;
+  type = 'flat';
+  Tile = FlatTile;
+
   constructor(x, y, z, geometry) {
     this.x = x;
     this.y = y;
@@ -170,7 +179,7 @@ class FlatTile {
     var numX = level.numHorizontalTiles() - 1;
     var numY = level.numVerticalTiles() - 1;
 
-    var result = [];
+    var result: Tile[] = [];
 
     for (var i = 0; i < neighborOffsets.length; i++) {
       var xOffset = neighborOffsets[i][0];
@@ -205,10 +214,14 @@ class FlatTile {
     return cmp(this.z, that.z) || cmp(this.y, that.y) || cmp(this.x, that.x);
   }
   str() {
-    return 'FlatTile(' + tile.x + ', ' + tile.y + ', ' + tile.z + ')';
+    return 'FlatTile(' + this.x + ', ' + this.y + ', ' + this.z + ')';
   }
 }
 class FlatLevel extends Level {
+  _width: any;
+  _height: any;
+  _tileWidth: any;
+  _tileHeight: any;
   constructor(levelProperties) {
     super(levelProperties);
 
@@ -229,6 +242,8 @@ class FlatLevel extends Level {
   tileHeight() {
     return this._tileHeight;
   }
+  // TODO: figure out if it's better to return something
+  // @ts-ignore
   _validateWithParentLevel(parentLevel) {
     var width = this.width();
     var height = this.height();
@@ -301,6 +316,14 @@ class FlatLevel extends Level {
  *                 square tiles
  */
 class FlatGeometry {
+  levelList: any[];
+  selectableLevelList: unknown[];
+  _tileSearcher: TileSearcher;
+  _neighborsCache: LruMap;
+  _vec: vec4;
+  _viewSize: Size;
+  static Tile: typeof FlatTile;
+  static type: string;
   constructor(levelPropertiesList) {
     if (type(levelPropertiesList) !== 'array') {
       throw new Error('Level list must be an array');
@@ -313,13 +336,13 @@ class FlatGeometry {
       this.levelList[i]._validateWithParentLevel(this.levelList[i - 1]);
     }
 
-    this._tileSearcher = new TileSearcher(this);
+    this._tileSearcher = new TileSearcher();
 
     this._neighborsCache = new LruMap(neighborsCacheSize);
 
     this._vec = vec4.create();
 
-    this._viewSize = {};
+    this._viewSize = { width: 0, height: 0 };
   }
   maxTileSize() {
     var maxTileSize = 0;
@@ -394,8 +417,13 @@ class FlatGeometry {
   }
 }
 
+// TODO: remove these when exports are used
+// @ts-ignore
 FlatGeometry.Tile = FlatGeometry.prototype.Tile = FlatTile;
+// @ts-ignore
 FlatGeometry.type = FlatGeometry.prototype.type = 'flat';
+// @ts-ignore
 FlatTile.type = FlatTile.prototype.type = 'flat';
 
+export { FlatTile };
 export default FlatGeometry;

src/renderers/WebGlBase.js → src/renderers/WebGlBase.ts

@@ -51,7 +51,15 @@ var uniformList = [
 ];
 
 class WebGlBaseRenderer {
-  constructor(gl) {
+  gl: any;
+  projMatrix: mat4;
+  viewportMatrix: mat4;
+  translateVector: vec3;
+  scaleVector: vec3;
+  constantBuffers: { vertexIndices: any; vertexPositions: any; textureCoords: any; };
+  shaderProgram: any;
+
+  constructor(gl: WebGLRenderingContext) {
     this.gl = gl;
 
     // The projection matrix positions the tiles in world space.
@@ -125,7 +133,7 @@ class WebGlBaseRenderer {
       colorMatrix: shaderProgram.uColorMatrix,
     });
   }
-  endLayer(layer, rect) {
+  endLayer() {
     var gl = this.gl;
     var shaderProgram = this.shaderProgram;
     disableAttributes(gl, shaderProgram);

src/renderers/WebGlCommon.js → src/renderers/WebGlCommon.ts

@@ -184,7 +184,7 @@ var scaleVector = vec3.create();
 // Therefore, when the scene's rect is not fully contained in the rendering
 // area, we clamp the viewport to the rendering area, and return a compensation
 // matrix to scale and translate vertices accordingly.
-function setViewport(gl, layer, rect, viewportMatrix) {
+function setViewport(gl, _layer, rect, viewportMatrix) {
   if (rect.x === 0 && rect.width === 1 && rect.y === 0 && rect.height === 1) {
     // Fast path for full rect.
     gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);

src/renderers/WebGlCube.js → src/renderers/WebGlCube.ts

@@ -27,8 +27,8 @@ import WebGlBaseRenderer from './WebGlBase';
  * destroyed by {@link Stage} as necessary.
  */
 class WebGlCubeRenderer extends WebGlBaseRenderer {
-  constructor(...args) {
-    super(...args);
+  constructor(gl: WebGLRenderingContext) {
+    super(gl);
   }
 }
 

src/renderers/WebGlEquirect.js → src/renderers/WebGlEquirect.ts

@@ -65,7 +65,12 @@ var uniformList = [
  * destroyed by {@link Stage} as necessary.
  */
 class WebGlEquirectRenderer {
-  constructor(gl) {
+  gl: any;
+  invProjMatrix: mat4;
+  viewportMatrix: mat4;
+  constantBuffers: { vertexIndices: any; vertexPositions: any; textureCoords: any; };
+  shaderProgram: any;
+  constructor(gl: WebGLRenderingContext) {
     this.gl = gl;
 
     // The inverse projection matrix.
@@ -144,12 +149,12 @@ class WebGlEquirectRenderer {
       colorMatrix: shaderProgram.uColorMatrix,
     });
   }
-  endLayer(layer, rect) {
+  endLayer() {
     var gl = this.gl;
     var shaderProgram = this.shaderProgram;
     disableAttributes(gl, shaderProgram);
   }
-  renderTile(tile, texture, layer, layerZ) {
+  renderTile(tile, texture, _layer, layerZ) {
     var gl = this.gl;
     var shaderProgram = this.shaderProgram;
     var constantBuffers = this.constantBuffers;

src/renderers/WebGlFlat.js → src/renderers/WebGlFlat.ts

@@ -27,8 +27,8 @@ import WebGlBaseRenderer from './WebGlBase';
  * destroyed by {@link Stage} as necessary.
  */
 class WebGlFlatRenderer extends WebGlBaseRenderer {
-  constructor(...args) {
-    super(...args);
+  constructor(gl: WebGLRenderingContext) {
+    super(gl);
   }
 }