fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-08 02:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bezier-rs: Updated Bezier function signatures to accept TValue (#967)

Browse Source 
* Create helper for converting d to t values

* Add euclidean option for tangent and normal

* Modified bezier functions signatures to accept ComputeType

* Stylistic changes per review

* Added ComputeType documentation

* Renamed ComputeType to TValue

* Fixed comments

* Fixed failing unit tests

* Code review

* Fix comments in code review

* Renamed compute_type_to_parametric to t_value_to_parametric

---------

Co-authored-by: Linda Zheng <thelindazheng@gmail.com>
Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Rob Nadal
2023-02-13 12:31:51 -05:00
committed by GitHub
co-authored by Linda Zheng Keavon Chambers
parent 1c2b8f67b2
commit 76be1f8515
25 changed files with 456 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/other/bezier-rs-demos/src/features/bezier-features.ts
+23 -17
View File
@@ -1,6 +1,6 @@
import { WasmBezier } from "@/../wasm/pkg";
import { tSliderOptions, tErrorOptions, tMinimumSeperationOptions } from "@/utils/options";
import { ComputeType, BezierDemoOptions, WasmBezierInstance, BezierCallback } from "@/utils/types";
import { tSliderOptions, errorOptions, minimumSeparationOptions } from "@/utils/options";
import { TVariant, BezierDemoOptions, WasmBezierInstance, BezierCallback } from "@/utils/types";
const bezierFeatures = {
constructor: {
@@ -67,13 +67,13 @@ const bezierFeatures = {
},
evaluate: {
name: "Evaluate",
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, computeType: ComputeType): string => bezier.evaluate(options.computeArgument, computeType),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.evaluate(options.t, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [{ ...tSliderOptions, variable: "computeArgument" }],
sliderOptions: [tSliderOptions],
},
},
chooseComputeType: true,
chooseTVariant: true,
},
"lookup-table": {
name: "Lookup Table",
@@ -118,25 +118,27 @@ const bezierFeatures = {
},
tangent: {
name: "Tangent",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.tangent(options.t),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.tangent(options.t, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [tSliderOptions],
},
},
chooseTVariant: true,
},
normal: {
name: "Normal",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.normal(options.t),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.normal(options.t, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [tSliderOptions],
},
},
chooseTVariant: true,
},
curvature: {
name: "Curvature",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.curvature(options.t),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.curvature(options.t, tVariant),
demoOptions: {
Linear: {
disabled: true,
@@ -145,19 +147,21 @@ const bezierFeatures = {
sliderOptions: [tSliderOptions],
},
},
chooseTVariant: true,
},
split: {
name: "Split",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.split(options.t),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.split(options.t, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [tSliderOptions],
},
},
chooseTVariant: true,
},
trim: {
name: "Trim",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.trim(options.t1, options.t2),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.trim(options.t1, options.t2, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [
@@ -178,6 +182,7 @@ const bezierFeatures = {
],
},
},
chooseTVariant: true,
},
project: {
name: "Project",
@@ -400,11 +405,11 @@ const bezierFeatures = {
[180, 10],
[90, 120],
];
return bezier.intersect_quadratic_segment(quadratic, options.error, options.minimum_seperation);
return bezier.intersect_quadratic_segment(quadratic, options.error, options.minimum_separation);
},
demoOptions: {
Quadratic: {
sliderOptions: [tErrorOptions, tMinimumSeperationOptions],
sliderOptions: [errorOptions, minimumSeparationOptions],
},
},
},
@@ -417,11 +422,11 @@ const bezierFeatures = {
[40, 120],
[175, 140],
];
return bezier.intersect_cubic_segment(cubic, options.error, options.minimum_seperation);
return bezier.intersect_cubic_segment(cubic, options.error, options.minimum_separation);
},
demoOptions: {
Quadratic: {
sliderOptions: [tErrorOptions, tMinimumSeperationOptions],
sliderOptions: [errorOptions, minimumSeparationOptions],
},
},
},
@@ -430,7 +435,7 @@ const bezierFeatures = {
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.intersect_self(options.error),
demoOptions: {
Quadratic: {
sliderOptions: [tErrorOptions],
sliderOptions: [errorOptions],
},
Cubic: {
customPoints: [
@@ -470,12 +475,13 @@ const bezierFeatures = {
},
"de-casteljau-points": {
name: "De Casteljau Points",
callback: (bezier: WasmBezierInstance, options: Record<string, number>): string => bezier.de_casteljau_points(options.t),
callback: (bezier: WasmBezierInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => bezier.de_casteljau_points(options.t, tVariant),
demoOptions: {
Quadratic: {
sliderOptions: [tSliderOptions],
},
},
chooseTVariant: true,
},
};
@@ -485,6 +491,6 @@ export type BezierFeatureOptions = {
callback: BezierCallback;
demoOptions?: Partial<BezierDemoOptions>;
triggerOnMouseMove?: boolean;
chooseComputeType?: boolean;
chooseTVariant?: boolean;
};
export default bezierFeatures as Record<BezierFeatureKey, BezierFeatureOptions>;
website/other/bezier-rs-demos/src/features/subpath-features.ts
+11 -11
View File
@@ -1,5 +1,5 @@
import { tSliderOptions } from "@/utils/options";
import { ComputeType, SliderOption, SubpathCallback, WasmSubpathInstance } from "@/utils/types";
import { TVariant, SliderOption, SubpathCallback, WasmSubpathInstance } from "@/utils/types";
const subpathFeatures = {
constructor: {
@@ -8,10 +8,10 @@ const subpathFeatures = {
},
insert: {
name: "Insert",
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, computeType: ComputeType): string => subpath.insert(options.computeArgument, computeType),
sliderOptions: [{ ...tSliderOptions, variable: "computeArgument" }],
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => subpath.insert(options.t, tVariant),
sliderOptions: [tSliderOptions],
// TODO: Uncomment this after implementing the Euclidean version
// chooseComputeType: true,
// chooseTVariant: true,
},
length: {
name: "Length",
@@ -19,9 +19,9 @@ const subpathFeatures = {
},
evaluate: {
name: "Evaluate",
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, computeType: ComputeType): string => subpath.evaluate(options.computeArgument, computeType),
sliderOptions: [{ ...tSliderOptions, variable: "computeArgument" }],
chooseComputeType: true,
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => subpath.evaluate(options.t, tVariant),
sliderOptions: [tSliderOptions],
chooseTVariant: true,
},
project: {
name: "Project",
@@ -68,10 +68,10 @@ const subpathFeatures = {
},
split: {
name: "Split",
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, computeType: ComputeType): string => subpath.split(options.computeArgument, computeType),
sliderOptions: [{ ...tSliderOptions, variable: "computeArgument" }],
callback: (subpath: WasmSubpathInstance, options: Record<string, number>, _: undefined, tVariant: TVariant): string => subpath.split(options.t, tVariant),
sliderOptions: [tSliderOptions],
// TODO: Uncomment this after implementing the Euclidean version
// chooseComputeType: true,
// chooseTVariant: true,
},
};
@@ -81,6 +81,6 @@ export type SubpathFeatureOptions = {
callback: SubpathCallback;
sliderOptions?: SliderOption[];
triggerOnMouseMove?: boolean;
chooseComputeType?: boolean;
chooseTVariant?: boolean;
};
export default subpathFeatures as Record<SubpathFeatureKey, SubpathFeatureOptions>;