use actual bottom for rotated shapes with rope
This commit is contained in:
parent
fffd758d2c
commit
e8d430372c
|
|
@ -1,4 +1,5 @@
|
||||||
import { css } from './common/tags.ts';
|
import { css } from './common/tags.ts';
|
||||||
|
import type { RotatedDOMRect } from './common/types';
|
||||||
import { FolkRope } from './folk-rope.ts';
|
import { FolkRope } from './folk-rope.ts';
|
||||||
import * as parser from '@babel/parser';
|
import * as parser from '@babel/parser';
|
||||||
import type { Node } from '@babel/types';
|
import type { Node } from '@babel/types';
|
||||||
|
|
@ -136,7 +137,7 @@ to.${key} = ${value};`);
|
||||||
this.expression = this.#expressionTextarea.value = this.getAttribute('expression') || '';
|
this.expression = this.#expressionTextarea.value = this.getAttribute('expression') || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
override render(sourceRect: DOMRectReadOnly, targetRect: DOMRectReadOnly) {
|
override render(sourceRect: RotatedDOMRect | DOMRectReadOnly, targetRect: RotatedDOMRect | DOMRectReadOnly) {
|
||||||
super.render(sourceRect, targetRect);
|
super.render(sourceRect, targetRect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// This is a rewrite of https://github.com/guerrillacontra/html5-es6-physics-rope
|
// This is a rewrite of https://github.com/guerrillacontra/html5-es6-physics-rope
|
||||||
|
|
||||||
import { Vector } from './common/Vector.ts';
|
import { Vector } from './common/Vector.ts';
|
||||||
import type { Point } from './common/types.ts';
|
import type { Point, RotatedDOMRect } from './common/types.ts';
|
||||||
import { FolkConnection } from './folk-connection.ts';
|
import { FolkConnection } from './folk-connection.ts';
|
||||||
|
|
||||||
const lerp = (first: number, second: number, percentage: number) => first + (second - first) * percentage;
|
const lerp = (first: number, second: number, percentage: number) => first + (second - first) * percentage;
|
||||||
|
|
@ -63,10 +63,13 @@ export class FolkRope extends FolkConnection {
|
||||||
this.#shadow.appendChild(this.#svg);
|
this.#shadow.appendChild(this.#svg);
|
||||||
|
|
||||||
this.#path.setAttribute('stroke-width', '3');
|
this.#path.setAttribute('stroke-width', '3');
|
||||||
|
this.#path.setAttribute('stroke-linecap', 'round');
|
||||||
|
|
||||||
this.#path.setAttribute('fill', 'none');
|
this.#path.setAttribute('fill', 'none');
|
||||||
this.#path.style.pointerEvents = 'auto';
|
this.#path.style.pointerEvents = 'auto';
|
||||||
|
|
||||||
this.#path2.setAttribute('stroke-width', '3');
|
this.#path2.setAttribute('stroke-width', '3');
|
||||||
|
this.#path2.setAttribute('stroke-linecap', 'round');
|
||||||
this.#path2.setAttribute('fill', 'none');
|
this.#path2.setAttribute('fill', 'none');
|
||||||
this.#path2.style.pointerEvents = 'auto';
|
this.#path2.style.pointerEvents = 'auto';
|
||||||
|
|
||||||
|
|
@ -108,12 +111,32 @@ export class FolkRope extends FolkConnection {
|
||||||
this.draw();
|
this.draw();
|
||||||
};
|
};
|
||||||
|
|
||||||
override render(sourceRect: DOMRectReadOnly, targetRect: DOMRectReadOnly) {
|
override render(sourceRect: RotatedDOMRect | DOMRectReadOnly, targetRect: RotatedDOMRect | DOMRectReadOnly) {
|
||||||
|
let source: Point;
|
||||||
|
let target: Point;
|
||||||
|
|
||||||
|
if ('corners' in sourceRect) {
|
||||||
|
const [_a, _b, bottomRight, bottomLeft] = sourceRect.corners();
|
||||||
|
source = Vector.lerp(bottomRight, bottomLeft, 0.5);
|
||||||
|
} else {
|
||||||
|
source = {
|
||||||
|
x: sourceRect.x + sourceRect.width / 2,
|
||||||
|
y: sourceRect.y + sourceRect.height,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if ('corners' in targetRect) {
|
||||||
|
const [_a, _b, bottomRight, bottomLeft] = targetRect.corners();
|
||||||
|
target = Vector.lerp(bottomRight, bottomLeft, 0.5);
|
||||||
|
} else {
|
||||||
|
target = {
|
||||||
|
x: targetRect.x + targetRect.width / 2,
|
||||||
|
y: targetRect.y + targetRect.height,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (this.#points.length === 0) {
|
if (this.#points.length === 0) {
|
||||||
this.#points = this.#generatePoints(
|
this.#points = this.#generatePoints(source, target);
|
||||||
{ x: sourceRect.x + sourceRect.width / 2, y: sourceRect.bottom },
|
|
||||||
{ x: targetRect.x + targetRect.width / 2, y: targetRect.bottom }
|
|
||||||
);
|
|
||||||
|
|
||||||
this.#lastTime = 0;
|
this.#lastTime = 0;
|
||||||
|
|
||||||
|
|
@ -125,11 +148,8 @@ export class FolkRope extends FolkConnection {
|
||||||
|
|
||||||
if (startingPoint === undefined || endingPoint === undefined) return;
|
if (startingPoint === undefined || endingPoint === undefined) return;
|
||||||
|
|
||||||
startingPoint.pos.x = sourceRect.x + sourceRect.width / 2;
|
startingPoint.pos = source;
|
||||||
startingPoint.pos.y = sourceRect.bottom;
|
endingPoint.pos = target;
|
||||||
|
|
||||||
endingPoint.pos.x = targetRect.x + targetRect.width / 2;
|
|
||||||
endingPoint.pos.y = targetRect.bottom;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
draw() {
|
draw() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue