forked from comfyanonymous/litegraph.js
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Format only * Revert accidental change * Fix redundant falsy check - uninit. var * nit - Refactor const/let * nit - Refactor const/let (manual) * nit - Redeclared params * Add TS types & minor refactor only * Refactor - Clean up / reformat - Add strings.ts helper functions - Remove unused vars & local function params - Simplifies code - Rename vars for clarity - Add TODOs and other comments - Add ts-expect-error * Redirect draw.ts enums to global file (temp.) Should be revisited after TS merge complete Corrects import of types from draw.ts into interfaces * Add measure.ts - move util funcs from Global * Add all imports required for TS conversion * Refactor - TS narrowing * nit - TS types & minor refactor * Add missing types from recent PRs Removes duplicate declarations Fixes some type mismatches * nit - Refactor recent PRs * Revert incorrect decls backported * Remove unused params * Add TS types only * Fix minor TS type coercion issues Also removes redundant code * nit - Refactor * Remove @ts-nocheck * Fix refactor regression - drag link to output Issue was the result of fixing var declared outside of closure * Restore original logic --------- Co-authored-by: huchenlei <[email protected]>
- Loading branch information
1 parent
edfa5e7
commit d69a2ae
Showing
10 changed files
with
4,005 additions
and
4,193 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| import type { Point, Rect } from "./interfaces" | ||
| import { LinkDirection } from "./types/globalEnums" | ||
|
|
||
| type PointReadOnly = readonly [x: number, y: number] | Float32Array | Float64Array | ||
|
|
||
| /** | ||
| * Calculates the distance between two points (2D vector) | ||
| * @param a Point a as x, y | ||
| * @param b Point b as x, y | ||
| * @returns Distance between point a & b | ||
| */ | ||
| export function distance(a: PointReadOnly, b: PointReadOnly): number { | ||
| return Math.sqrt( | ||
| (b[0] - a[0]) * (b[0] - a[0]) + (b[1] - a[1]) * (b[1] - a[1]) | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Calculates the distance2 (squared) between two points (2D vector). | ||
| * Much faster when only comparing distances (closest/furthest point). | ||
| * @param a Point a as x, y | ||
| * @param b Point b as x, y | ||
| * @returns Distance2 (squared) between point a & b | ||
| */ | ||
| export function dist2(a: PointReadOnly, b: PointReadOnly): number { | ||
| return ((b[0] - a[0]) * (b[0] - a[0])) + ((b[1] - a[1]) * (b[1] - a[1])) | ||
| } | ||
|
|
||
| /** | ||
| * Determines whether a point is inside a rectangle. | ||
| * @param point The point to check, as x, y | ||
| * @param rect The rectangle, as x, y, width, height | ||
| * @returns true if the point is inside the rect, otherwise false | ||
| */ | ||
| export function isPointInRectangle(point: PointReadOnly, rect: Rect): boolean { | ||
| return rect[0] < point[0] | ||
| && rect[0] + rect[2] > point[0] | ||
| && rect[1] < point[1] | ||
| && rect[1] + rect[3] > point[1] | ||
| } | ||
|
|
||
| /** | ||
| * Determines whether a point is inside a rectangle. | ||
| * @param x Point x | ||
| * @param y Point y | ||
| * @param left Rect x | ||
| * @param top Rect y | ||
| * @param width Rect width | ||
| * @param height Rect height | ||
| * @returns true if the point is inside the rect, otherwise false | ||
| */ | ||
| export function isInsideRectangle(x: number, y: number, left: number, top: number, width: number, height: number): boolean { | ||
| return left < x | ||
| && left + width > x | ||
| && top < y | ||
| && top + height > y | ||
| } | ||
|
|
||
| /** | ||
| * Cheap, low accuracy check to determine if a point is roughly inside a sort-of octagon | ||
| * @param x Point x | ||
| * @param y Point y | ||
| * @param radius Radius to use as rough guide for octagon | ||
| * @returns true if the point is roughly inside the octagon centred on 0,0 with specified radius | ||
| */ | ||
| export function isSortaInsideOctagon(x: number, y: number, radius: number) { | ||
| const sum = Math.min(radius, Math.abs(x)) + Math.min(radius, Math.abs(y)) | ||
| return sum < radius * 0.75 | ||
| } | ||
|
|
||
| /** | ||
| * Determines if two rectangles have any overlap | ||
| * @param a Rectangle A as x, y, width, height | ||
| * @param b Rectangle B as x, y, width, height | ||
| * @returns true if rectangles overlap, otherwise false | ||
| */ | ||
| export function overlapBounding(a: Rect, b: Rect): boolean { | ||
| const aRight = a[0] + a[2] | ||
| const aBottom = a[1] + a[3] | ||
| const bRight = b[0] + b[2] | ||
| const bBottom = b[1] + b[3] | ||
|
|
||
| return a[0] > bRight | ||
| || a[1] > bBottom | ||
| || aRight < b[0] | ||
| || aBottom < b[1] | ||
| ? false | ||
| : true | ||
| } | ||
|
|
||
| /** | ||
| * Adds an offset in the specified direction to {@link out} | ||
| * @param amount Amount of offset to add | ||
| * @param direction Direction to add the offset to | ||
| * @param out The {@link Point} to add the offset to | ||
| */ | ||
| export function addDirectionalOffset(amount: number, direction: LinkDirection, out: Point): void { | ||
| switch (direction) { | ||
| case LinkDirection.LEFT: | ||
| out[0] -= amount | ||
| return | ||
| case LinkDirection.RIGHT: | ||
| out[0] += amount | ||
| return | ||
| case LinkDirection.UP: | ||
| out[1] -= amount | ||
| return | ||
| case LinkDirection.DOWN: | ||
| out[1] += amount | ||
| return | ||
| // LinkDirection.CENTER: Nothing to do. | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Flips axes of a 2D vector - "rotating" them by 90° | ||
| * @param offset The offset to rotate | ||
| * @param from Direction to rotate from | ||
| * @param to Direction to rotate to | ||
| */ | ||
| export function rotateLinkDirection(offset: Point, from: LinkDirection, to: LinkDirection): void { | ||
| let x: number | ||
| let y: number | ||
|
|
||
| // Normalise to left | ||
| switch (from) { | ||
| case to: | ||
| case LinkDirection.CENTER: | ||
| case LinkDirection.NONE: | ||
| // Nothing to do | ||
| return | ||
|
|
||
| case LinkDirection.LEFT: | ||
| x = offset[0] | ||
| y = offset[1] | ||
| break | ||
| case LinkDirection.RIGHT: | ||
| x = -offset[0] | ||
| y = -offset[1] | ||
| break | ||
| case LinkDirection.UP: | ||
| x = -offset[1] | ||
| y = offset[0] | ||
| break | ||
| case LinkDirection.DOWN: | ||
| x = offset[1] | ||
| y = -offset[0] | ||
| break | ||
| } | ||
|
|
||
| // Apply new direction | ||
| switch (to) { | ||
| case LinkDirection.CENTER: | ||
| case LinkDirection.NONE: | ||
| // Nothing to do | ||
| return | ||
|
|
||
| case LinkDirection.LEFT: | ||
| offset[0] = x | ||
| offset[1] = y | ||
| break | ||
| case LinkDirection.RIGHT: | ||
| offset[0] = -x | ||
| offset[1] = -y | ||
| break | ||
| case LinkDirection.UP: | ||
| offset[0] = y | ||
| offset[1] = -x | ||
| break | ||
| case LinkDirection.DOWN: | ||
| offset[0] = -y | ||
| offset[1] = x | ||
| break | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Check if a point is to to the left or right of a line. | ||
| * Project a line from lineStart -> lineEnd. Determine if point is to the left or right of that projection. | ||
| * {@link https://www.geeksforgeeks.org/orientation-3-ordered-points/} | ||
| * @param lineStart The start point of the line | ||
| * @param lineEnd The end point of the line | ||
| * @param point The point to check | ||
| * @returns 0 if all three points are in a straight line, a negative value if point is to the left of the projected line, or positive if the point is to the right | ||
| */ | ||
| export function getOrientation(lineStart: PointReadOnly, lineEnd: PointReadOnly, x: number, y: number): number { | ||
| return ((lineEnd[1] - lineStart[1]) * (x - lineEnd[0])) - ((lineEnd[0] - lineStart[0]) * (y - lineEnd[1])) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /** | ||
| * Uses the standard String() function to coerce to string, unless the value is null or undefined - then null. | ||
| * @param value The value to convert | ||
| * @returns String(value) or null | ||
| */ | ||
| export function stringOrNull(value: unknown): string | null { | ||
| return value == null ? null : String(value) | ||
| } | ||
|
|
||
| /** | ||
| * Uses the standard String() function to coerce to string, unless the value is null or undefined - then an empty string | ||
| * @param value The value to convert | ||
| * @returns String(value) or "" | ||
| */ | ||
| export function stringOrEmpty(value: unknown): string { | ||
| return value == null ? "" : String(value) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters