Pārlūkot izejas kodu

abstractmesh to instancemesh cyclic ref

sebastien 6 gadi atpakaļ
vecāks
revīzija
e47805a6c7
3 mainītis faili ar 5 papildinājumiem un 7 dzēšanām
  1. 2 3
      src/Math/math.ts
  2. 1 2
      src/Mesh/abstractMesh.ts
  3. 2 2
      src/Mesh/instancedMesh.ts

+ 2 - 3
src/Math/math.ts

@@ -1,7 +1,6 @@
-import { DeepImmutable } from "types";
+import { DeepImmutable, Nullable, FloatArray, float } from "types";
 import { ArrayTools } from "Tools/arrayTools";
-import { Nullable, FloatArray, float } from "types";
-import { Scalar } from "Math/math.scalar";
+import { Scalar } from "./math.scalar";
 import { Engine } from "Engine/engine";
 import { Ray } from "Culling/ray";
     /**

+ 1 - 2
src/Mesh/abstractMesh.ts

@@ -10,7 +10,6 @@ import { VertexBuffer } from "Mesh/vertexBuffer";
 import { VertexData, IGetSetVerticesData } from "Mesh/mesh.vertexData";
 import { TransformNode } from "Mesh/transformNode";
 import { SubMesh } from "Mesh/subMesh";
-import { InstancedMesh } from "Mesh/instancedMesh";
 import { PickingInfo, IntersectionInfo } from "Collisions/pickingInfo";
 import { Collider } from "Collisions/collider";
 import { Ray } from "Culling/ray";
@@ -604,7 +603,7 @@ import { SolidParticle } from "Particles/solidParticle";
          * @returns a string representation of the current mesh
          */
         public toString(fullDetails?: boolean): string {
-            var ret = "Name: " + this.name + ", isInstance: " + (this instanceof InstancedMesh ? "YES" : "NO");
+            var ret = "Name: " + this.name + ", isInstance: " + (this.getClassName() !== "InstancedMesh" ? "YES" : "NO");
             ret += ", # of submeshes: " + (this.subMeshes ? this.subMeshes.length : 0);
             if (this._skeleton) {
                 ret += ", skeleton: " + this._skeleton.name;

+ 2 - 2
src/Mesh/instancedMesh.ts

@@ -1,7 +1,7 @@
-import { Tools } from "Tools/tools";
 import { Nullable, FloatArray, IndicesArray } from "types";
-import { Camera } from "Cameras/camera";
 import { Vector3 } from "Math/math";
+import { Tools } from "Tools/tools";
+import { Camera } from "Cameras/camera";
 import { Node } from "node";
 import { AbstractMesh } from "Mesh/abstractMesh";
 import { Mesh } from "Mesh/mesh";