sebavan 6 years ago
parent
commit
b400cbfc9e

+ 2 - 1
src/Collisions/index.ts

@@ -1,3 +1,4 @@
 export * from "./collider";
 export * from "./collisionCoordinator";
-export * from "./pickingInfo";
+export * from "./pickingInfo";
+export * from "./intersectionInfo";

+ 15 - 0
src/Collisions/intersectionInfo.ts

@@ -0,0 +1,15 @@
+import { Nullable } from "../types";
+
+    /**
+     * @hidden
+     */
+    export class IntersectionInfo {
+        public faceId = 0;
+        public subMeshId = 0;
+
+        constructor(
+            public bu: Nullable<number>,
+            public bv: Nullable<number>,
+            public distance: number) {
+        }
+    }

+ 1 - 14
src/Collisions/pickingInfo.ts

@@ -4,21 +4,8 @@ import { AbstractMesh } from "../Meshes/abstractMesh";
 import { VertexBuffer } from "../Meshes/buffer";
 import { Ray } from "../Culling/ray";
 import { Sprite } from "../Sprites/sprite";
-    /**
-     * @hidden
-     */
-    export class IntersectionInfo {
-        public faceId = 0;
-        public subMeshId = 0;
-
-        constructor(
-            public bu: Nullable<number>,
-            public bv: Nullable<number>,
-            public distance: number) {
-        }
-    }
 
-    /**
+/**
      * Information about the result of picking within a scene
      * @see https://doc.babylonjs.com/babylon101/picking_collisions
      */

+ 2 - 1
src/Culling/ray.ts

@@ -2,7 +2,8 @@ import { DeepImmutable, Nullable, float } from "../types";
 import { ArrayTools } from "../Misc/arrayTools";
 import { Matrix, Vector3, Plane, Tmp } from "../Maths/math";
 import { AbstractMesh } from "../Meshes/abstractMesh";
-import { PickingInfo, IntersectionInfo } from "../Collisions/pickingInfo";
+import { PickingInfo } from "../Collisions/pickingInfo";
+import { IntersectionInfo } from "../Collisions/intersectionInfo";
 import { BoundingBox } from "./boundingBox";
 import { BoundingSphere } from "./boundingSphere";
     /**

+ 2 - 1
src/Meshes/abstractMesh.ts

@@ -10,7 +10,8 @@ import { VertexBuffer } from "../Meshes/buffer";
 import { VertexData, IGetSetVerticesData } from "../Meshes/mesh.vertexData";
 import { TransformNode } from "../Meshes/transformNode";
 import { SubMesh } from "../Meshes/subMesh";
-import { PickingInfo, IntersectionInfo } from "../Collisions/pickingInfo";
+import { PickingInfo } from "../Collisions/pickingInfo";
+import { IntersectionInfo } from "../Collisions/intersectionInfo";
 import { Collider } from "../Collisions/collider";
 import { Ray } from "../Culling/ray";
 import { ICullable, BoundingInfo } from "../Culling/boundingInfo";

+ 1 - 1
src/Meshes/subMesh.ts

@@ -4,7 +4,7 @@ import { Matrix, Vector3, Plane } from "../Maths/math";
 import { Engine } from "../Engines/engine";
 import { VertexBuffer } from "./buffer";
 import { Collider } from "../Collisions/collider";
-import { IntersectionInfo } from "../Collisions/pickingInfo";
+import { IntersectionInfo } from "../Collisions/intersectionInfo";
 import { Ray } from "../Culling/ray";
 import { ICullable, BoundingInfo } from "../Culling/boundingInfo";
 import { Effect } from "../Materials/effect";