Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Variable tempo conjugates #177

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Variable tempo conjugates #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5af2b5
POC for having conjugates change tempo
ticklemepierce Feb 26, 2022
093c49d
remove console.logs
ticklemepierce Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/cubing/twisty/views/TwistyAlgViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class DataDown {
earliestMoveIndex: number;
twistyAlgViewer: TwistyAlgViewer;
direction: ExperimentalIterationDirection;
type?: string;
}

class DataUp {
Expand Down Expand Up @@ -91,6 +92,10 @@ class TwistyAlgWrapperElem extends HTMLElementShim {
this.classList.add(className);
}

addClass(className: string) {
this.classList.add(className);
}

addString(str: string) {
this.queue.push(document.createTextNode(str));
}
Expand Down Expand Up @@ -149,6 +154,9 @@ class AlgToDOMTree extends TraversalDownUp<DataDown, DataUp, DataUp> {
public traverseAlg(alg: Alg, dataDown: DataDown): DataUp {
let moveCount = 0;
const element = new TwistyAlgWrapperElem("twisty-alg-alg", alg); // TODO: pick a better class name.
if (dataDown.type) {
element.addClass(dataDown.type);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't love having the state stored in class but it was at least the easiest way I could find for POC. Still figuring out the code base so there may be a better way already that I'm just not aware of.

}
let first = true;
for (const unit of experimentalDirect(alg.units(), dataDown.direction)) {
if (!first) {
Expand Down Expand Up @@ -293,6 +301,7 @@ class AlgToDOMTree extends TraversalDownUp<DataDown, DataUp, DataUp> {
earliestMoveIndex: dataDown.earliestMoveIndex + moveCount,
twistyAlgViewer: dataDown.twistyAlgViewer,
direction: dataDown.direction,
type: "setup",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open to alternate names for this and "execution" (unsure if there are technical terms for the different parts of a conjugate)

}),
);
moveCount += aLen;
Expand All @@ -302,6 +311,7 @@ class AlgToDOMTree extends TraversalDownUp<DataDown, DataUp, DataUp> {
earliestMoveIndex: dataDown.earliestMoveIndex + moveCount,
twistyAlgViewer: dataDown.twistyAlgViewer,
direction: dataDown.direction,
type: "execution",
}),
);
element.addString("]");
Expand Down Expand Up @@ -366,13 +376,18 @@ class MoveHighlighter {
this.moveCharIndexMap.set(charIndex, elem);
}

set(move: Parsed<Move> | null): void {
set(move: Parsed<Move> | null, twistyPlayer: TwistyPlayer): void {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find a way to access twistyPlayer from here, but I also didn't try very hard :P
Again, just moving quickly for POC

const newElem = move
? this.moveCharIndexMap.get(move.startCharIndex) ?? null
: null;
if (this.currentElem === newElem) {
return;
}
if (newElem?.parentElement?.classList.contains('execution')) {
twistyPlayer.tempoScale = 10;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardcoded for now. This is where I think implementation details would need sorting out. How would one pass in these values? Presumably something on DataDown?

} else {
twistyPlayer.tempoScale = 1;
}
this.currentElem?.classList.remove("twisty-alg-current-move");
this.currentElem?.setCurrentMove(false);
newElem?.classList.add("twisty-alg-current-move");
Expand Down Expand Up @@ -434,10 +449,10 @@ export class TwistyAlgViewer extends HTMLElementShim {
moveInfo ??= currentMoveInfo.movesStarting[0];
moveInfo ??= currentMoveInfo.movesFinishing[0];
if (!moveInfo) {
this.highlighter.set(null);
this.highlighter.set(null, twistyPlayer);
} else {
const mainCurrentMove = moveInfo.move; // TODO
this.highlighter.set(mainCurrentMove as Parsed<Move>);
this.highlighter.set(mainCurrentMove as Parsed<Move>, twistyPlayer);
}
},
);
Expand Down
4 changes: 3 additions & 1 deletion src/sites/experiments.cubing.net/cubing.js/twisty/twisty-alg-viewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ <h1 style="text-align: center">
</h1>
<twisty-player
id="main-player"
alg="([R, U])3 (U L)2' [M2': U2]"
alg="[R2: R U' R' U' R U R' F' R U R' U' R' F R]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: revert back.

This alg just made it easier to see my changes being applied.

[F2: R U' R' U' R U R' F' R U R' U' R' F R]
"
></twisty-player>
<div class="alg-example">
<twisty-alg-viewer for="main-player"></twisty-alg-viewer>
Expand Down