瀏覽代碼

Update polygonMesh.ts

Arthur Fiedler 6 年之前
父節點
當前提交
2db9fb30c1
共有 1 個文件被更改,包括 8 次插入0 次删除
  1. 8 0
      src/Meshes/polygonMesh.ts

+ 8 - 0
src/Meshes/polygonMesh.ts

@@ -156,7 +156,11 @@ export class PolygonMeshBuilder {
     private _holes = new Array<PolygonPoints>();
 
     private _name: string;
+<<<<<<< HEAD
     private _scene: Nullable<Scene>;
+=======
+    private _scene: Scene | undefined;
+>>>>>>> parent of df2c2232d... Updated polygonMesh.ts
 
     private _epoints: number[] = new Array<number>();
     private _eholes: number[] = new Array<number>();
@@ -182,7 +186,11 @@ export class PolygonMeshBuilder {
     constructor(name: string, contours: Path2 | Vector2[] | any, scene?: Scene, earcutInjection = earcut) {
         this.bjsEarcut = earcutInjection;
         this._name = name;
+<<<<<<< HEAD
         this._scene = scene || Engine.LastCreatedScene;
+=======
+        this._scene = scene;
+>>>>>>> parent of df2c2232d... Updated polygonMesh.ts
 
         var points: Vector2[];
         if (contours instanceof Path2) {