From 15a0a2cc247bd76b370ced5ce8fe330ed8162d57 Mon Sep 17 00:00:00 2001 From: tom Date: Mon, 27 May 2019 07:50:02 -0400 Subject: [PATCH 1/2] clear bogus "circular references" for Rollup --- src/Engines/engine.ts | 20 +++++++++---------- .../Controllers/poseEnabledController.ts | 1 - src/Gamepads/gamepad.ts | 1 - src/Materials/material.ts | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Engines/engine.ts b/src/Engines/engine.ts index f9281ad705d..d771365014e 100644 --- a/src/Engines/engine.ts +++ b/src/Engines/engine.ts @@ -12,7 +12,6 @@ import { IDisplayChangedEventArgs } from "../Engines/engine"; import { VertexBuffer } from "../Meshes/buffer"; import { UniformBuffer } from "../Materials/uniformBuffer"; import { Effect, EffectCreationOptions, EffectFallbacks } from "../Materials/effect"; -import { Material } from "../Materials/material"; import { IInternalTextureLoader } from "../Materials/Textures/internalTextureLoader"; import { InternalTexture } from "../Materials/Textures/internalTexture"; import { BaseTexture } from "../Materials/Textures/baseTexture"; @@ -33,6 +32,7 @@ import { IPipelineContext } from './IPipelineContext'; import { DataBuffer } from '../Meshes/dataBuffer'; import { WebGLDataBuffer } from '../Meshes/WebGL/webGLDataBuffer'; +declare type Material = import("../Materials/material").Material; declare type PostProcess = import("../PostProcesses/postProcess").PostProcess; declare type Texture = import("../Materials/Textures/texture").Texture; declare type VideoTexture = import("../Materials/Textures/videoTexture").VideoTexture; @@ -3094,24 +3094,24 @@ export class Engine { private _drawMode(fillMode: number): number { switch (fillMode) { // Triangle views - case Material.TriangleFillMode: + case Constants.MATERIAL_TriangleFillMode: return this._gl.TRIANGLES; - case Material.PointFillMode: + case Constants.MATERIAL_PointFillMode: return this._gl.POINTS; - case Material.WireFrameFillMode: + case Constants.MATERIAL_WireFrameFillMode: return this._gl.LINES; // Draw modes - case Material.PointListDrawMode: + case Constants.MATERIAL_PointListDrawMode: return this._gl.POINTS; - case Material.LineListDrawMode: + case Constants.MATERIAL_LineListDrawMode: return this._gl.LINES; - case Material.LineLoopDrawMode: + case Constants.MATERIAL_LineLoopDrawMode: return this._gl.LINE_LOOP; - case Material.LineStripDrawMode: + case Constants.MATERIAL_LineStripDrawMode: return this._gl.LINE_STRIP; - case Material.TriangleStripDrawMode: + case Constants.MATERIAL_TriangleStripDrawMode: return this._gl.TRIANGLE_STRIP; - case Material.TriangleFanDrawMode: + case Constants.MATERIAL_TriangleFanDrawMode: return this._gl.TRIANGLE_FAN; default: return this._gl.TRIANGLES; diff --git a/src/Gamepads/Controllers/poseEnabledController.ts b/src/Gamepads/Controllers/poseEnabledController.ts index ccf127b3db1..50598efd34c 100644 --- a/src/Gamepads/Controllers/poseEnabledController.ts +++ b/src/Gamepads/Controllers/poseEnabledController.ts @@ -10,7 +10,6 @@ import { _DepthCullingState, _StencilState, _AlphaState } from "../../States/ind import { EngineStore } from "../../Engines/engineStore"; import { Gamepad } from "../../Gamepads/gamepad"; -import { ExtendedGamepadButton } from "./poseEnabledController"; import { WebVRFreeCamera, PoseControlled, DevicePose } from "../../Cameras/VR/webVRCamera"; import { TargetCamera } from "../../Cameras/targetCamera"; diff --git a/src/Gamepads/gamepad.ts b/src/Gamepads/gamepad.ts index 6dafca224b8..3b990c688b3 100644 --- a/src/Gamepads/gamepad.ts +++ b/src/Gamepads/gamepad.ts @@ -1,5 +1,4 @@ import { Observable } from "../Misc/observable"; -import { GamepadButtonChanges } from "../Gamepads/gamepad"; import { _TimeToken } from "../Instrumentation/timeToken"; import { _DepthCullingState, _StencilState, _AlphaState } from "../States/index"; diff --git a/src/Materials/material.ts b/src/Materials/material.ts index f47a5bd4490..e5cc742fe09 100644 --- a/src/Materials/material.ts +++ b/src/Materials/material.ts @@ -9,7 +9,6 @@ import { EngineStore } from "../Engines/engineStore"; import { BaseSubMesh, SubMesh } from "../Meshes/subMesh"; import { Geometry } from "../Meshes/geometry"; import { AbstractMesh } from "../Meshes/abstractMesh"; -import { Mesh } from "../Meshes/mesh"; import { UniformBuffer } from "./uniformBuffer"; import { Effect } from "./effect"; import { BaseTexture } from "../Materials/Textures/baseTexture"; @@ -19,6 +18,7 @@ import { Constants } from "../Engines/constants"; import { Logger } from "../Misc/logger"; import { IInspectable } from '../Misc/iInspectable'; +declare type Mesh = import("../Meshes/mesh").Mesh; declare type Animation = import("../Animations/animation").Animation; declare type InstancedMesh = import('../Meshes/instancedMesh').InstancedMesh; From 03467cc279a3299cbb338e785dd5fb76938b0de0 Mon Sep 17 00:00:00 2001 From: tom Date: Wed, 29 May 2019 07:18:23 -0400 Subject: [PATCH 2/2] changed refs from Materials to Constants.Materials --- src/Engines/engine.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/Engines/engine.ts diff --git a/src/Engines/engine.ts b/src/Engines/engine.ts old mode 100644 new mode 100755 index d771365014e..23d67ba8992 --- a/src/Engines/engine.ts +++ b/src/Engines/engine.ts @@ -3023,7 +3023,7 @@ export class Engine { * @param instancesCount defines the number of instances to draw (if instanciation is enabled) */ public draw(useTriangles: boolean, indexStart: number, indexCount: number, instancesCount?: number): void { - this.drawElementsType(useTriangles ? Material.TriangleFillMode : Material.WireFrameFillMode, indexStart, indexCount, instancesCount); + this.drawElementsType(useTriangles ? Constants.MATERIAL_TriangleFillMode : Constants.MATERIAL_WireFrameFillMode, indexStart, indexCount, instancesCount); } /** @@ -3033,7 +3033,7 @@ export class Engine { * @param instancesCount defines the number of instances to draw (if instanciation is enabled) */ public drawPointClouds(verticesStart: number, verticesCount: number, instancesCount?: number): void { - this.drawArraysType(Material.PointFillMode, verticesStart, verticesCount, instancesCount); + this.drawArraysType(Constants.MATERIAL_PointFillMode, verticesStart, verticesCount, instancesCount); } /** @@ -3044,7 +3044,7 @@ export class Engine { * @param instancesCount defines the number of instances to draw (if instanciation is enabled) */ public drawUnIndexed(useTriangles: boolean, verticesStart: number, verticesCount: number, instancesCount?: number): void { - this.drawArraysType(useTriangles ? Material.TriangleFillMode : Material.WireFrameFillMode, verticesStart, verticesCount, instancesCount); + this.drawArraysType(useTriangles ? Constants.MATERIAL_TriangleFillMode : Constants.MATERIAL_WireFrameFillMode, verticesStart, verticesCount, instancesCount); } /**