Skip to content

Commit

Permalink
feat(geom): re-add vertices() impls for Cubic/Quadratic
Browse files Browse the repository at this point in the history
  • Loading branch information
postspectacular committed Jan 18, 2019
1 parent 3c9a7b0 commit f5a53ca
Showing 1 changed file with 64 additions and 10 deletions.
74 changes: 64 additions & 10 deletions packages/geom3/src/ops/vertices.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
import { isNumber, isPlainObject } from "@thi.ng/checks";
import { defmulti, MultiFn1O } from "@thi.ng/defmulti";
import { cossin, TAU } from "@thi.ng/math";
import {
add2,
cartesian2,
madd2,
mixCubic,
mixQuadratic,
set2,
Vec
} from "@thi.ng/vectors3";
import {
Arc,
Circle,
Cubic,
DEFAULT_SAMPLES,
Ellipse,
Group,
IShape,
Path,
Polygon,
Polyline,
Quadratic,
Rect,
SamplingOpts,
Type
} from "../api";
import { dispatch } from "../internal/dispatch";
import { resamplePoints, Sampler } from "../internal/sampler";
import {
add2,
cartesian2,
madd2,
set2,
Vec,
} from "@thi.ng/vectors3";

export const vertices: MultiFn1O<IShape, number | Partial<SamplingOpts>, Vec[]> = defmulti(dispatch);

Expand Down Expand Up @@ -66,6 +70,31 @@ vertices.addAll({
return buf;
},

[Type.CUBIC]:
($: Cubic, opts?: number | Partial<SamplingOpts>) => {
if (isPlainObject(opts) && (<any>opts).dist !== undefined) {
return new Sampler(vertices($, (<any>opts).num || DEFAULT_SAMPLES))
.sampleUniform((<any>opts).dist, (<any>opts).last !== false);
}
opts = isNumber(opts) ?
{
num: opts,
last: true
} :
{
num: DEFAULT_SAMPLES,
...opts
};
const res: Vec[] = [];
const [a, b, c, d] = $.points;
const delta = 1 / opts.num;
for (let t = 0; t < opts.num; t++) {
res.push(mixCubic([], a, b, c, d, t * delta));
}
opts.last && res.push([d[0], d[1]]);
return res;
},

[Type.ELLIPSE]:
($: Ellipse, opts = DEFAULT_SAMPLES) => {
const buf: Vec[] = [];
Expand All @@ -85,16 +114,16 @@ vertices.addAll({
children.reduce((acc, $) => acc.concat(vertices($)), []),

[Type.PATH]:
(path: Path, opts?: number | Partial<SamplingOpts>) => {
($: Path, opts?: number | Partial<SamplingOpts>) => {
const _opts = isNumber(opts) ?
{ num: opts } :
opts;
let verts: Vec[] = [];
for (let segs = path.segments, n = segs.length - 1, i = 0; i <= n; i++) {
for (let segs = $.segments, n = segs.length - 1, i = 0; i <= n; i++) {
const s = segs[i];
if (s.geo) {
verts = verts.concat(
vertices(s.geo, { ..._opts, last: i === n && !path.closed })
vertices(s.geo, { ..._opts, last: i === n && !$.closed })
);
}
}
Expand All @@ -109,6 +138,31 @@ vertices.addAll({
($: Polyline, opts?) =>
resamplePoints($.points, opts),

[Type.QUADRATIC]:
($: Quadratic, opts?: number | Partial<SamplingOpts>) => {
if (isPlainObject(opts) && (<any>opts).dist !== undefined) {
return new Sampler(vertices($, (<any>opts).num || DEFAULT_SAMPLES))
.sampleUniform((<any>opts).dist, (<any>opts).last !== false);
}
opts = isNumber(opts) ?
{
num: opts,
last: true
} :
{
num: DEFAULT_SAMPLES,
...opts
};
const res: Vec[] = [];
const delta = 1 / opts.num;
const [a, b, c] = $.points;
for (let t = 0; t < opts.num; t++) {
res.push(mixQuadratic([], a, b, c, t * delta));
}
opts.last && res.push([c[0], c[1]]);
return res;
},

[Type.RECT]:
($: Rect, opts) => {
const p = $.pos;
Expand Down

0 comments on commit f5a53ca

Please sign in to comment.