From dfd1f8ade1e4bac2c3cde9b81981af96f7d02a30 Mon Sep 17 00:00:00 2001 From: Lucas Garron Date: Wed, 5 Aug 2020 23:54:46 -0700 Subject: [PATCH] [twisty] Fix imports. --- src/twisty/3D/puzzles/Cube3D.ts | 7 ++++--- src/twisty/dom/controls/buttons.ts | 6 ------ src/twisty/dom/viewers/Twisty2DSVG.ts | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/twisty/3D/puzzles/Cube3D.ts b/src/twisty/3D/puzzles/Cube3D.ts index 3447327ae..992c3e1a7 100644 --- a/src/twisty/3D/puzzles/Cube3D.ts +++ b/src/twisty/3D/puzzles/Cube3D.ts @@ -14,10 +14,11 @@ import { } from "three"; import { BlockMove } from "../../../alg"; import { Puzzles, Transformation } from "../../../kpuzzle"; -import { AlgCursor, PuzzlePosition } from "../../animation/alg/AlgCursor"; -import { Twisty3DPuzzle } from "./Twisty3DPuzzle"; -import { TAU } from "../TAU"; +import { AlgCursor } from "../../animation/alg/AlgCursor"; import { smootherStep } from "../../animation/easing"; +import { TAU } from "../TAU"; +import { Twisty3DPuzzle } from "./Twisty3DPuzzle"; +import { PuzzlePosition } from "../../animation/alg/CursorTypes"; class AxisInfo { public stickerMaterial: MeshBasicMaterial; diff --git a/src/twisty/dom/controls/buttons.ts b/src/twisty/dom/controls/buttons.ts index 60696e131..51f255926 100644 --- a/src/twisty/dom/controls/buttons.ts +++ b/src/twisty/dom/controls/buttons.ts @@ -86,12 +86,6 @@ class TwistyControlButton extends ManagedCustomElement // TODO: Can we avoid duplicate calculations? private autoSetTimelineBasedDisabled(): void { - console.log( - "this.timelineCommand", - this.timelineCommand, - this.timeline.timestamp, - this.timeline.maxTimestamp(), - ); switch (this.timelineCommand!) { case "jump-to-start": case "play-pause": diff --git a/src/twisty/dom/viewers/Twisty2DSVG.ts b/src/twisty/dom/viewers/Twisty2DSVG.ts index fa1ce6668..a695373b6 100644 --- a/src/twisty/dom/viewers/Twisty2DSVG.ts +++ b/src/twisty/dom/viewers/Twisty2DSVG.ts @@ -1,21 +1,21 @@ -import { TwistyViewerElement } from "./TwistyViewerElement"; -import { - PositionListener, - PositionDispatcher, - PuzzlePosition, -} from "../../animation/alg/AlgCursor"; -import { RenderScheduler } from "../../animation/RenderScheduler"; +import { BlockMove } from "../../../alg"; import { - SVG, - Puzzles, - KPuzzleDefinition, Combine, - Transformation, + KPuzzleDefinition, + Puzzles, stateForBlockMove, + SVG, + Transformation, } from "../../../kpuzzle"; +import { + PositionDispatcher, + PositionListener, +} from "../../animation/alg/AlgCursor"; +import { RenderScheduler } from "../../animation/RenderScheduler"; import { ManagedCustomElement } from "../ManagedCustomElement"; import { twisty2DSVGCSS } from "./Twisty2DSVGView.css"; -import { BlockMove } from "../../../alg"; +import { TwistyViewerElement } from "./TwistyViewerElement"; +import { PuzzlePosition } from "../../animation/alg/CursorTypes"; // export class Twisty2DSVG extends ManagedCustomElement