소스 검색

Remove circular dependency

Popov72 4 년 전
부모
커밋
c7575d3d1f
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      src/Materials/material.ts
  2. 2 3
      src/PostProcesses/postProcessManager.ts

+ 1 - 1
src/Materials/material.ts

@@ -4,7 +4,6 @@ import { IAnimatable } from '../Animations/animatable.interface';
 import { SmartArray } from "../Misc/smartArray";
 import { Observer, Observable } from "../Misc/observable";
 import { Nullable } from "../types";
-import { Scene } from "../scene";
 import { Matrix } from "../Maths/math.vector";
 import { EngineStore } from "../Engines/engineStore";
 import { SubMesh } from "../Meshes/subMesh";
@@ -26,6 +25,7 @@ declare type PrePassRenderer = import("../Rendering/prePassRenderer").PrePassRen
 declare type Mesh = import("../Meshes/mesh").Mesh;
 declare type Animation = import("../Animations/animation").Animation;
 declare type InstancedMesh = import('../Meshes/instancedMesh').InstancedMesh;
+declare type Scene = import("../scene").Scene;
 
 declare var BABYLON: any;
 

+ 2 - 3
src/PostProcesses/postProcessManager.ts

@@ -1,5 +1,4 @@
 import { Nullable } from "../types";
-import { Material } from "../Materials/material";
 import { InternalTexture } from "../Materials/Textures/internalTexture";
 import { PostProcess } from "./postProcess";
 import { VertexBuffer } from "../Meshes/buffer";
@@ -130,7 +129,7 @@ export class PostProcessManager {
                 engine.bindBuffers(this._vertexBuffers, this._indexBuffer, effect);
 
                 // Draw order
-                engine.drawElementsType(Material.TriangleFillMode, 0, 6);
+                engine.drawElementsType(Constants.MATERIAL_TriangleFillMode, 0, 6);
 
                 pp.onAfterRenderObservable.notifyObservers(effect);
             }
@@ -193,7 +192,7 @@ export class PostProcessManager {
                 engine.bindBuffers(this._vertexBuffers, this._indexBuffer, effect);
 
                 // Draw order
-                engine.drawElementsType(Material.TriangleFillMode, 0, 6);
+                engine.drawElementsType(Constants.MATERIAL_TriangleFillMode, 0, 6);
 
                 pp.onAfterRenderObservable.notifyObservers(effect);
             }