Merge pull request #37 from Microsoft/dev

moved IPathIntersection into root module

Author: danmarshall

src/core/intersect.ts

@@ -2,31 +2,6 @@
 
 module MakerJs.path {
 
-    /**
-     * An intersection of two paths.
-     */
-    export interface IPathIntersection {
-
-        /**
-         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
-         */
-        intersectionPoints: IPoint[];
-
-        /**
-         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the first path parameter. 
-         * The length of the array may be either 1 or 2.
-         */
-        path1Angles?: number[];
-
-        /**
-         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the second path parameter. 
-         * The length of the array may be either 1 or 2.
-         */
-        path2Angles?: number[];
-    }
-
     /**
      * @private
      */

src/core/maker.ts

@@ -251,6 +251,31 @@ module MakerJs {
         Arc: "arc"
     };
 
+    /**
+     * An intersection of two paths.
+     */
+    export interface IPathIntersection {
+
+        /**
+         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
+         */
+        intersectionPoints: IPoint[];
+
+        /**
+         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the first path parameter. 
+         * The length of the array may be either 1 or 2.
+         */
+        path1Angles?: number[];
+
+        /**
+         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the second path parameter. 
+         * The length of the array may be either 1 or 2.
+         */
+        path2Angles?: number[];
+    }
+
     //models
 
     export interface IPathMap {

target/ts/makerjs.d.ts

@@ -185,6 +185,27 @@ declare module MakerJs {
         Circle: string;
         Arc: string;
     };
+    /**
+     * An intersection of two paths.
+     */
+    interface IPathIntersection {
+        /**
+         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
+         */
+        intersectionPoints: IPoint[];
+        /**
+         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the first path parameter.
+         * The length of the array may be either 1 or 2.
+         */
+        path1Angles?: number[];
+        /**
+         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the second path parameter.
+         * The length of the array may be either 1 or 2.
+         */
+        path2Angles?: number[];
+    }
     interface IPathMap {
         [id: string]: IPath;
     }
@@ -632,27 +653,6 @@ declare module MakerJs.solvers {
     function solveTriangleASA(oppositeAngleInDegrees: number, lengthOfSideBetweenAngles: number, otherAngleInDegrees: number): number;
 }
 declare module MakerJs.path {
-    /**
-     * An intersection of two paths.
-     */
-    interface IPathIntersection {
-        /**
-         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
-         */
-        intersectionPoints: IPoint[];
-        /**
-         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the first path parameter.
-         * The length of the array may be either 1 or 2.
-         */
-        path1Angles?: number[];
-        /**
-         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the second path parameter.
-         * The length of the array may be either 1 or 2.
-         */
-        path2Angles?: number[];
-    }
     /**
      * Find the point(s) where 2 paths intersect.
      *