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

Compare commits

base: perelman:43ffd7d87a8040392c75295b7aff26fe72b8bef0
Branches Tags
perelman:main
perelman:feature/variants
perelman:exp/dancer-colors
perelman:exp/perf/cache-strings
..
compare: perelman:545207965f06f5fda431ffd71432f3c7bfa7545b
Branches Tags
perelman:feature/variants
perelman:main
perelman:exp/dancer-colors
perelman:exp/perf/cache-strings

No commits in common. "43ffd7d87a8040392c75295b7aff26fe72b8bef0" and "545207965f06f5fda431ffd71432f3c7bfa7545b" have entirely different histories.
43ffd7d87a ... 545207965f

4 changed files with 63 additions and 87 deletions
Show Stats Expand all files Collapse all files

47
www/js/animation.ts
View File

@ -89,7 +89,7 @@ export class LinearAnimationSegment extends AnimationSegment {
export interface AnimationTransitionFlags {
rotation?: boolean;
hands?: boolean;
handsDuring?: "Actual" | "None" | "Start" | "End" | Map<Hand, Offset>;
handsDuring?: "Actual" | "None" | "Start" | "End";
}
export class TransitionAnimationSegment extends AnimationSegment {
private readonly actualAnimation: AnimationSegment;
@ -122,33 +122,32 @@ export class TransitionAnimationSegment extends AnimationSegment {
const transitionEnd = this.actualAnimation.interpolateRotation(1 - this.endTransitionProgress);
if (actualEnd > actualStart) {
while (transitionStart <= this.startRotation - 180) {
while (transitionStart < this.startRotation) {
this.startRotation -= 360;
}
while (transitionEnd >= this.endRotation + 180) {
while (transitionEnd > this.endRotation) {
this.endRotation += 360;
}
} else if (actualEnd < actualStart) {
while (transitionStart >= this.startRotation + 180) {
while (transitionStart > this.startRotation) {
this.startRotation += 360;
}
while (transitionEnd <= this.endRotation - 180) {
while (transitionEnd < this.endRotation) {
this.endRotation -= 360;
}
}
// Transitions should be short adjustments, not spins.
while (transitionStart - this.startRotation < -180) {
this.startRotation -= 360;
}
while (transitionStart - this.startRotation > 180) {
this.startRotation += 360;
}
while (transitionEnd - this.endRotation < -180) {
this.endRotation -= 360;
}
while (transitionEnd - this.endRotation > 180) {
this.endRotation += 360;
} else {
while (transitionStart - this.startRotation < 180) {
this.startRotation -= 360;
}
while (transitionStart - this.startRotation > 180) {
this.startRotation += 360;
}
while (transitionEnd - this.endRotation < 180) {
this.endRotation -= 360;
}
while (transitionEnd - this.endRotation > 180) {
this.endRotation += 360;
}
}
}
}
@ -186,8 +185,6 @@ export class TransitionAnimationSegment extends AnimationSegment {
? startHand
: this.flags.handsDuring === "End"
? endHand
: this.flags.handsDuring instanceof Map
? this.flags.handsDuring.get(hand)
: (() => { throw "Unexpected handsDuring: " + this.flags.handsDuring; })();
if (this.flags.hands) {
@ -241,9 +238,8 @@ export class RotationAnimationSegment extends AnimationSegment {
private readonly startFacing: Rotation;
private readonly closer?: Closer;
private readonly hands: Map<Hand, HandAnimation>;
private readonly centerRelativeTo: number;
constructor({ beats, startPosition, endPosition, rotation, around, facing, closer, hands, centerRelativeTo }: {
constructor({ beats, startPosition, endPosition, rotation, around, facing, closer, hands }: {
beats: number;
startPosition: DancerSetPosition;
endPosition: DancerSetPosition;
@ -252,7 +248,6 @@ export class RotationAnimationSegment extends AnimationSegment {
facing: RotationAnimationFacing;
closer?: CloserDuringRotation;
hands?: Map<Hand, HandAnimation>;
centerRelativeTo?: number;
}) {
super(beats, startPosition, endPosition);
@ -273,7 +268,6 @@ export class RotationAnimationSegment extends AnimationSegment {
}
this.startRotation = positionToDegrees(startPosition.position);
this.startFacing = startPosition.rotation;
this.centerRelativeTo = centerRelativeTo ?? this.startFacing;
const actualRotation = normalizeRotation(positionToDegrees(endPosition.position) - this.startRotation,
rotation);
this.endRotation = this.startRotation + actualRotation;
@ -317,13 +311,14 @@ export class RotationAnimationSegment extends AnimationSegment {
return super.interpolateRotation(progress);
} else {
const degrees = interpolateLinear(progress, this.startRotation, this.endRotation);
let rotation : number;
switch (this.facing) {
case RotationAnimationFacing.Start:
return this.startFacing;
case RotationAnimationFacing.Center:
return degrees - 90;
case RotationAnimationFacing.CenterRelative:
return degrees - this.startRotation + this.centerRelativeTo;
return degrees - this.startRotation + this.startFacing;
case RotationAnimationFacing.Forward:
return degrees + 180;
case RotationAnimationFacing.Backward:

2
www/js/interpreter.ts
View File

@ -697,7 +697,7 @@ function moveAsLowLevelMoves({ move, nextMove, startingPos, numProgessions }: {
return combine([
prevEnd => ({
beats: meltdownBeats,
endPosition: {...prevEnd, dancerDistance: DancerDistance.Compact },
endPosition: prevEnd,
movementPattern: {
kind: SemanticAnimationKind.RotateAround,
minAmount: 360,

2
www/js/interpreterCommon.ts
View File

@ -324,5 +324,5 @@ export type SemanticPosition = {
facing: Facing,
hands?: Map<Hand, HandConnection>,
balance?: BalanceWeight,
dancerDistance?: DancerDistance,
dancerDistance?: DancerDistance.Normal | DancerDistance.SwingLark | DancerDistance.SwingRobin,
};

99
www/js/lowLevelMove.ts
View File

@ -170,30 +170,6 @@ function CenterOf(sideOrCenter: CircleSideOrCenter, setOffset?: number, lineOffs
return { x: setCenter.x + xOffset, y: setCenter.y + yOffset };
}
function swingHandPosition(role: DancerDistance.SwingLark | DancerDistance.SwingRobin, hand: Hand): Offset {
if (role === DancerDistance.SwingLark) {
if (hand === Hand.Left) {
return { x: 0, y: Math.sqrt(1 / 2) };
}
else {
return { x: 0.8, y: 0.5 };
}
} else /* role === DancerDistance.SwingRobin */ {
if (hand === Hand.Left) {
return { x: -0.8, y: 0.5 };
}
else {
return { x: 0, y: Math.sqrt(1 / 2) };
};
}
}
function swingHandPositions(role: DancerDistance.SwingLark | DancerDistance.SwingRobin): Map<Hand, Offset> {
return new Map<Hand, Offset>([
[Hand.Left, swingHandPosition(role, Hand.Left)],
[Hand.Right, swingHandPosition(role, Hand.Right)],
]);
}
function SemanticToSetPosition(semantic: SemanticPosition): DancerSetPosition {
let rotation: number;
@ -235,6 +211,8 @@ function SemanticToSetPosition(semantic: SemanticPosition): DancerSetPosition {
yAmount = 1;
break;
case DancerDistance.Compact:
yAmount = 0.75;
break;
case DancerDistance.SwingLark:
case DancerDistance.SwingRobin:
yAmount = 0.5;
@ -308,8 +286,8 @@ function SemanticToSetPosition(semantic: SemanticPosition): DancerSetPosition {
position = OffsetPlus(position, balanceOffset, setOffset);
const isFacingUpOrDown = semantic.facing === Facing.Up || semantic.facing === Facing.Down;
if (semantic.dancerDistance === DancerDistance.SwingLark || semantic.dancerDistance == DancerDistance.SwingRobin) {
if (isFacingUpOrDown == (semantic.dancerDistance === DancerDistance.SwingLark)) {
if (semantic.dancerDistance === DancerDistance.SwingLark) {
if (isFacingUpOrDown) {
rotation -= 45;
} else {
rotation += 45;
@ -318,8 +296,21 @@ function SemanticToSetPosition(semantic: SemanticPosition): DancerSetPosition {
return {
position,
rotation,
leftArmEnd: swingHandPosition(semantic.dancerDistance, Hand.Left),
rightArmEnd: swingHandPosition(semantic.dancerDistance, Hand.Right),
leftArmEnd: { x: 0, y: Math.sqrt(1/2)},
rightArmEnd: { x: 0.8, y: 0.5 },
};
} else if (semantic.dancerDistance === DancerDistance.SwingRobin) {
if (isFacingUpOrDown) {
rotation += 45;
} else {
rotation -= 45;
}
return {
position,
rotation,
leftArmEnd: { x: -0.8, y: 0.5 },
rightArmEnd: { x: 0, y: Math.sqrt(1/2) },
};
}
@ -334,11 +325,10 @@ function SemanticToSetPosition(semantic: SemanticPosition): DancerSetPosition {
case HandTo.DancerRight:
return OffsetPlus({ x: +1, y: 0 }, balanceHandAdjustment);
case HandTo.DancerForward:
const armLength = yAmount + (semantic.balance === BalanceWeight.Backward ? balanceAmount : 0);
if (hand === connection.hand) {
return { x: 0, y: +armLength/2 };
return { x: 0, y: +0.5 };
} else {
return { x: dancerWidth / 2 * (hand === Hand.Left ? -1 : +1), y: +armLength };
return { x: dancerWidth / 2 * (hand === Hand.Left ? -1 : +1), y: +1 };
}
case HandTo.LeftInCircle:
case HandTo.RightInCircle:
@ -582,13 +572,13 @@ export function animateLowLevelMove(move: LowLevelMove): animation.AnimationSegm
rotation: move.movementPattern.minAmount,
around: {
center: rotateCenter,
width: 1,
height: 1,
width: setWidth / 5,
height: setHeight / 5,
},
facing: animation.RotationAnimationFacing.Forward,
facing: animation.RotationAnimationFacing.Center,
closer: move.movementPattern.close ? {
transitionBeats: 1,
minDistance: 1,
minDistance: setWidth,
} : undefined,
hands
}),
@ -621,31 +611,22 @@ export function animateLowLevelMove(move: LowLevelMove): animation.AnimationSegm
});
return [
new animation.TransitionAnimationSegment({
actualAnimation: new animation.RotationAnimationSegment({
beats: move.beats - 2,
startPosition: startSetPosition,
endPosition: beforeUnfold,
rotation: move.movementPattern.minAmount,
around: {
center: rotateSwingCenter,
width: 1,
height: 1,
},
closer: {
minDistance: 1,
transitionBeats: 1,
},
facing: animation.RotationAnimationFacing.CenterRelative,
centerRelativeTo: startSetPosition.rotation + ((move.startPosition.facing === Facing.Up || move.startPosition.facing === Facing.Down) === (dancerDistance === DancerDistance.SwingLark) ? -45 : +45)
}),
flags: {
rotation: true,
hands: true,
handsDuring: swingHandPositions(dancerDistance),
new animation.LinearAnimationSegment({
beats: 1,
startPosition: startSetPosition,
endPosition: swingStart,
}),
new animation.RotationAnimationSegment({
beats: move.beats - 3,
startPosition: swingStart,
endPosition: beforeUnfold,
rotation: move.movementPattern.minAmount,
around: {
center: rotateSwingCenter,
width: setWidth / 5,
height: setHeight / 5,
},
startTransitionBeats: 1,
endTransitionBeats: 0,
facing: animation.RotationAnimationFacing.CenterRelative
}),
new animation.LinearAnimationSegment({
beats: 1,