Browse Source

Fix import after Merge

sebastien 6 years ago
parent
commit
a01bd95fa0
2 changed files with 7 additions and 7 deletions
  1. 4 4
      src/Gizmos/boundingBoxGizmo.ts
  2. 3 3
      src/Meshes/meshBuilder.ts

+ 4 - 4
src/Gizmos/boundingBoxGizmo.ts

@@ -3,7 +3,7 @@ import { Logger } from "Misc/logger";
 import { Nullable } from "types";
 import { PointerInfo } from "Events/pointerEvents";
 import { Scene } from "scene";
-import { Quaternion, Matrix, Vector3, Color3 } from "Maths/math";
+import { Quaternion, Matrix, Vector3, Color3, Epsilon } from "Maths/math";
 import { AbstractMesh } from "Meshes/abstractMesh";
 import { Mesh } from "Meshes/mesh";
 import { MeshBuilder } from "Meshes/meshBuilder";
@@ -523,13 +523,13 @@ import { StandardMaterial } from "Materials/standardMaterial";
 
             // Adjust scale to avoid undefined behavior when adding child
             if (box.scaling.y === 0) {
-                box.scaling.y = BABYLON.Epsilon;
+                box.scaling.y = Epsilon;
             }
             if (box.scaling.x === 0) {
-                box.scaling.x = BABYLON.Epsilon;
+                box.scaling.x = Epsilon;
             }
             if (box.scaling.z === 0) {
-                box.scaling.z = BABYLON.Epsilon;
+                box.scaling.z = Epsilon;
             }
 
             box.addChild(mesh);

+ 3 - 3
src/Meshes/meshBuilder.ts

@@ -2,7 +2,7 @@ import { Tools } from "Misc/tools";
 import { Nullable, FloatArray, IndicesArray } from "types";
 import { Camera } from "Cameras/camera";
 import { Scene } from "scene";
-import { Matrix, Vector3, Vector2, Color3, Color4, Plane, Tmp, Epsilon, Vector4, Axis, Path3D, PositionNormalVertex } from "Maths/math";
+import { Matrix, Vector3, Vector2, Color3, Color4, Plane, Tmp, Vector4, Path3D, PositionNormalVertex } from "Maths/math";
 import { Mesh, _CreationDataStorage } from "./mesh";
 import { AbstractMesh } from "./abstractMesh";
 import { VertexBuffer } from "./buffer";
@@ -976,9 +976,9 @@ Mesh.CreateDecal = (name: string, sourceMesh: AbstractMesh, position: Vector3, n
             if (options.sourcePlane) {
                 plane.translate(options.sourcePlane.normal, -options.sourcePlane.d);
 
-                const dot = BABYLON.Vector3.Dot(plane.position, options.sourcePlane.normal);
+                const dot = Vector3.Dot(plane.position, options.sourcePlane.normal);
                 const flip = dot >= 0;
-                plane.lookAt(BABYLON.Vector3.Zero(), 0, flip ? Math.PI : 0, 0);
+                plane.lookAt(Vector3.Zero(), 0, flip ? Math.PI : 0, 0);
             }
 
             return plane;