perelman/contra-renderer
1
0
Fork 1
Code Issues5 Pull Requests Activity

Support pass through across set.

Browse Source
This commit is contained in:
Daniel Perelman 2023-10-14 12:57:37 -07:00
parent 951073dbe1
commit 987270e073
1 changed files with 32 additions and 4 deletions

36
www/js/interpreter.ts
View File

@ -1861,12 +1861,14 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
}
case "pass through":
if (move.parameters.dir !== "along") {
throw new Error("Unsupported pass through direction: " + move.parameters.dir);
if (move.parameters.dir === "left diagonal" || move.parameters.dir === "right diagonal") {
// TODO There's logic for this below, but unsure it's right.
throw new Error(move.move + " with dir of " + move.parameters.dir + " is unsupported.");
}
const alongSet = move.parameters.dir === "along";
const passShoulder = move.parameters.shoulder ? Hand.Right : Hand.Left;
return handleMove(({ startPos }) => {
if (startPos.kind === PositionKind.Circle) {
if (alongSet && startPos.kind === PositionKind.Circle) {
const facing = startPos.which.facingUpOrDown();
const endPos: SemanticPosition = {
kind: PositionKind.Circle,
@ -1888,7 +1890,31 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
otherPath: "Swap",
},
}], startPos);
} else {
} else if (!alongSet && startPos.kind === PositionKind.Circle) {
const facing = startPos.which.facingAcross();
const endPos: SemanticPosition = {
kind: PositionKind.Circle,
which: startPos.which.swapAcross(),
facing,
setOffset: (startPos.setOffset ?? 0) + (move.parameters.dir === "across"
? 0
: (move.parameters.dir === "left diagonal") === startPos.which.isLeft() ? -1 : +1),
lineOffset: startPos.lineOffset,
};
return combine([{
beats: move.beats,
endPosition: endPos,
movementPattern: {
kind: SemanticAnimationKind.PassBy,
around: startPos.which.topBottomSide(),
side: passShoulder,
withHands: false,
facing: "Forward",
otherPath: "Swap",
},
}], startPos);
} else if (alongSet && startPos.kind === PositionKind.ShortLines) {
// TODO This assumes short *wavy* lines.
const endPos: SemanticPosition = {
@ -1904,6 +1930,8 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
endPosition: endPos,
movementPattern: { kind: SemanticAnimationKind.Linear },
}], startPos);
} else {
throw new Error(move.move + " with dir of " + move.parameters.dir + " starting from " + startPos.kind + " is unsupported.");
}
});