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

Compare commits

base: perelman:b572eb34c38bf52f3a26d051c2d97787949411ef
Branches Tags
perelman:main
perelman:feature/variants
perelman:exp/dancer-colors
perelman:exp/perf/cache-strings
..
compare: perelman:1c7f80e1c35d4149da8049cc4d09ab543370e3ff
Branches Tags
perelman:feature/variants
perelman:main
perelman:exp/dancer-colors
perelman:exp/perf/cache-strings

No commits in common. "b572eb34c38bf52f3a26d051c2d97787949411ef" and "1c7f80e1c35d4149da8049cc4d09ab543370e3ff" have entirely different histories.
b572eb34c3 ... 1c7f80e1c3

1 changed files with 2 additions and 14 deletions
Show Stats Expand all files Collapse all files

16
www/js/interpreter.ts
View File

@ -827,9 +827,8 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
case "revolving door": case "revolving door":
const byHand = move.parameters.hand ? Hand.Right : Hand.Left; const byHand = move.parameters.hand ? Hand.Right : Hand.Left;
// TODO More parts? Or define an animation kind? // TODO More parts? Or define an animation kind?
const waitBeats = 2;
const carryBeats = move.beats / 2; const carryBeats = move.beats / 2;
const returnBeats = move.beats - carryBeats - waitBeats; const returnBeats = move.beats - carryBeats;
return handleCirclePairedMove(move.parameters.whom, ({ id, startPos }) => { return handleCirclePairedMove(move.parameters.whom, ({ id, startPos }) => {
const isCarried = findPairOpposite(move.parameters.who, id) === null; const isCarried = findPairOpposite(move.parameters.who, id) === null;
@ -837,11 +836,6 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
if (isCarried) { if (isCarried) {
const endWhich = startPos.which.swapDiagonal(); const endWhich = startPos.which.swapDiagonal();
return combine([ return combine([
prevEnd => ({
beats: waitBeats,
endPosition: prevEnd,
movementPattern: { kind: SemanticAnimationKind.StandStill },
}),
{ {
beats: carryBeats, beats: carryBeats,
endPosition: { endPosition: {
@ -861,7 +855,7 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
beats: returnBeats, beats: returnBeats,
endPosition: prevEnd, endPosition: prevEnd,
movementPattern: { kind: SemanticAnimationKind.StandStill }, movementPattern: { kind: SemanticAnimationKind.StandStill },
}), })
], startPos); ], startPos);
} else { } else {
return combine([ return combine([
@ -1921,12 +1915,6 @@ function danceAsLowLevelMoves(moves: Move[], startingPos: Map<DancerIdentity, Se
if (!lowLevelMoves[i].endPosition) throw "endPosition is undefined"; if (!lowLevelMoves[i].endPosition) throw "endPosition is undefined";
lowLevelMoves[i].endPosition = lowLevelMoves[i + 1].startPosition; lowLevelMoves[i].endPosition = lowLevelMoves[i + 1].startPosition;
if (!lowLevelMoves[i].endPosition) throw "endPosition is undefined now"; if (!lowLevelMoves[i].endPosition) throw "endPosition is undefined now";
if (lowLevelMoves[i].movementPattern.kind === SemanticAnimationKind.StandStill) {
lowLevelMoves[i].startPosition = lowLevelMoves[i].endPosition;
if (i > 0) {
lowLevelMoves[i - 1].endPosition = lowLevelMoves[i].startPosition;
}
}
} }
// If progression isn't detected properly, do nothing. // If progression isn't detected properly, do nothing.
if (progressionInSets === 0) { if (progressionInSets === 0) {