Compare commits
No commits in common. "1f24aca5a399ef3e3ef7be35da18d348252b7a60" and "c98452807523785afa09470a41fef2f541105cc4" have entirely different histories.
1f24aca5a3
...
c984528075
|
@ -184,6 +184,16 @@ type SemanticPosition = {
|
||||||
hands?: Map<Hand, HandConnection>,
|
hands?: Map<Hand, HandConnection>,
|
||||||
balance?: BalanceWeight,
|
balance?: BalanceWeight,
|
||||||
};
|
};
|
||||||
|
type LowLevelPosition = {
|
||||||
|
kind: PositionKind.Circle,
|
||||||
|
} | {
|
||||||
|
kind: PositionKind.ShortLines,
|
||||||
|
};
|
||||||
|
|
||||||
|
interface SemanticPositionAtBeat {
|
||||||
|
position: SemanticPosition,
|
||||||
|
beat: number,
|
||||||
|
}
|
||||||
|
|
||||||
enum SemanticAnimationKind {
|
enum SemanticAnimationKind {
|
||||||
StandStill = "StandStill",
|
StandStill = "StandStill",
|
||||||
|
@ -577,17 +587,16 @@ function moveAsLowLevelMoves(move: Move, startingPos: Map<DancerIdentity, Semant
|
||||||
res.set(id, combine([
|
res.set(id, combine([
|
||||||
{
|
{
|
||||||
beats: 1,
|
beats: 1,
|
||||||
endPosition: { ...startPosition, dancerDistance: swingRole },
|
endPosition: { ...startPosition, dancerDistance: DancerDistance.Compact },
|
||||||
movementPattern: { kind: SemanticAnimationKind.Linear, },
|
movementPattern: { kind: SemanticAnimationKind.Linear, },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
beats: move.beats - 2,
|
beats: move.beats - 2,
|
||||||
endPosition: { ...endPosition, dancerDistance: swingRole },
|
endPosition: { ...endPosition, dancerDistance: DancerDistance.Compact },
|
||||||
movementPattern: {
|
movementPattern: {
|
||||||
kind: SemanticAnimationKind.Swing,
|
kind: SemanticAnimationKind.RotateAround,
|
||||||
minAmount: 360,
|
minAmount: 360,
|
||||||
around: startPos.which.leftRightSide(),
|
around: startPos.which.leftRightSide(),
|
||||||
endFacing: startPos.which.leftRightSide() === CircleSide.Left ? Facing.Right : Facing.Left,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user