Skip to content

Commit

Permalink
fix Build error
Browse files Browse the repository at this point in the history
  • Loading branch information
pandanoir committed Nov 14, 2017
1 parent d7084b6 commit 4e287ac
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 71 deletions.
1 change: 1 addition & 0 deletions src/canvas.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Unitary from './unitary.js';
const __imageCaches = [];
const errorCatcher = e => {
console.log(e);
Expand Down
73 changes: 2 additions & 71 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,72 +1,3 @@
"use strict";
import Unitary from './unitary.js';
import Canvas from './canvas.js';

import UnitaryObject from './classes/unitaryobject.js';
import ContouredObject from './classes/contouredobject.js';

import BezierCurve from './classes/beziercurve.js';
import Circle from './classes/circle.js';
import CircularSector from './classes/circularsector.js';
import Curve from './classes/curve.js';
import Doughnut from './classes/doughnut.js';
import Ellipse from './classes/ellipse.js';
import Graph from './classes/graph.js';
import Group from './classes/group.js';
import Image_ from './classes/image.js';
import Line from './classes/line.js';
import Point from './classes/point.js';
import Polygon from './classes/polygon.js';
import Quadrilateral from './classes/quadrilateral.js';
import Rect from './classes/rect.js';
import Segment from './classes/segment.js';
import Text_ from './classes/text.js';
import Triangle from './classes/triangle.js';
import {BaseVector, Vector, Vector3D} from './classes/vector.js';
import {version as VERSION} from '../package.json';

export default {
distance: (A, B) => {
let res;
if (A instanceof Point && B instanceof Point) {
return Math.sqrt((A.x - B.x) * (A.x - B.x) + (A.y - B.y) * (A.y - B.y));
}
if (A instanceof Point && B instanceof Line) {
res = B.a * A.x + B.b * A.y + B.c;
if (res < 0) {
res *= -1;
}
res /= Math.sqrt(B.a * B.a + B.b * B.b);
return res;
}
if (A instanceof Line && B instanceof Point) {
return distance(B, A);
}
},
Canvas,
UnitaryObject,
ContouredObject,
BaseVector,
BezierCurve,
Circle,
CircularSector,
Curve,
Doughnut,
Donut: Doughnut,
Ellipse,
Graph,
Group,
Image: Image_,
Line,
Point,
Polygon,
Quadrilateral,
Rect,
Segment,
Text: Text_,
Triangle,
Vector3D,
Vector,
XAxis: new Line(new Point(0, 0), new Point(1, 0)),
YAxis: new Line(new Point(0, 0), new Point(0, 1)),
VERSION
};
export default Object.assign({}, Unitary, {Canvas});
1 change: 1 addition & 0 deletions src/painter/beziercurve.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Unitary from '../unitary.js';
export default function(obj) {
this.canvas.beginPath();
const controlPoints = obj.controlPoints;
Expand Down
1 change: 1 addition & 0 deletions src/painter/curve.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Unitary from '../unitary.js';
export default function(obj) {
this.canvas.beginPath();
const {start, end, x, y} = obj;
Expand Down
1 change: 1 addition & 0 deletions src/painter/graph.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Unitary from '../unitary.js';
export default function(obj) {
this.canvas.beginPath();
let start = obj.start , end = obj.end;
Expand Down
1 change: 1 addition & 0 deletions src/painter/line.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Unitary from '../unitary.js';
export default function(obj) {
const S = Unitary.Segment, P = Unitary.Point;
const width = this.canvasWidth, height = this.canvasHeight;
Expand Down
69 changes: 69 additions & 0 deletions src/unitary.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
"use strict";
import UnitaryObject from './classes/unitaryobject.js';
import ContouredObject from './classes/contouredobject.js';

import BezierCurve from './classes/beziercurve.js';
import Circle from './classes/circle.js';
import CircularSector from './classes/circularsector.js';
import Curve from './classes/curve.js';
import Doughnut from './classes/doughnut.js';
import Ellipse from './classes/ellipse.js';
import Graph from './classes/graph.js';
import Group from './classes/group.js';
import Image_ from './classes/image.js';
import Line from './classes/line.js';
import Point from './classes/point.js';
import Polygon from './classes/polygon.js';
import Quadrilateral from './classes/quadrilateral.js';
import Rect from './classes/rect.js';
import Segment from './classes/segment.js';
import Text_ from './classes/text.js';
import Triangle from './classes/triangle.js';
import {BaseVector, Vector, Vector3D} from './classes/vector.js';
import {version as VERSION} from '../package.json';

export default {
distance: (A, B) => {
let res;
if (A instanceof Point && B instanceof Point) {
return Math.sqrt((A.x - B.x) * (A.x - B.x) + (A.y - B.y) * (A.y - B.y));
}
if (A instanceof Point && B instanceof Line) {
res = B.a * A.x + B.b * A.y + B.c;
if (res < 0) {
res *= -1;
}
res /= Math.sqrt(B.a * B.a + B.b * B.b);
return res;
}
if (A instanceof Line && B instanceof Point) {
return distance(B, A);
}
},
UnitaryObject,
ContouredObject,
BaseVector,
BezierCurve,
Circle,
CircularSector,
Curve,
Doughnut,
Donut: Doughnut,
Ellipse,
Graph,
Group,
Image: Image_,
Line,
Point,
Polygon,
Quadrilateral,
Rect,
Segment,
Text: Text_,
Triangle,
Vector3D,
Vector,
XAxis: new Line(new Point(0, 0), new Point(1, 0)),
YAxis: new Line(new Point(0, 0), new Point(0, 1)),
VERSION
};

0 comments on commit 4e287ac

Please sign in to comment.