Skip to content

Commit 6e87235

Browse files
authored
Merge pull request #16630 from Mugen87/dev30
JSM: Added module and TS file for CurveExtras.
2 parents 4eb7907 + 81de84f commit 6e87235

File tree

8 files changed

+532
-22
lines changed

8 files changed

+532
-22
lines changed

docs/manual/en/introduction/Import-via-modules.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ <h2>Importable Examples</h2>
9898
</li>
9999
<li>curves
100100
<ul>
101+
<li>CurveExtras</li>
101102
<li>NURBSCurve</li>
102103
<li>NURBSSurface</li>
103104
<li>NURBSUtils</li>

examples/js/CurveExtras.js renamed to examples/js/curves/CurveExtras.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* http://prideout.net/blog/?p=44
1212
*/
1313

14-
( function ( Curves ) {
14+
THREE.Curves = ( function () {
1515

1616
// GrannyKnot
1717

@@ -405,21 +405,21 @@
405405

406406
};
407407

408-
// export
409-
410-
Curves.GrannyKnot = GrannyKnot;
411-
Curves.HeartCurve = HeartCurve;
412-
Curves.VivianiCurve = VivianiCurve;
413-
Curves.KnotCurve = KnotCurve;
414-
Curves.HelixCurve = HelixCurve;
415-
Curves.TrefoilKnot = TrefoilKnot;
416-
Curves.TorusKnot = TorusKnot;
417-
Curves.CinquefoilKnot = CinquefoilKnot;
418-
Curves.TrefoilPolynomialKnot = TrefoilPolynomialKnot;
419-
Curves.FigureEightPolynomialKnot = FigureEightPolynomialKnot;
420-
Curves.DecoratedTorusKnot4a = DecoratedTorusKnot4a;
421-
Curves.DecoratedTorusKnot4b = DecoratedTorusKnot4b;
422-
Curves.DecoratedTorusKnot5a = DecoratedTorusKnot5a;
423-
Curves.DecoratedTorusKnot5c = DecoratedTorusKnot5c;
424-
425-
} )( THREE.Curves = THREE.Curves || {} );
408+
return {
409+
GrannyKnot: GrannyKnot,
410+
HeartCurve: HeartCurve,
411+
VivianiCurve: VivianiCurve,
412+
KnotCurve: KnotCurve,
413+
HelixCurve: HelixCurve,
414+
TrefoilKnot: TrefoilKnot,
415+
TorusKnot: TorusKnot,
416+
CinquefoilKnot: CinquefoilKnot,
417+
TrefoilPolynomialKnot: TrefoilPolynomialKnot,
418+
FigureEightPolynomialKnot: FigureEightPolynomialKnot,
419+
DecoratedTorusKnot4a: DecoratedTorusKnot4a,
420+
DecoratedTorusKnot4b: DecoratedTorusKnot4b,
421+
DecoratedTorusKnot5a: DecoratedTorusKnot5a,
422+
DecoratedTorusKnot5c: DecoratedTorusKnot5c
423+
};
424+
425+
} )();
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
import {
2+
Curve,
3+
Vector3
4+
} from '../../../src/Three';
5+
6+
7+
export namespace Curves {
8+
9+
export class GrannyKnot extends Curve<Vector3> {
10+
constructor();
11+
}
12+
13+
export class HeartCurve extends Curve<Vector3> {
14+
constructor(scale?: number);
15+
scale: number;
16+
}
17+
18+
export class VivianiCurve extends Curve<Vector3> {
19+
constructor(scale?: number);
20+
scale: number;
21+
}
22+
23+
export class KnotCurve extends Curve<Vector3> {
24+
constructor();
25+
}
26+
27+
export class HelixCurve extends Curve<Vector3> {
28+
constructor();
29+
}
30+
31+
export class TrefoilKnot extends Curve<Vector3> {
32+
constructor(scale?: number);
33+
scale: number;
34+
}
35+
36+
export class TorusKnot extends Curve<Vector3> {
37+
constructor(scale?: number);
38+
scale: number;
39+
}
40+
41+
export class CinquefoilKnot extends Curve<Vector3> {
42+
constructor(scale?: number);
43+
scale: number;
44+
}
45+
46+
export class TrefoilPolynomialKnot extends Curve<Vector3> {
47+
constructor(scale?: number);
48+
scale: number;
49+
}
50+
51+
export class FigureEightPolynomialKnot extends Curve<Vector3> {
52+
constructor(scale?: number);
53+
scale: number;
54+
}
55+
56+
export class DecoratedTorusKnot4a extends Curve<Vector3> {
57+
constructor(scale?: number);
58+
scale: number;
59+
}
60+
61+
export class DecoratedTorusKnot4b extends Curve<Vector3> {
62+
constructor(scale?: number);
63+
scale: number;
64+
}
65+
66+
export class DecoratedTorusKnot5a extends Curve<Vector3> {
67+
constructor(scale?: number);
68+
scale: number;
69+
}
70+
71+
export class DecoratedTorusKnot5c extends Curve<Vector3> {
72+
constructor(scale?: number);
73+
scale: number;
74+
}
75+
76+
}

0 commit comments

Comments
 (0)