cubing 0.25.7 → 0.25.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/{2x2x2.kpuzzle.json-RUB44MJV.js → 2x2x2.kpuzzle.json-BHTFIME6.js} +2 -2
- package/dist/esm/{2x2x2.kpuzzle.json-RUB44MJV.js.map → 2x2x2.kpuzzle.json-BHTFIME6.js.map} +0 -0
- package/dist/esm/{2x2x2.kpuzzle.svg-CQF2FTV7.js → 2x2x2.kpuzzle.svg-CYX37VBY.js} +2 -2
- package/dist/esm/{2x2x2.kpuzzle.svg-CQF2FTV7.js.map → 2x2x2.kpuzzle.svg-CYX37VBY.js.map} +0 -0
- package/dist/esm/{2x2x2.sgs.json-3ZT7QXX6.js → 2x2x2.sgs.json-CLGNVWIM.js} +6 -6
- package/dist/esm/{2x2x2.sgs.json-3ZT7QXX6.js.map → 2x2x2.sgs.json-CLGNVWIM.js.map} +0 -0
- package/dist/esm/{3d-dynamic-PTVO24C3.js → 3d-dynamic-5LHE6HI6.js} +8 -8
- package/dist/esm/{3d-dynamic-PTVO24C3.js.map → 3d-dynamic-5LHE6HI6.js.map} +1 -1
- package/dist/esm/{3x3x3-ll.kpuzzle.svg-53CBPG5O.js → 3x3x3-ll.kpuzzle.svg-KZNSV76X.js} +2 -2
- package/dist/esm/{3x3x3-ll.kpuzzle.svg-53CBPG5O.js.map → 3x3x3-ll.kpuzzle.svg-KZNSV76X.js.map} +0 -0
- package/dist/esm/{3x3x3-min2phase-FPRJ5PCJ.js → 3x3x3-min2phase-UBW46KDU.js} +2 -2
- package/dist/esm/{3x3x3-min2phase-FPRJ5PCJ.js.map → 3x3x3-min2phase-UBW46KDU.js.map} +0 -0
- package/dist/esm/{3x3x3.kpuzzle.svg-ERSSH66P.js → 3x3x3.kpuzzle.svg-5U7LUACF.js} +2 -2
- package/dist/esm/{3x3x3.kpuzzle.svg-ERSSH66P.js.map → 3x3x3.kpuzzle.svg-5U7LUACF.js.map} +0 -0
- package/dist/esm/{444-solver-BYA4CXZO.js → 444-solver-SFZ7V6NL.js} +7 -7
- package/dist/esm/{444-solver-BYA4CXZO.js.map → 444-solver-SFZ7V6NL.js.map} +0 -0
- package/dist/esm/alg/index.js +2 -2
- package/dist/esm/bluetooth/index.js +5 -5
- package/dist/esm/{chunk-RENZB7QN.js → chunk-43SBQEWR.js} +5 -2
- package/dist/esm/chunk-43SBQEWR.js.map +7 -0
- package/dist/esm/{chunk-JGAZXWH2.js → chunk-4SXK3FSU.js} +6 -6
- package/dist/esm/{chunk-JGAZXWH2.js.map → chunk-4SXK3FSU.js.map} +1 -1
- package/dist/esm/{chunk-ANYSPBCR.js → chunk-6BUCXDZU.js} +3 -3
- package/dist/esm/{chunk-ANYSPBCR.js.map → chunk-6BUCXDZU.js.map} +0 -0
- package/dist/esm/{chunk-JW2JE4D3.js → chunk-C6I4KFI2.js} +4 -4
- package/dist/esm/{chunk-JW2JE4D3.js.map → chunk-C6I4KFI2.js.map} +0 -0
- package/dist/esm/{chunk-EWRBHQFX.js → chunk-DO7GZAW4.js} +35 -35
- package/dist/esm/{chunk-EWRBHQFX.js.map → chunk-DO7GZAW4.js.map} +1 -1
- package/dist/esm/{chunk-27KJGD3S.js → chunk-FB7SFELN.js} +2 -2
- package/dist/esm/{chunk-27KJGD3S.js.map → chunk-FB7SFELN.js.map} +0 -0
- package/dist/esm/{chunk-IVQ4ITE2.js → chunk-GBMX6FHY.js} +2 -2
- package/dist/esm/{chunk-IVQ4ITE2.js.map → chunk-GBMX6FHY.js.map} +1 -1
- package/dist/esm/{chunk-WO2AXYFE.js → chunk-MGJA5U5O.js} +1 -1
- package/dist/esm/{chunk-WO2AXYFE.js.map → chunk-MGJA5U5O.js.map} +0 -0
- package/dist/esm/{chunk-U2TSTTDG.js → chunk-NSLR2SC4.js} +2 -2
- package/dist/esm/{chunk-U2TSTTDG.js.map → chunk-NSLR2SC4.js.map} +0 -0
- package/dist/esm/{chunk-F5WNHV7V.js → chunk-ODQRVWJB.js} +3 -3
- package/dist/esm/{chunk-F5WNHV7V.js.map → chunk-ODQRVWJB.js.map} +1 -1
- package/dist/esm/{chunk-OAPHPP4R.js → chunk-OFGQQQBY.js} +4 -4
- package/dist/esm/{chunk-OAPHPP4R.js.map → chunk-OFGQQQBY.js.map} +0 -0
- package/dist/esm/{chunk-CNIY6YZL.js → chunk-QKEGKHT5.js} +106 -103
- package/dist/esm/chunk-QKEGKHT5.js.map +7 -0
- package/dist/esm/{chunk-ZIHFCBOI.js → chunk-RREJ3MSB.js} +3 -3
- package/dist/esm/{chunk-ZIHFCBOI.js.map → chunk-RREJ3MSB.js.map} +0 -0
- package/dist/esm/{chunk-HFQZM22L.js → chunk-XBH5IPB2.js} +14 -8
- package/dist/esm/chunk-XBH5IPB2.js.map +7 -0
- package/dist/esm/{chunk-MVKZPDII.js → chunk-YAOUFM4D.js} +5 -5
- package/dist/esm/{chunk-MVKZPDII.js.map → chunk-YAOUFM4D.js.map} +1 -1
- package/dist/esm/{chunk-NROLOGGL.js → chunk-Z35CBICW.js} +6 -6
- package/dist/esm/{chunk-NROLOGGL.js.map → chunk-Z35CBICW.js.map} +0 -0
- package/dist/esm/{chunk-WDJDRVZZ.js → chunk-ZPAGJE7S.js} +6 -3
- package/dist/esm/{chunk-WDJDRVZZ.js.map → chunk-ZPAGJE7S.js.map} +2 -2
- package/dist/esm/{clock.kpuzzle.json-BQKNKV3G.js → clock.kpuzzle.json-PYHONPBY.js} +2 -2
- package/dist/esm/{clock.kpuzzle.json-BQKNKV3G.js.map → clock.kpuzzle.json-PYHONPBY.js.map} +0 -0
- package/dist/esm/{clock.kpuzzle.svg-B7TMN3SY.js → clock.kpuzzle.svg-JSRDCSQF.js} +2 -2
- package/dist/esm/{clock.kpuzzle.svg-B7TMN3SY.js.map → clock.kpuzzle.svg-JSRDCSQF.js.map} +0 -0
- package/dist/esm/{fto-solver-HI6NIV74.js → fto-solver-TOOJNOZB.js} +3 -3
- package/dist/esm/{fto-solver-HI6NIV74.js.map → fto-solver-TOOJNOZB.js.map} +0 -0
- package/dist/esm/{fto.dynamic-FLX5JKRG.js → fto.dynamic-3MSUIE4Q.js} +7 -7
- package/dist/esm/{fto.dynamic-FLX5JKRG.js.map → fto.dynamic-3MSUIE4Q.js.map} +0 -0
- package/dist/esm/fto.kpuzzle.svg-H2RJX6UR.js +102 -0
- package/dist/esm/fto.kpuzzle.svg-H2RJX6UR.js.map +7 -0
- package/dist/esm/{kilominx.kpuzzle.svg-7XJBOKFU.js → kilominx.kpuzzle.svg-ZLRTRUTM.js} +2 -2
- package/dist/esm/{kilominx.kpuzzle.svg-7XJBOKFU.js.map → kilominx.kpuzzle.svg-ZLRTRUTM.js.map} +0 -0
- package/dist/esm/{kilosolver-N6JM5PUY.js → kilosolver-A3MNW2DJ.js} +6 -5
- package/dist/esm/{kilosolver-N6JM5PUY.js.map → kilosolver-A3MNW2DJ.js.map} +1 -1
- package/dist/esm/kpuzzle/index.js +3 -3
- package/dist/esm/{master_tetraminx-solver-KBQJGW4A.js → master_tetraminx-solver-QSJNGET5.js} +6 -5
- package/dist/esm/{master_tetraminx-solver-KBQJGW4A.js.map → master_tetraminx-solver-QSJNGET5.js.map} +1 -1
- package/dist/esm/megaminx.sgs.json-O2B5OU3T.js +16 -0
- package/dist/esm/{megaminx.sgs.json-CGIZZZMZ.js.map → megaminx.sgs.json-O2B5OU3T.js.map} +0 -0
- package/dist/esm/notation/index.js +3 -3
- package/dist/esm/protocol/index.js +4 -4
- package/dist/esm/puzzle-geometry/index.js +3 -3
- package/dist/esm/puzzles/index.js +4 -4
- package/dist/esm/{pyraminx.kpuzzle.svg-QBBMZVDY.js → pyraminx.kpuzzle.svg-UHDZCBET.js} +2 -2
- package/dist/esm/{pyraminx.kpuzzle.svg-QBBMZVDY.js.map → pyraminx.kpuzzle.svg-UHDZCBET.js.map} +0 -0
- package/dist/esm/pyraminx.sgs.json-NTELD4DU.js +14 -0
- package/dist/esm/{pyraminx.sgs.json-XGJQTHLV.js.map → pyraminx.sgs.json-NTELD4DU.js.map} +0 -0
- package/dist/esm/{redi_cube-E5F64NIQ.js → redi_cube-FYRLEZZH.js} +7 -6
- package/dist/esm/{redi_cube-E5F64NIQ.js.map → redi_cube-FYRLEZZH.js.map} +1 -1
- package/dist/esm/{redi_cube.kpuzzle.json-EPBKWOMV.js → redi_cube.kpuzzle.json-43CP47Z6.js} +2 -2
- package/dist/esm/{redi_cube.kpuzzle.json-EPBKWOMV.js.map → redi_cube.kpuzzle.json-43CP47Z6.js.map} +0 -0
- package/dist/esm/{redi_cube.kpuzzle.svg-BSHCMC2Z.js → redi_cube.kpuzzle.svg-3DWDYE3O.js} +2 -2
- package/dist/esm/{redi_cube.kpuzzle.svg-BSHCMC2Z.js.map → redi_cube.kpuzzle.svg-3DWDYE3O.js.map} +0 -0
- package/dist/esm/scramble/index.js +8 -8
- package/dist/esm/search/index.js +8 -8
- package/dist/esm/{search-worker-js-entry-A4VBA2ZD.js → search-worker-js-entry-32MQILEZ.js} +113 -71
- package/dist/esm/{search-worker-js-entry-A4VBA2ZD.js.map → search-worker-js-entry-32MQILEZ.js.map} +2 -2
- package/dist/esm/{search-worker-ts-entry-LUHAXJBE.js → search-worker-ts-entry-IJRN7GQV.js} +5 -5
- package/dist/esm/{search-worker-ts-entry-LUHAXJBE.js.map → search-worker-ts-entry-IJRN7GQV.js.map} +0 -0
- package/dist/esm/skewb.sgs.json-GISOONJZ.js +16 -0
- package/dist/esm/{skewb.sgs.json-HNUN4G7F.js.map → skewb.sgs.json-GISOONJZ.js.map} +0 -0
- package/dist/esm/{sq1-hyperorbit.kpuzzle.json-4XS5YACO.js → sq1-hyperorbit.kpuzzle.json-AMXAFQCM.js} +2 -2
- package/dist/esm/{sq1-hyperorbit.kpuzzle.json-4XS5YACO.js.map → sq1-hyperorbit.kpuzzle.json-AMXAFQCM.js.map} +0 -0
- package/dist/esm/{sq1-hyperorbit.kpuzzle.svg-ID57EER7.js → sq1-hyperorbit.kpuzzle.svg-MNHJTJ6V.js} +2 -2
- package/dist/esm/{sq1-hyperorbit.kpuzzle.svg-ID57EER7.js.map → sq1-hyperorbit.kpuzzle.svg-MNHJTJ6V.js.map} +0 -0
- package/dist/esm/{sq1-solver-P3IWWET7.js → sq1-solver-KMN2GSOU.js} +3 -3
- package/dist/esm/{sq1-solver-P3IWWET7.js.map → sq1-solver-KMN2GSOU.js.map} +0 -0
- package/dist/esm/stream/index.js +2 -2
- package/dist/esm/twisty/index.js +558 -559
- package/dist/esm/twisty/index.js.map +3 -3
- package/dist/esm/worker-inside-generated-string-JGML54CI.js +3768 -0
- package/dist/esm/worker-inside-generated-string-JGML54CI.js.map +7 -0
- package/dist/types/puzzles/implementations/fto/fto.kpuzzle.svg.d.ts +1 -0
- package/dist/types/puzzles/implementations/fto/index.d.ts +1 -0
- package/dist/types/search/inside/api.d.ts +6 -0
- package/dist/types/search/outside.d.ts +2 -0
- package/dist/types/search/worker-inside-generated-string.d.ts +1 -1
- package/dist/types/twisty/model/TwistyPlayerModel.d.ts +27 -46
- package/dist/types/twisty/model/TwistySceneModel.d.ts +27 -0
- package/dist/types/twisty/views/2D/Twisty2DSceneWrapper.d.ts +3 -3
- package/package.json +21 -22
- package/dist/esm/chunk-CNIY6YZL.js.map +0 -7
- package/dist/esm/chunk-HFQZM22L.js.map +0 -7
- package/dist/esm/chunk-RENZB7QN.js.map +0 -7
- package/dist/esm/megaminx.sgs.json-CGIZZZMZ.js +0 -16
- package/dist/esm/pyraminx.sgs.json-XGJQTHLV.js +0 -14
- package/dist/esm/skewb.sgs.json-HNUN4G7F.js +0 -16
- package/dist/esm/worker-inside-generated-string-VHOABMFC.js +0 -3674
- package/dist/esm/worker-inside-generated-string-VHOABMFC.js.map +0 -7
package/dist/esm/twisty/index.js
CHANGED
|
@@ -10,53 +10,41 @@ import {
|
|
|
10
10
|
TwistyPropDerived,
|
|
11
11
|
TwistyPropSource,
|
|
12
12
|
proxy3D
|
|
13
|
-
} from "../chunk-
|
|
13
|
+
} from "../chunk-4SXK3FSU.js";
|
|
14
14
|
import {
|
|
15
15
|
countAnimatedLeaves,
|
|
16
16
|
countMoves
|
|
17
|
-
} from "../chunk-
|
|
17
|
+
} from "../chunk-NSLR2SC4.js";
|
|
18
18
|
import {
|
|
19
19
|
cube3x3x3,
|
|
20
20
|
cubeAppearance,
|
|
21
21
|
customPGPuzzleLoader,
|
|
22
22
|
puzzles
|
|
23
|
-
} from "../chunk-
|
|
24
|
-
import "../chunk-
|
|
23
|
+
} from "../chunk-QKEGKHT5.js";
|
|
24
|
+
import "../chunk-YAOUFM4D.js";
|
|
25
25
|
import {
|
|
26
26
|
Alg,
|
|
27
27
|
AlgBuilder,
|
|
28
28
|
Conjugate,
|
|
29
29
|
Grouping,
|
|
30
|
-
IterationDirection,
|
|
31
30
|
Move,
|
|
32
31
|
TraversalDownUp,
|
|
33
32
|
TraversalUp,
|
|
34
33
|
direct,
|
|
35
34
|
directedGenerator,
|
|
36
35
|
experimentalAppendMove
|
|
37
|
-
} from "../chunk-
|
|
36
|
+
} from "../chunk-DO7GZAW4.js";
|
|
38
37
|
import {
|
|
39
38
|
__privateAdd,
|
|
40
39
|
__privateGet,
|
|
41
40
|
__privateMethod,
|
|
42
41
|
__privateSet
|
|
43
|
-
} from "../chunk-
|
|
42
|
+
} from "../chunk-MGJA5U5O.js";
|
|
44
43
|
|
|
45
44
|
// src/cubing/twisty/controllers/AnimationTypes.ts
|
|
46
|
-
var Direction;
|
|
47
|
-
(function(Direction2) {
|
|
48
|
-
Direction2[Direction2["Forwards"] = 1] = "Forwards";
|
|
49
|
-
Direction2[Direction2["Paused"] = 0] = "Paused";
|
|
50
|
-
Direction2[Direction2["Backwards"] = -1] = "Backwards";
|
|
51
|
-
})(Direction || (Direction = {}));
|
|
52
45
|
function directionScalar(direction) {
|
|
53
46
|
return direction;
|
|
54
47
|
}
|
|
55
|
-
var BoundaryType;
|
|
56
|
-
(function(BoundaryType2) {
|
|
57
|
-
BoundaryType2["Move"] = "move";
|
|
58
|
-
BoundaryType2["EntireTimeline"] = "entire-timeline";
|
|
59
|
-
})(BoundaryType || (BoundaryType = {}));
|
|
60
48
|
|
|
61
49
|
// src/cubing/twisty/controllers/RenderScheduler.ts
|
|
62
50
|
var RenderScheduler = class {
|
|
@@ -173,7 +161,7 @@ var TwistyAnimationController = class {
|
|
|
173
161
|
this.delegate = delegate;
|
|
174
162
|
__privateAdd(this, _effectiveTimestampMilliseconds);
|
|
175
163
|
this.playing = false;
|
|
176
|
-
this.direction =
|
|
164
|
+
this.direction = 1 /* Forwards */;
|
|
177
165
|
this.lastDatestamp = 0;
|
|
178
166
|
this.scheduler = new RenderScheduler(this.animFrame.bind(this));
|
|
179
167
|
__privateAdd(this, _animFrameEffectiveTimestampStaleDropper, new StaleDropper());
|
|
@@ -217,14 +205,14 @@ var TwistyAnimationController = class {
|
|
|
217
205
|
}
|
|
218
206
|
}
|
|
219
207
|
async play(options) {
|
|
220
|
-
const direction = options?.direction ??
|
|
208
|
+
const direction = options?.direction ?? 1 /* Forwards */;
|
|
221
209
|
const coarseTimelineInfo = await this.model.coarseTimelineInfo.get();
|
|
222
210
|
if (options?.autoSkipToOtherEndIfStartingAtBoundary ?? true) {
|
|
223
|
-
if (direction ===
|
|
211
|
+
if (direction === 1 /* Forwards */ && coarseTimelineInfo.atEnd) {
|
|
224
212
|
this.model.timestampRequest.set("start");
|
|
225
213
|
this.delegate.flash();
|
|
226
214
|
}
|
|
227
|
-
if (direction ===
|
|
215
|
+
if (direction === -1 /* Backwards */ && coarseTimelineInfo.atStart) {
|
|
228
216
|
this.model.timestampRequest.set("end");
|
|
229
217
|
this.delegate.flash();
|
|
230
218
|
}
|
|
@@ -232,7 +220,7 @@ var TwistyAnimationController = class {
|
|
|
232
220
|
this.model.playingInfo.set({
|
|
233
221
|
playing: true,
|
|
234
222
|
direction,
|
|
235
|
-
untilBoundary: options?.untilBoundary ??
|
|
223
|
+
untilBoundary: options?.untilBoundary ?? "entire-timeline" /* EntireTimeline */,
|
|
236
224
|
loop: options?.loop ?? false
|
|
237
225
|
});
|
|
238
226
|
this.playing = true;
|
|
@@ -245,7 +233,7 @@ var TwistyAnimationController = class {
|
|
|
245
233
|
this.scheduler.cancelAnimFrame();
|
|
246
234
|
this.model.playingInfo.set({
|
|
247
235
|
playing: false,
|
|
248
|
-
untilBoundary:
|
|
236
|
+
untilBoundary: "entire-timeline" /* EntireTimeline */
|
|
249
237
|
});
|
|
250
238
|
}
|
|
251
239
|
async animFrame(frameDatestamp) {
|
|
@@ -266,11 +254,11 @@ var TwistyAnimationController = class {
|
|
|
266
254
|
return;
|
|
267
255
|
}
|
|
268
256
|
let end = currentMoveInfo.earliestEnd;
|
|
269
|
-
if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary ===
|
|
257
|
+
if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === "entire-timeline" /* EntireTimeline */) {
|
|
270
258
|
end = timeRange.end;
|
|
271
259
|
}
|
|
272
260
|
let start = currentMoveInfo.latestStart;
|
|
273
|
-
if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary ===
|
|
261
|
+
if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === "entire-timeline" /* EntireTimeline */) {
|
|
274
262
|
start = timeRange.start;
|
|
275
263
|
}
|
|
276
264
|
let delta = (frameDatestamp - lastDatestamp) * directionScalar(this.direction) * tempoScale;
|
|
@@ -388,7 +376,7 @@ var _cssSourceMap;
|
|
|
388
376
|
var ManagedCustomElement = class extends HTMLElementShim {
|
|
389
377
|
constructor(options) {
|
|
390
378
|
super();
|
|
391
|
-
__privateAdd(this, _cssSourceMap, new Map());
|
|
379
|
+
__privateAdd(this, _cssSourceMap, /* @__PURE__ */ new Map());
|
|
392
380
|
this.shadow = this.attachShadow({ mode: options?.mode ?? "closed" });
|
|
393
381
|
this.contentWrapper = document.createElement("div");
|
|
394
382
|
this.contentWrapper.classList.add("wrapper");
|
|
@@ -717,7 +705,7 @@ var Twisty2DPuzzle = class extends ManagedCustomElement {
|
|
|
717
705
|
if (position.movesInProgress.length > 0) {
|
|
718
706
|
const move = position.movesInProgress[0].move;
|
|
719
707
|
let partialMove = move;
|
|
720
|
-
if (position.movesInProgress[0].direction ===
|
|
708
|
+
if (position.movesInProgress[0].direction === -1 /* Backwards */) {
|
|
721
709
|
partialMove = move.invert();
|
|
722
710
|
}
|
|
723
711
|
const newState = position.state.applyMove(partialMove);
|
|
@@ -774,7 +762,7 @@ var Twisty2DPuzzleWrapper = class {
|
|
|
774
762
|
__privateAdd(this, _freshListenerManager2, new FreshListenerManager());
|
|
775
763
|
__privateAdd(this, _cachedTwisty2DPuzzle, null);
|
|
776
764
|
this.twisty2DPuzzle();
|
|
777
|
-
__privateGet(this, _freshListenerManager2).addListener(this.model.stickering, async (stickering) => {
|
|
765
|
+
__privateGet(this, _freshListenerManager2).addListener(this.model.twistySceneModel.stickering, async (stickering) => {
|
|
778
766
|
(await this.twisty2DPuzzle()).experimentalSetStickering(stickering);
|
|
779
767
|
});
|
|
780
768
|
}
|
|
@@ -810,7 +798,7 @@ var Twisty2DSceneWrapper = class extends ManagedCustomElement {
|
|
|
810
798
|
async connectedCallback() {
|
|
811
799
|
this.addCSS(twistyViewerWrapperCSS);
|
|
812
800
|
if (this.model) {
|
|
813
|
-
__privateGet(this, _freshListenerManager3).addListener(this.model.puzzleLoader, this.onPuzzleLoader.bind(this));
|
|
801
|
+
__privateGet(this, _freshListenerManager3).addListener(this.model.twistyPlayerModel.puzzleLoader, this.onPuzzleLoader.bind(this));
|
|
814
802
|
}
|
|
815
803
|
}
|
|
816
804
|
async scene() {
|
|
@@ -832,7 +820,7 @@ var Twisty2DSceneWrapper = class extends ManagedCustomElement {
|
|
|
832
820
|
}
|
|
833
821
|
async onPuzzleLoader(puzzleLoader) {
|
|
834
822
|
__privateGet(this, _currentTwisty2DPuzzleWrapper)?.disconnect();
|
|
835
|
-
const twisty2DPuzzleWrapper = new Twisty2DPuzzleWrapper(this.model, this, puzzleLoader, this.effectiveVisualization);
|
|
823
|
+
const twisty2DPuzzleWrapper = new Twisty2DPuzzleWrapper(this.model.twistyPlayerModel, this, puzzleLoader, this.effectiveVisualization);
|
|
836
824
|
this.setCurrentTwisty2DPuzzleWrapper(twisty2DPuzzleWrapper);
|
|
837
825
|
}
|
|
838
826
|
};
|
|
@@ -896,19 +884,19 @@ var Twisty3DPuzzleWrapper = class {
|
|
|
896
884
|
this.disconnect();
|
|
897
885
|
}
|
|
898
886
|
});
|
|
899
|
-
__privateGet(this, _freshListenerManager4).addListener(this.model.hintFacelet, async (hintFaceletStyle) => {
|
|
887
|
+
__privateGet(this, _freshListenerManager4).addListener(this.model.twistySceneModel.hintFacelet, async (hintFaceletStyle) => {
|
|
900
888
|
(await this.twisty3DPuzzle()).experimentalUpdateOptions({
|
|
901
889
|
hintFacelets: hintFaceletStyle === "auto" ? "floating" : hintFaceletStyle
|
|
902
890
|
});
|
|
903
891
|
this.scheduleRender();
|
|
904
892
|
});
|
|
905
|
-
__privateGet(this, _freshListenerManager4).addListener(this.model.foundationDisplay, async (foundationDisplay) => {
|
|
893
|
+
__privateGet(this, _freshListenerManager4).addListener(this.model.twistySceneModel.foundationDisplay, async (foundationDisplay) => {
|
|
906
894
|
(await this.twisty3DPuzzle()).experimentalUpdateOptions({
|
|
907
895
|
showFoundation: foundationDisplay !== "none"
|
|
908
896
|
});
|
|
909
897
|
this.scheduleRender();
|
|
910
898
|
});
|
|
911
|
-
__privateGet(this, _freshListenerManager4).addListener(this.model.stickering, async (stickering) => {
|
|
899
|
+
__privateGet(this, _freshListenerManager4).addListener(this.model.twistySceneModel.stickering, async (stickering) => {
|
|
912
900
|
if ("setStickering" in await this.twisty3DPuzzle()) {
|
|
913
901
|
(await this.twisty3DPuzzle()).setStickering(stickering);
|
|
914
902
|
this.scheduleRender();
|
|
@@ -932,7 +920,10 @@ var Twisty3DPuzzleWrapper = class {
|
|
|
932
920
|
}
|
|
933
921
|
}
|
|
934
922
|
});
|
|
935
|
-
__privateGet(this, _freshListenerManager4).addMultiListener([
|
|
923
|
+
__privateGet(this, _freshListenerManager4).addMultiListener([
|
|
924
|
+
this.model.twistySceneModel.foundationStickerSprite,
|
|
925
|
+
this.model.twistySceneModel.hintStickerSprite
|
|
926
|
+
], async (inputs) => {
|
|
936
927
|
if ("experimentalUpdateTexture" in await this.twisty3DPuzzle()) {
|
|
937
928
|
(await this.twisty3DPuzzle()).experimentalUpdateTexture(true, ...inputs);
|
|
938
929
|
this.scheduleRender();
|
|
@@ -950,9 +941,9 @@ var Twisty3DPuzzleWrapper = class {
|
|
|
950
941
|
const proxyPromise = proxy3D();
|
|
951
942
|
if (this.puzzleLoader.id === "3x3x3" && this.visualizationStrategy === "Cube3D") {
|
|
952
943
|
const [foundationSprite, hintSprite, experimentalStickering] = await Promise.all([
|
|
953
|
-
this.model.foundationStickerSprite.get(),
|
|
954
|
-
this.model.hintStickerSprite.get(),
|
|
955
|
-
this.model.stickering.get()
|
|
944
|
+
this.model.twistySceneModel.foundationStickerSprite.get(),
|
|
945
|
+
this.model.twistySceneModel.hintStickerSprite.get(),
|
|
946
|
+
this.model.twistySceneModel.stickering.get()
|
|
956
947
|
]);
|
|
957
948
|
return (await proxyPromise).cube3DShim({
|
|
958
949
|
foundationSprite,
|
|
@@ -961,9 +952,9 @@ var Twisty3DPuzzleWrapper = class {
|
|
|
961
952
|
});
|
|
962
953
|
} else {
|
|
963
954
|
const [hintFacelets, foundationSprite, hintSprite] = await Promise.all([
|
|
964
|
-
this.model.hintFacelet.get(),
|
|
965
|
-
this.model.foundationStickerSprite.get(),
|
|
966
|
-
this.model.hintStickerSprite.get()
|
|
955
|
+
this.model.twistySceneModel.hintFacelet.get(),
|
|
956
|
+
this.model.twistySceneModel.foundationStickerSprite.get(),
|
|
957
|
+
this.model.twistySceneModel.hintStickerSprite.get()
|
|
967
958
|
]);
|
|
968
959
|
const pg3d = (await proxyPromise).pg3dShim(this.puzzleLoader, hintFacelets === "auto" ? "floating" : hintFacelets);
|
|
969
960
|
pg3d.then((p) => p.experimentalUpdateTexture(true, foundationSprite ?? void 0, hintSprite ?? void 0));
|
|
@@ -1171,7 +1162,7 @@ var DragTracker = class extends EventTarget {
|
|
|
1171
1162
|
__privateAdd(this, _registerLazyListeners);
|
|
1172
1163
|
__privateAdd(this, _clear);
|
|
1173
1164
|
__privateAdd(this, _trackDrag);
|
|
1174
|
-
__privateAdd(this, _dragInfoMap, new Map());
|
|
1165
|
+
__privateAdd(this, _dragInfoMap, /* @__PURE__ */ new Map());
|
|
1175
1166
|
__privateAdd(this, _lazyListenersRegistered, false);
|
|
1176
1167
|
target.addEventListener("pointerdown", this.onPointerDown.bind(this));
|
|
1177
1168
|
this.target.addEventListener("contextmenu", (e) => {
|
|
@@ -1364,8 +1355,8 @@ var TwistyOrbitControls = class {
|
|
|
1364
1355
|
const minDim = Math.min(this.canvas.offsetWidth, this.canvas.offsetHeight);
|
|
1365
1356
|
const temperedX = this.temperMovement(movementX / minDim);
|
|
1366
1357
|
const temperedY = this.temperMovement(movementY / minDim * VERTICAL_MOVEMENT_BASE_SCALE);
|
|
1367
|
-
this.model.orbitCoordinatesRequest.set((async () => {
|
|
1368
|
-
const prevCoords = await this.model.orbitCoordinates.get();
|
|
1358
|
+
this.model.twistySceneModel.orbitCoordinatesRequest.set((async () => {
|
|
1359
|
+
const prevCoords = await this.model.twistySceneModel.orbitCoordinates.get();
|
|
1369
1360
|
const newCoords = {
|
|
1370
1361
|
latitude: prevCoords.latitude + 2 * temperedY * DEGREES_PER_RADIAN * scale,
|
|
1371
1362
|
longitude: prevCoords.longitude - 2 * temperedX * DEGREES_PER_RADIAN
|
|
@@ -1497,7 +1488,7 @@ var Twisty3DVantage = class extends ManagedCustomElement {
|
|
|
1497
1488
|
return __privateGet(this, _cachedOrbitControls) ?? __privateSet(this, _cachedOrbitControls, (async () => {
|
|
1498
1489
|
const orbitControls = new TwistyOrbitControls(this.model, !!this.options?.backView, (await this.canvasInfo()).canvas, await __privateMethod(this, _dragTracker, dragTracker_fn).call(this));
|
|
1499
1490
|
if (this.model) {
|
|
1500
|
-
this.addListener(this.model.orbitCoordinates, async (orbitCoordinates) => {
|
|
1491
|
+
this.addListener(this.model.twistySceneModel.orbitCoordinates, async (orbitCoordinates) => {
|
|
1501
1492
|
const camera = await this.camera();
|
|
1502
1493
|
setCameraFromOrbitCoordinates(camera, orbitCoordinates, this.options?.backView);
|
|
1503
1494
|
this.scheduleRender();
|
|
@@ -1543,7 +1534,7 @@ _setupBasicPresses = new WeakSet();
|
|
|
1543
1534
|
setupBasicPresses_fn = async function() {
|
|
1544
1535
|
const dragTracker = await __privateMethod(this, _dragTracker, dragTracker_fn).call(this);
|
|
1545
1536
|
dragTracker.addEventListener("press", async (e) => {
|
|
1546
|
-
const movePressInput = await this.model.movePressInput.get();
|
|
1537
|
+
const movePressInput = await this.model.twistySceneModel.movePressInput.get();
|
|
1547
1538
|
if (movePressInput !== "basic") {
|
|
1548
1539
|
return;
|
|
1549
1540
|
}
|
|
@@ -1618,7 +1609,7 @@ var Twisty3DSceneWrapper = class extends ManagedCustomElement {
|
|
|
1618
1609
|
__privateAdd(this, _freshListenerManager5, new FreshListenerManager());
|
|
1619
1610
|
__privateAdd(this, _backViewVantage, null);
|
|
1620
1611
|
__privateAdd(this, _cachedScene2, void 0);
|
|
1621
|
-
__privateAdd(this, _vantages, new Set());
|
|
1612
|
+
__privateAdd(this, _vantages, /* @__PURE__ */ new Set());
|
|
1622
1613
|
__privateAdd(this, _currentTwisty3DPuzzleWrapper, null);
|
|
1623
1614
|
__privateAdd(this, _twisty3DStaleDropper, new StaleDropper());
|
|
1624
1615
|
}
|
|
@@ -2009,8 +2000,8 @@ onCommand_fn = function(command) {
|
|
|
2009
2000
|
break;
|
|
2010
2001
|
case "play-step-backwards":
|
|
2011
2002
|
this.controller?.animationController.play({
|
|
2012
|
-
direction:
|
|
2013
|
-
untilBoundary:
|
|
2003
|
+
direction: -1 /* Backwards */,
|
|
2004
|
+
untilBoundary: "move" /* Move */
|
|
2014
2005
|
});
|
|
2015
2006
|
break;
|
|
2016
2007
|
case "play-pause":
|
|
@@ -2018,8 +2009,8 @@ onCommand_fn = function(command) {
|
|
|
2018
2009
|
break;
|
|
2019
2010
|
case "play-step":
|
|
2020
2011
|
this.controller?.animationController.play({
|
|
2021
|
-
direction:
|
|
2022
|
-
untilBoundary:
|
|
2012
|
+
direction: 1 /* Forwards */,
|
|
2013
|
+
untilBoundary: "move" /* Move */
|
|
2023
2014
|
});
|
|
2024
2015
|
break;
|
|
2025
2016
|
case "jump-to-end":
|
|
@@ -2186,11 +2177,11 @@ async function screenshot(model, options) {
|
|
|
2186
2177
|
const scene = new (await THREEJS).Scene();
|
|
2187
2178
|
const twisty3DWrapper = new Twisty3DPuzzleWrapper(model, { scheduleRender: () => {
|
|
2188
2179
|
} }, await model.puzzleLoader.get(), await model.visualizationStrategy.get());
|
|
2189
|
-
await model.stickering.get();
|
|
2180
|
+
await model.twistySceneModel.stickering.get();
|
|
2190
2181
|
await new Promise((resolve) => setTimeout(resolve, 1e3));
|
|
2191
2182
|
await model.legacyPosition.get();
|
|
2192
2183
|
scene.add(await twisty3DWrapper.twisty3DPuzzle());
|
|
2193
|
-
const orbitCoordinates = await model.orbitCoordinates.get();
|
|
2184
|
+
const orbitCoordinates = await model.twistySceneModel.orbitCoordinates.get();
|
|
2194
2185
|
await setCameraFromOrbitCoordinates(camera, orbitCoordinates);
|
|
2195
2186
|
const renderer = new (await THREEJS).WebGLRenderer({
|
|
2196
2187
|
antialias: true,
|
|
@@ -2293,6 +2284,26 @@ twisty-scrubber {
|
|
|
2293
2284
|
}
|
|
2294
2285
|
`);
|
|
2295
2286
|
|
|
2287
|
+
// src/cubing/twisty/model/props/general/ArbitraryStringProp.ts
|
|
2288
|
+
var ArbitraryStringProp = class extends SimpleTwistyPropSource {
|
|
2289
|
+
getDefaultValue() {
|
|
2290
|
+
return null;
|
|
2291
|
+
}
|
|
2292
|
+
};
|
|
2293
|
+
|
|
2294
|
+
// src/cubing/twisty/model/props/general/URLProp.ts
|
|
2295
|
+
var URLProp = class extends TwistyPropSource {
|
|
2296
|
+
getDefaultValue() {
|
|
2297
|
+
return null;
|
|
2298
|
+
}
|
|
2299
|
+
derive(input) {
|
|
2300
|
+
if (typeof input === "string") {
|
|
2301
|
+
return new URL(input, location.href);
|
|
2302
|
+
}
|
|
2303
|
+
return input;
|
|
2304
|
+
}
|
|
2305
|
+
};
|
|
2306
|
+
|
|
2296
2307
|
// src/cubing/twisty/model/props/puzzle/state/AlgProp.ts
|
|
2297
2308
|
var AlgIssues = class {
|
|
2298
2309
|
constructor(issues) {
|
|
@@ -2358,354 +2369,155 @@ var AlgProp = class extends TwistyPropSource {
|
|
|
2358
2369
|
}
|
|
2359
2370
|
};
|
|
2360
2371
|
|
|
2361
|
-
// src/cubing/twisty/model/props/
|
|
2362
|
-
var
|
|
2363
|
-
|
|
2364
|
-
return
|
|
2365
|
-
}
|
|
2366
|
-
};
|
|
2367
|
-
|
|
2368
|
-
// src/cubing/twisty/model/props/viewer/BackViewProp.ts
|
|
2369
|
-
var backViewLayouts = {
|
|
2370
|
-
"none": true,
|
|
2371
|
-
"side-by-side": true,
|
|
2372
|
-
"top-right": true
|
|
2373
|
-
};
|
|
2374
|
-
var BackViewProp = class extends SimpleTwistyPropSource {
|
|
2375
|
-
getDefaultValue() {
|
|
2376
|
-
return "auto";
|
|
2377
|
-
}
|
|
2378
|
-
};
|
|
2379
|
-
|
|
2380
|
-
// src/cubing/twisty/model/props/puzzle/state/IndexerConstructorRequestProp.ts
|
|
2381
|
-
var IndexerConstructorRequestProp = class extends SimpleTwistyPropSource {
|
|
2382
|
-
getDefaultValue() {
|
|
2383
|
-
return "auto";
|
|
2372
|
+
// src/cubing/twisty/model/props/puzzle/state/AlgTransformationProp.ts
|
|
2373
|
+
var AlgTransformationProp = class extends TwistyPropDerived {
|
|
2374
|
+
derive(input) {
|
|
2375
|
+
return input.kpuzzle.algToTransformation(input.setupAlg.alg);
|
|
2384
2376
|
}
|
|
2385
2377
|
};
|
|
2386
2378
|
|
|
2387
|
-
// src/cubing/twisty/model/props/
|
|
2388
|
-
var
|
|
2389
|
-
|
|
2390
|
-
|
|
2391
|
-
|
|
2379
|
+
// src/cubing/twisty/model/props/puzzle/state/AnchorTransformationProp.ts
|
|
2380
|
+
var AnchorTransformationProp = class extends TwistyPropDerived {
|
|
2381
|
+
derive(inputs) {
|
|
2382
|
+
if (inputs.setupTransformation) {
|
|
2383
|
+
return inputs.setupTransformation;
|
|
2384
|
+
}
|
|
2385
|
+
switch (inputs.setupAnchor) {
|
|
2386
|
+
case "start":
|
|
2387
|
+
return inputs.setupAlgTransformation;
|
|
2388
|
+
case "end": {
|
|
2389
|
+
const algTransformation = inputs.indexer.transformationAtIndex(inputs.indexer.numAnimatedLeaves());
|
|
2390
|
+
const inverseAlgTransformation = algTransformation.invert();
|
|
2391
|
+
return inputs.setupAlgTransformation.applyTransformation(inverseAlgTransformation);
|
|
2392
|
+
}
|
|
2393
|
+
default:
|
|
2394
|
+
throw new Error("Unimplemented!");
|
|
2395
|
+
}
|
|
2392
2396
|
}
|
|
2393
2397
|
};
|
|
2394
2398
|
|
|
2395
|
-
// src/cubing/twisty/model/props/
|
|
2396
|
-
|
|
2397
|
-
return c1.latitude === c2.latitude && c1.longitude === c2.longitude && c1.distance === c2.distance;
|
|
2398
|
-
}
|
|
2399
|
-
var OrbitCoordinatesRequestProp = class extends TwistyPropSource {
|
|
2399
|
+
// src/cubing/twisty/model/props/puzzle/state/CatchUpMoveProp.ts
|
|
2400
|
+
var CatchUpMoveProp = class extends SimpleTwistyPropSource {
|
|
2400
2401
|
getDefaultValue() {
|
|
2401
|
-
return
|
|
2402
|
+
return { move: null, amount: 0 };
|
|
2402
2403
|
}
|
|
2403
2404
|
canReuseValue(v1, v2) {
|
|
2404
|
-
return v1 === v2
|
|
2405
|
-
}
|
|
2406
|
-
async derive(newCoordinates, oldValuePromise) {
|
|
2407
|
-
if (newCoordinates === "auto") {
|
|
2408
|
-
return "auto";
|
|
2409
|
-
}
|
|
2410
|
-
let oldValue = await oldValuePromise;
|
|
2411
|
-
if (oldValue === "auto") {
|
|
2412
|
-
oldValue = {};
|
|
2413
|
-
}
|
|
2414
|
-
const newValue = Object.assign({}, oldValue);
|
|
2415
|
-
Object.assign(newValue, newCoordinates);
|
|
2416
|
-
if (typeof newValue.latitude !== "undefined") {
|
|
2417
|
-
newValue.latitude = Math.min(Math.max(newValue.latitude, -90), 90);
|
|
2418
|
-
}
|
|
2419
|
-
if (typeof newValue.longitude !== "undefined") {
|
|
2420
|
-
newValue.longitude = mod(newValue.longitude, 360, 180);
|
|
2421
|
-
}
|
|
2422
|
-
return newValue;
|
|
2405
|
+
return v1.move === v2.move && v1.amount === v2.amount;
|
|
2423
2406
|
}
|
|
2424
2407
|
};
|
|
2425
2408
|
|
|
2426
|
-
// src/cubing/twisty/model/props/
|
|
2427
|
-
var
|
|
2428
|
-
|
|
2409
|
+
// src/cubing/twisty/model/props/puzzle/state/CurrentLeavesSimplified.ts
|
|
2410
|
+
var CurrentLeavesSimplifiedProp = class extends TwistyPropDerived {
|
|
2411
|
+
derive(inputs) {
|
|
2429
2412
|
return {
|
|
2430
|
-
|
|
2431
|
-
|
|
2432
|
-
|
|
2433
|
-
loop: false
|
|
2413
|
+
stateIndex: inputs.currentMoveInfo.stateIndex,
|
|
2414
|
+
movesFinishing: inputs.currentMoveInfo.movesFinishing.map((currentMoveInfo) => currentMoveInfo.move),
|
|
2415
|
+
movesFinished: inputs.currentMoveInfo.movesFinished.map((currentMoveInfo) => currentMoveInfo.move)
|
|
2434
2416
|
};
|
|
2435
2417
|
}
|
|
2436
|
-
|
|
2437
|
-
|
|
2438
|
-
const newValue = Object.assign({}, oldValue);
|
|
2439
|
-
Object.assign(newValue, newInfo);
|
|
2440
|
-
return newValue;
|
|
2441
|
-
}
|
|
2442
|
-
canReuseValue(v1, v2) {
|
|
2443
|
-
return v1.direction === v2.direction && v1.playing === v2.playing && v1.untilBoundary === v2.untilBoundary && v1.loop === v2.loop;
|
|
2444
|
-
}
|
|
2445
|
-
};
|
|
2446
|
-
|
|
2447
|
-
// src/cubing/twisty/model/props/puzzle/structure/PuzzleDescriptionProp.ts
|
|
2448
|
-
var PGPuzzleDescriptionStringProp = class extends SimpleTwistyPropSource {
|
|
2449
|
-
getDefaultValue() {
|
|
2450
|
-
return NO_VALUE;
|
|
2451
|
-
}
|
|
2452
|
-
};
|
|
2453
|
-
|
|
2454
|
-
// src/cubing/twisty/model/props/puzzle/structure/PuzzleIDRequestProp.ts
|
|
2455
|
-
var PuzzleIDRequestProp = class extends SimpleTwistyPropSource {
|
|
2456
|
-
getDefaultValue() {
|
|
2457
|
-
return NO_VALUE;
|
|
2418
|
+
canReuse(v1, v2) {
|
|
2419
|
+
return v1.stateIndex === v2.stateIndex && arrayEqualsCompare(v1.movesFinishing, v2.movesFinishing, (m1, m2) => m1.isIdentical(m2)) && arrayEqualsCompare(v1.movesFinished, v2.movesFinished, (m1, m2) => m1.isIdentical(m2));
|
|
2458
2420
|
}
|
|
2459
2421
|
};
|
|
2460
2422
|
|
|
2461
|
-
// src/cubing/twisty/model/props/puzzle/
|
|
2462
|
-
var
|
|
2423
|
+
// src/cubing/twisty/model/props/puzzle/state/CurrentMoveInfoProp.ts
|
|
2424
|
+
var CurrentMoveInfoProp = class extends TwistyPropDerived {
|
|
2463
2425
|
derive(inputs) {
|
|
2464
|
-
|
|
2465
|
-
|
|
2466
|
-
|
|
2467
|
-
|
|
2468
|
-
|
|
2426
|
+
function addCatchUpMove(currentMoveInfo) {
|
|
2427
|
+
if (inputs.detailedTimelineInfo.atEnd && inputs.catchUpMove.move !== null) {
|
|
2428
|
+
currentMoveInfo.currentMoves.push({
|
|
2429
|
+
move: inputs.catchUpMove.move,
|
|
2430
|
+
direction: -1 /* Backwards */,
|
|
2431
|
+
fraction: 1 - inputs.catchUpMove.amount,
|
|
2432
|
+
startTimestamp: -1,
|
|
2433
|
+
endTimestamp: -1
|
|
2469
2434
|
});
|
|
2470
2435
|
}
|
|
2471
|
-
return
|
|
2436
|
+
return currentMoveInfo;
|
|
2472
2437
|
}
|
|
2473
|
-
if (inputs.
|
|
2474
|
-
return
|
|
2438
|
+
if (inputs.indexer.currentMoveInfo) {
|
|
2439
|
+
return addCatchUpMove(inputs.indexer.currentMoveInfo(inputs.detailedTimelineInfo.timestamp));
|
|
2440
|
+
} else {
|
|
2441
|
+
const idx = inputs.indexer.timestampToIndex(inputs.detailedTimelineInfo.timestamp);
|
|
2442
|
+
const currentMoveInfo = {
|
|
2443
|
+
stateIndex: idx,
|
|
2444
|
+
currentMoves: [],
|
|
2445
|
+
movesFinishing: [],
|
|
2446
|
+
movesFinished: [],
|
|
2447
|
+
movesStarting: [],
|
|
2448
|
+
latestStart: -Infinity,
|
|
2449
|
+
earliestEnd: Infinity
|
|
2450
|
+
};
|
|
2451
|
+
if (inputs.indexer.numAnimatedLeaves() > 0) {
|
|
2452
|
+
const move = inputs.indexer.getAnimLeaf(idx)?.as(Move);
|
|
2453
|
+
if (!move) {
|
|
2454
|
+
return addCatchUpMove(currentMoveInfo);
|
|
2455
|
+
}
|
|
2456
|
+
const start = inputs.indexer.indexToMoveStartTimestamp(idx);
|
|
2457
|
+
const duration = inputs.indexer.moveDuration(idx);
|
|
2458
|
+
const fraction = (inputs.detailedTimelineInfo.timestamp - start) / duration;
|
|
2459
|
+
const end = start + duration;
|
|
2460
|
+
const currentMove = {
|
|
2461
|
+
move,
|
|
2462
|
+
direction: 1 /* Forwards */,
|
|
2463
|
+
fraction,
|
|
2464
|
+
startTimestamp: start,
|
|
2465
|
+
endTimestamp: end
|
|
2466
|
+
};
|
|
2467
|
+
if (fraction === 0) {
|
|
2468
|
+
currentMoveInfo.movesStarting.push(currentMove);
|
|
2469
|
+
} else if (fraction === 1) {
|
|
2470
|
+
currentMoveInfo.movesFinishing.push(currentMove);
|
|
2471
|
+
} else {
|
|
2472
|
+
currentMoveInfo.currentMoves.push(currentMove);
|
|
2473
|
+
currentMoveInfo.latestStart = Math.max(currentMoveInfo.latestStart, start);
|
|
2474
|
+
currentMoveInfo.earliestEnd = Math.min(currentMoveInfo.earliestEnd, end);
|
|
2475
|
+
}
|
|
2476
|
+
}
|
|
2477
|
+
return addCatchUpMove(currentMoveInfo);
|
|
2475
2478
|
}
|
|
2476
|
-
return cube3x3x3;
|
|
2477
2479
|
}
|
|
2478
2480
|
};
|
|
2479
2481
|
|
|
2480
|
-
// src/cubing/twisty/model/props/puzzle/state/
|
|
2481
|
-
var
|
|
2482
|
-
|
|
2483
|
-
|
|
2482
|
+
// src/cubing/twisty/model/props/puzzle/state/CurrentStateProp.ts
|
|
2483
|
+
var CurrentStateProp = class extends TwistyPropDerived {
|
|
2484
|
+
derive(inputs) {
|
|
2485
|
+
let transformation = inputs.indexer.transformationAtIndex(inputs.currentLeavesSimplified.stateIndex);
|
|
2486
|
+
transformation = inputs.anchoredStart.applyTransformation(transformation);
|
|
2487
|
+
for (const finishingMove of inputs.currentLeavesSimplified.movesFinishing) {
|
|
2488
|
+
transformation = transformation.applyMove(finishingMove);
|
|
2489
|
+
}
|
|
2490
|
+
for (const finishedMove of inputs.currentLeavesSimplified.movesFinished) {
|
|
2491
|
+
transformation = transformation.applyMove(finishedMove);
|
|
2492
|
+
}
|
|
2493
|
+
return transformation.toKState();
|
|
2484
2494
|
}
|
|
2485
2495
|
};
|
|
2486
2496
|
|
|
2487
|
-
// src/cubing/twisty/
|
|
2488
|
-
|
|
2489
|
-
|
|
2490
|
-
|
|
2491
|
-
|
|
2492
|
-
|
|
2493
|
-
|
|
2497
|
+
// src/cubing/twisty/controllers/indexer/AlgDuration.ts
|
|
2498
|
+
function defaultDurationForAmount(amount) {
|
|
2499
|
+
switch (Math.abs(amount)) {
|
|
2500
|
+
case 0:
|
|
2501
|
+
return 0;
|
|
2502
|
+
case 1:
|
|
2503
|
+
return 1e3;
|
|
2504
|
+
case 2:
|
|
2505
|
+
return 1500;
|
|
2506
|
+
default:
|
|
2507
|
+
return 2e3;
|
|
2494
2508
|
}
|
|
2495
|
-
}
|
|
2496
|
-
|
|
2497
|
-
|
|
2498
|
-
|
|
2499
|
-
|
|
2500
|
-
"end": true,
|
|
2501
|
-
"anchor": true,
|
|
2502
|
-
"opposite-anchor": true
|
|
2503
|
-
};
|
|
2504
|
-
var TimestampRequestProp = class extends SimpleTwistyPropSource {
|
|
2505
|
-
getDefaultValue() {
|
|
2506
|
-
return "opposite-anchor";
|
|
2509
|
+
}
|
|
2510
|
+
var AlgDuration = class extends TraversalUp {
|
|
2511
|
+
constructor(durationForAmount = defaultDurationForAmount) {
|
|
2512
|
+
super();
|
|
2513
|
+
this.durationForAmount = durationForAmount;
|
|
2507
2514
|
}
|
|
2508
|
-
|
|
2509
|
-
|
|
2510
|
-
|
|
2515
|
+
traverseAlg(alg) {
|
|
2516
|
+
let total = 0;
|
|
2517
|
+
for (const unit of alg.units()) {
|
|
2518
|
+
total += this.traverseUnit(unit);
|
|
2511
2519
|
}
|
|
2512
|
-
|
|
2513
|
-
}
|
|
2514
|
-
validInput(v) {
|
|
2515
|
-
if (typeof v === "number") {
|
|
2516
|
-
return true;
|
|
2517
|
-
}
|
|
2518
|
-
if (smartTimestamps[v]) {
|
|
2519
|
-
return true;
|
|
2520
|
-
}
|
|
2521
|
-
return false;
|
|
2522
|
-
}
|
|
2523
|
-
};
|
|
2524
|
-
|
|
2525
|
-
// src/cubing/twisty/model/props/general/URLProp.ts
|
|
2526
|
-
var URLProp = class extends TwistyPropSource {
|
|
2527
|
-
getDefaultValue() {
|
|
2528
|
-
return null;
|
|
2529
|
-
}
|
|
2530
|
-
derive(input) {
|
|
2531
|
-
if (typeof input === "string") {
|
|
2532
|
-
return new URL(input, location.href);
|
|
2533
|
-
}
|
|
2534
|
-
return input;
|
|
2535
|
-
}
|
|
2536
|
-
};
|
|
2537
|
-
|
|
2538
|
-
// src/cubing/twisty/model/props/viewer/ViewerLinkProp.ts
|
|
2539
|
-
var ViewerLinkProp = class extends SimpleTwistyPropSource {
|
|
2540
|
-
getDefaultValue() {
|
|
2541
|
-
return "auto";
|
|
2542
|
-
}
|
|
2543
|
-
};
|
|
2544
|
-
|
|
2545
|
-
// src/cubing/twisty/model/props/viewer/VisualizationProp.ts
|
|
2546
|
-
var VisualizationFormatProp = class extends SimpleTwistyPropSource {
|
|
2547
|
-
getDefaultValue() {
|
|
2548
|
-
return "auto";
|
|
2549
|
-
}
|
|
2550
|
-
};
|
|
2551
|
-
|
|
2552
|
-
// src/cubing/twisty/model/props/viewer/OrbitCoordinatesProp.ts
|
|
2553
|
-
var OrbitCoordinatesProp = class extends TwistyPropDerived {
|
|
2554
|
-
canReuseValue(v1, v2) {
|
|
2555
|
-
return orbitCoordinatesEqual(v1, v2);
|
|
2556
|
-
}
|
|
2557
|
-
async derive(inputs) {
|
|
2558
|
-
if (inputs.orbitCoordinatesRequest === "auto") {
|
|
2559
|
-
return defaultCameraOrbitCoordinates(inputs.puzzleID, inputs.strategy);
|
|
2560
|
-
}
|
|
2561
|
-
const req = Object.assign(Object.assign({}, defaultCameraOrbitCoordinates(inputs.puzzleID, inputs.strategy), inputs.orbitCoordinatesRequest));
|
|
2562
|
-
if (Math.abs(req.latitude) <= inputs.latitudeLimit) {
|
|
2563
|
-
return req;
|
|
2564
|
-
} else {
|
|
2565
|
-
const { latitude, longitude, distance } = req;
|
|
2566
|
-
return {
|
|
2567
|
-
latitude: inputs.latitudeLimit * Math.sign(latitude),
|
|
2568
|
-
longitude,
|
|
2569
|
-
distance
|
|
2570
|
-
};
|
|
2571
|
-
}
|
|
2572
|
-
}
|
|
2573
|
-
};
|
|
2574
|
-
var centeredCameraOrbitCoordinates = {
|
|
2575
|
-
latitude: 31.717474411461005,
|
|
2576
|
-
longitude: 0,
|
|
2577
|
-
distance: 5.877852522924731
|
|
2578
|
-
};
|
|
2579
|
-
var cubeCube3DCameraOrbitCoordinates = {
|
|
2580
|
-
latitude: 35,
|
|
2581
|
-
longitude: 30,
|
|
2582
|
-
distance: 6
|
|
2583
|
-
};
|
|
2584
|
-
var cubePG3DCameraOrbitCoordinates = {
|
|
2585
|
-
latitude: 35,
|
|
2586
|
-
longitude: 30,
|
|
2587
|
-
distance: 6.25
|
|
2588
|
-
};
|
|
2589
|
-
var megaminxCameraOrbitCoordinates = {
|
|
2590
|
-
latitude: Math.atan(1 / 2) * DEGREES_PER_RADIAN,
|
|
2591
|
-
longitude: 0,
|
|
2592
|
-
distance: 6.7
|
|
2593
|
-
};
|
|
2594
|
-
var pyraminxCameraOrbitCoordinates = {
|
|
2595
|
-
latitude: 26.56505117707799,
|
|
2596
|
-
longitude: 0,
|
|
2597
|
-
distance: 6
|
|
2598
|
-
};
|
|
2599
|
-
function defaultCameraOrbitCoordinates(puzzleID, strategy) {
|
|
2600
|
-
if (puzzleID[1] === "x") {
|
|
2601
|
-
if (strategy === "Cube3D") {
|
|
2602
|
-
return cubeCube3DCameraOrbitCoordinates;
|
|
2603
|
-
} else {
|
|
2604
|
-
return cubePG3DCameraOrbitCoordinates;
|
|
2605
|
-
}
|
|
2606
|
-
} else {
|
|
2607
|
-
switch (puzzleID) {
|
|
2608
|
-
case "megaminx":
|
|
2609
|
-
case "gigaminx":
|
|
2610
|
-
return megaminxCameraOrbitCoordinates;
|
|
2611
|
-
case "pyraminx":
|
|
2612
|
-
case "master_tetraminx":
|
|
2613
|
-
return pyraminxCameraOrbitCoordinates;
|
|
2614
|
-
case "skewb":
|
|
2615
|
-
return cubePG3DCameraOrbitCoordinates;
|
|
2616
|
-
default:
|
|
2617
|
-
return centeredCameraOrbitCoordinates;
|
|
2618
|
-
}
|
|
2619
|
-
}
|
|
2620
|
-
}
|
|
2621
|
-
|
|
2622
|
-
// src/cubing/twisty/model/props/puzzle/structure/PuzzleIDProp.ts
|
|
2623
|
-
var PuzzleIDProp = class extends TwistyPropDerived {
|
|
2624
|
-
async derive(inputs) {
|
|
2625
|
-
return inputs.puzzleLoader.id;
|
|
2626
|
-
}
|
|
2627
|
-
};
|
|
2628
|
-
|
|
2629
|
-
// src/cubing/twisty/model/props/puzzle/display/SpriteProp.ts
|
|
2630
|
-
var cachedLoader = null;
|
|
2631
|
-
async function loader() {
|
|
2632
|
-
return cachedLoader ?? (cachedLoader = new (await THREEJS).TextureLoader());
|
|
2633
|
-
}
|
|
2634
|
-
var SpriteProp = class extends TwistyPropDerived {
|
|
2635
|
-
async derive(inputs) {
|
|
2636
|
-
const { spriteURL: textureURL } = inputs;
|
|
2637
|
-
if (textureURL === null) {
|
|
2638
|
-
return null;
|
|
2639
|
-
}
|
|
2640
|
-
return new Promise(async (resolve, _reject) => {
|
|
2641
|
-
const onLoadingError = () => {
|
|
2642
|
-
console.warn("Could not load sprite:", textureURL.toString());
|
|
2643
|
-
resolve(null);
|
|
2644
|
-
};
|
|
2645
|
-
try {
|
|
2646
|
-
(await loader()).load(textureURL.toString(), resolve, onLoadingError, onLoadingError);
|
|
2647
|
-
} catch (e) {
|
|
2648
|
-
onLoadingError();
|
|
2649
|
-
}
|
|
2650
|
-
});
|
|
2651
|
-
}
|
|
2652
|
-
};
|
|
2653
|
-
|
|
2654
|
-
// src/cubing/twisty/model/props/viewer/VisualizationStrategyProp.ts
|
|
2655
|
-
var VisualizationStrategyProp = class extends TwistyPropDerived {
|
|
2656
|
-
derive(inputs) {
|
|
2657
|
-
switch (inputs.puzzleID) {
|
|
2658
|
-
case "clock":
|
|
2659
|
-
case "square1":
|
|
2660
|
-
case "kilominx":
|
|
2661
|
-
case "redi_cube":
|
|
2662
|
-
return "2D";
|
|
2663
|
-
case "3x3x3":
|
|
2664
|
-
switch (inputs.visualizationRequest) {
|
|
2665
|
-
case "auto":
|
|
2666
|
-
case "3D":
|
|
2667
|
-
return "Cube3D";
|
|
2668
|
-
default:
|
|
2669
|
-
return inputs.visualizationRequest;
|
|
2670
|
-
}
|
|
2671
|
-
default:
|
|
2672
|
-
switch (inputs.visualizationRequest) {
|
|
2673
|
-
case "auto":
|
|
2674
|
-
case "3D":
|
|
2675
|
-
return "PG3D";
|
|
2676
|
-
case "experimental-2D-LL":
|
|
2677
|
-
return "2D";
|
|
2678
|
-
default:
|
|
2679
|
-
return inputs.visualizationRequest;
|
|
2680
|
-
}
|
|
2681
|
-
}
|
|
2682
|
-
}
|
|
2683
|
-
};
|
|
2684
|
-
|
|
2685
|
-
// src/cubing/twisty/controllers/indexer/AlgDuration.ts
|
|
2686
|
-
function defaultDurationForAmount(amount) {
|
|
2687
|
-
switch (Math.abs(amount)) {
|
|
2688
|
-
case 0:
|
|
2689
|
-
return 0;
|
|
2690
|
-
case 1:
|
|
2691
|
-
return 1e3;
|
|
2692
|
-
case 2:
|
|
2693
|
-
return 1500;
|
|
2694
|
-
default:
|
|
2695
|
-
return 2e3;
|
|
2696
|
-
}
|
|
2697
|
-
}
|
|
2698
|
-
var AlgDuration = class extends TraversalUp {
|
|
2699
|
-
constructor(durationForAmount = defaultDurationForAmount) {
|
|
2700
|
-
super();
|
|
2701
|
-
this.durationForAmount = durationForAmount;
|
|
2702
|
-
}
|
|
2703
|
-
traverseAlg(alg) {
|
|
2704
|
-
let total = 0;
|
|
2705
|
-
for (const unit of alg.units()) {
|
|
2706
|
-
total += this.traverseUnit(unit);
|
|
2707
|
-
}
|
|
2708
|
-
return total;
|
|
2520
|
+
return total;
|
|
2709
2521
|
}
|
|
2710
2522
|
traverseGrouping(grouping) {
|
|
2711
2523
|
return grouping.amount * this.traverseAlg(grouping.alg);
|
|
@@ -3027,7 +2839,7 @@ var SimultaneousMoveIndexer = class {
|
|
|
3027
2839
|
}
|
|
3028
2840
|
const currentMove = {
|
|
3029
2841
|
move,
|
|
3030
|
-
direction:
|
|
2842
|
+
direction: 1 /* Forwards */,
|
|
3031
2843
|
fraction,
|
|
3032
2844
|
startTimestamp: leafWithRange.start,
|
|
3033
2845
|
endTimestamp: leafWithRange.end
|
|
@@ -3233,7 +3045,7 @@ var AlgWalker = class extends TraversalDownUp {
|
|
|
3233
3045
|
return false;
|
|
3234
3046
|
}
|
|
3235
3047
|
let i = wd.back ? alg.experimentalNumUnits() - 1 : 0;
|
|
3236
|
-
for (const unit of directedGenerator(alg.units(), wd.back ?
|
|
3048
|
+
for (const unit of directedGenerator(alg.units(), wd.back ? -1 /* Backwards */ : 1 /* Forwards */)) {
|
|
3237
3049
|
if (this.traverseUnit(unit, new WalkerDown(wd.apd.children[i], wd.back))) {
|
|
3238
3050
|
return true;
|
|
3239
3051
|
}
|
|
@@ -3464,6 +3276,40 @@ var IndexerConstructorProp = class extends TwistyPropDerived {
|
|
|
3464
3276
|
}
|
|
3465
3277
|
};
|
|
3466
3278
|
|
|
3279
|
+
// src/cubing/twisty/model/props/puzzle/state/IndexerConstructorRequestProp.ts
|
|
3280
|
+
var IndexerConstructorRequestProp = class extends SimpleTwistyPropSource {
|
|
3281
|
+
getDefaultValue() {
|
|
3282
|
+
return "auto";
|
|
3283
|
+
}
|
|
3284
|
+
};
|
|
3285
|
+
|
|
3286
|
+
// src/cubing/twisty/model/props/puzzle/state/IndexerProp.ts
|
|
3287
|
+
var IndexerProp = class extends TwistyPropDerived {
|
|
3288
|
+
derive(input) {
|
|
3289
|
+
return new input.indexerConstructor(input.kpuzzle, input.algWithIssues.alg);
|
|
3290
|
+
}
|
|
3291
|
+
};
|
|
3292
|
+
|
|
3293
|
+
// src/cubing/twisty/model/props/puzzle/state/LegacyPositionProp.ts
|
|
3294
|
+
var LegacyPositionProp = class extends TwistyPropDerived {
|
|
3295
|
+
derive(inputs) {
|
|
3296
|
+
return {
|
|
3297
|
+
state: inputs.state,
|
|
3298
|
+
movesInProgress: inputs.currentMoveInfo.currentMoves
|
|
3299
|
+
};
|
|
3300
|
+
}
|
|
3301
|
+
};
|
|
3302
|
+
|
|
3303
|
+
// src/cubing/twisty/model/props/puzzle/state/NaiveMoveCountProp.ts
|
|
3304
|
+
var NaiveMoveCountProp = class extends TwistyPropDerived {
|
|
3305
|
+
derive(inputs) {
|
|
3306
|
+
if (inputs.alg.issues.errors.length > 0) {
|
|
3307
|
+
return null;
|
|
3308
|
+
}
|
|
3309
|
+
return countMoves(inputs.alg.alg);
|
|
3310
|
+
}
|
|
3311
|
+
};
|
|
3312
|
+
|
|
3467
3313
|
// src/cubing/twisty/model/props/puzzle/state/PuzzleAlgProp.ts
|
|
3468
3314
|
var validate = true;
|
|
3469
3315
|
var PuzzleAlgProp = class extends TwistyPropDerived {
|
|
@@ -3484,48 +3330,79 @@ var PuzzleAlgProp = class extends TwistyPropDerived {
|
|
|
3484
3330
|
}
|
|
3485
3331
|
};
|
|
3486
3332
|
|
|
3487
|
-
// src/cubing/twisty/model/props/puzzle/state/
|
|
3488
|
-
var
|
|
3489
|
-
|
|
3490
|
-
return
|
|
3333
|
+
// src/cubing/twisty/model/props/puzzle/state/SetupAnchorProp.ts
|
|
3334
|
+
var SetupAnchorProp = class extends SimpleTwistyPropSource {
|
|
3335
|
+
getDefaultValue() {
|
|
3336
|
+
return "start";
|
|
3491
3337
|
}
|
|
3492
3338
|
};
|
|
3493
3339
|
|
|
3494
|
-
// src/cubing/twisty/model/props/puzzle/state/
|
|
3495
|
-
var
|
|
3496
|
-
|
|
3497
|
-
return
|
|
3340
|
+
// src/cubing/twisty/model/props/puzzle/state/SetupTransformationProp.ts
|
|
3341
|
+
var SetupTransformationProp = class extends SimpleTwistyPropSource {
|
|
3342
|
+
getDefaultValue() {
|
|
3343
|
+
return null;
|
|
3498
3344
|
}
|
|
3499
3345
|
};
|
|
3500
3346
|
|
|
3501
|
-
// src/cubing/twisty/model/props/puzzle/
|
|
3502
|
-
var
|
|
3503
|
-
derive(inputs) {
|
|
3504
|
-
|
|
3505
|
-
|
|
3506
|
-
|
|
3507
|
-
|
|
3508
|
-
|
|
3509
|
-
|
|
3510
|
-
|
|
3511
|
-
|
|
3512
|
-
|
|
3513
|
-
|
|
3347
|
+
// src/cubing/twisty/model/props/puzzle/structure/KPuzzleProp.ts
|
|
3348
|
+
var KPuzzleProp = class extends TwistyPropDerived {
|
|
3349
|
+
async derive(inputs) {
|
|
3350
|
+
return inputs.puzzleLoader.kpuzzle();
|
|
3351
|
+
}
|
|
3352
|
+
};
|
|
3353
|
+
|
|
3354
|
+
// src/cubing/twisty/model/props/puzzle/structure/PuzzleDescriptionProp.ts
|
|
3355
|
+
var PGPuzzleDescriptionStringProp = class extends SimpleTwistyPropSource {
|
|
3356
|
+
getDefaultValue() {
|
|
3357
|
+
return NO_VALUE;
|
|
3358
|
+
}
|
|
3359
|
+
};
|
|
3360
|
+
|
|
3361
|
+
// src/cubing/twisty/model/props/puzzle/structure/PuzzleIDProp.ts
|
|
3362
|
+
var PuzzleIDProp = class extends TwistyPropDerived {
|
|
3363
|
+
async derive(inputs) {
|
|
3364
|
+
return inputs.puzzleLoader.id;
|
|
3365
|
+
}
|
|
3366
|
+
};
|
|
3367
|
+
|
|
3368
|
+
// src/cubing/twisty/model/props/puzzle/structure/PuzzleIDRequestProp.ts
|
|
3369
|
+
var PuzzleIDRequestProp = class extends SimpleTwistyPropSource {
|
|
3370
|
+
getDefaultValue() {
|
|
3371
|
+
return NO_VALUE;
|
|
3372
|
+
}
|
|
3373
|
+
};
|
|
3374
|
+
|
|
3375
|
+
// src/cubing/twisty/model/props/puzzle/structure/PuzzleLoaderProp.ts
|
|
3376
|
+
var PuzzleLoaderProp = class extends TwistyPropDerived {
|
|
3377
|
+
derive(inputs) {
|
|
3378
|
+
if (inputs.puzzleIDRequest && inputs.puzzleIDRequest !== NO_VALUE) {
|
|
3379
|
+
const puzzleLoader = puzzles[inputs.puzzleIDRequest];
|
|
3380
|
+
if (!puzzleLoader) {
|
|
3381
|
+
this.userVisibleErrorTracker.set({
|
|
3382
|
+
errors: [`Invalid puzzle ID: ${inputs.puzzleIDRequest}`]
|
|
3383
|
+
});
|
|
3514
3384
|
}
|
|
3515
|
-
|
|
3516
|
-
|
|
3385
|
+
return puzzleLoader;
|
|
3386
|
+
}
|
|
3387
|
+
if (inputs.puzzleDescriptionRequest && inputs.puzzleDescriptionRequest !== NO_VALUE) {
|
|
3388
|
+
return customPGPuzzleLoader(inputs.puzzleDescriptionRequest);
|
|
3517
3389
|
}
|
|
3390
|
+
return cube3x3x3;
|
|
3518
3391
|
}
|
|
3519
3392
|
};
|
|
3520
3393
|
|
|
3521
|
-
// src/cubing/twisty/model/props/
|
|
3522
|
-
var
|
|
3394
|
+
// src/cubing/twisty/model/props/timeline/CoarseTimelineInfoProp.ts
|
|
3395
|
+
var CoarseTimelineInfoProp = class extends TwistyPropDerived {
|
|
3523
3396
|
derive(inputs) {
|
|
3524
3397
|
return {
|
|
3525
|
-
|
|
3526
|
-
|
|
3398
|
+
playing: inputs.playingInfo.playing,
|
|
3399
|
+
atStart: inputs.detailedTimelineInfo.atStart,
|
|
3400
|
+
atEnd: inputs.detailedTimelineInfo.atEnd
|
|
3527
3401
|
};
|
|
3528
3402
|
}
|
|
3403
|
+
canReuseValue(v1, v2) {
|
|
3404
|
+
return v1.playing === v2.playing && v1.atStart === v2.atStart && v1.atEnd === v2.atEnd;
|
|
3405
|
+
}
|
|
3529
3406
|
};
|
|
3530
3407
|
|
|
3531
3408
|
// src/cubing/twisty/model/props/timeline/DetailedTimelineInfoProp.ts
|
|
@@ -3574,156 +3451,161 @@ requestedTimestampToMilliseconds_fn = function(inputs) {
|
|
|
3574
3451
|
}
|
|
3575
3452
|
};
|
|
3576
3453
|
|
|
3577
|
-
// src/cubing/twisty/model/props/timeline/
|
|
3578
|
-
var
|
|
3579
|
-
|
|
3454
|
+
// src/cubing/twisty/model/props/timeline/PlayingInfoProp.ts
|
|
3455
|
+
var PlayingInfoProp = class extends TwistyPropSource {
|
|
3456
|
+
async getDefaultValue() {
|
|
3580
3457
|
return {
|
|
3581
|
-
|
|
3582
|
-
|
|
3583
|
-
|
|
3458
|
+
direction: 1 /* Forwards */,
|
|
3459
|
+
playing: false,
|
|
3460
|
+
untilBoundary: "entire-timeline" /* EntireTimeline */,
|
|
3461
|
+
loop: false
|
|
3584
3462
|
};
|
|
3585
3463
|
}
|
|
3464
|
+
async derive(newInfo, oldValuePromise) {
|
|
3465
|
+
const oldValue = await oldValuePromise;
|
|
3466
|
+
const newValue = Object.assign({}, oldValue);
|
|
3467
|
+
Object.assign(newValue, newInfo);
|
|
3468
|
+
return newValue;
|
|
3469
|
+
}
|
|
3586
3470
|
canReuseValue(v1, v2) {
|
|
3587
|
-
return v1.playing === v2.playing && v1.
|
|
3471
|
+
return v1.direction === v2.direction && v1.playing === v2.playing && v1.untilBoundary === v2.untilBoundary && v1.loop === v2.loop;
|
|
3588
3472
|
}
|
|
3589
3473
|
};
|
|
3590
3474
|
|
|
3591
|
-
// src/cubing/twisty/model/props/
|
|
3592
|
-
var
|
|
3593
|
-
|
|
3594
|
-
|
|
3595
|
-
|
|
3596
|
-
|
|
3597
|
-
|
|
3598
|
-
direction: Direction.Backwards,
|
|
3599
|
-
fraction: 1 - inputs.catchUpMove.amount,
|
|
3600
|
-
startTimestamp: -1,
|
|
3601
|
-
endTimestamp: -1
|
|
3602
|
-
});
|
|
3603
|
-
}
|
|
3604
|
-
return currentMoveInfo;
|
|
3605
|
-
}
|
|
3606
|
-
if (inputs.indexer.currentMoveInfo) {
|
|
3607
|
-
return addCatchUpMove(inputs.indexer.currentMoveInfo(inputs.detailedTimelineInfo.timestamp));
|
|
3608
|
-
} else {
|
|
3609
|
-
const idx = inputs.indexer.timestampToIndex(inputs.detailedTimelineInfo.timestamp);
|
|
3610
|
-
const currentMoveInfo = {
|
|
3611
|
-
stateIndex: idx,
|
|
3612
|
-
currentMoves: [],
|
|
3613
|
-
movesFinishing: [],
|
|
3614
|
-
movesFinished: [],
|
|
3615
|
-
movesStarting: [],
|
|
3616
|
-
latestStart: -Infinity,
|
|
3617
|
-
earliestEnd: Infinity
|
|
3618
|
-
};
|
|
3619
|
-
if (inputs.indexer.numAnimatedLeaves() > 0) {
|
|
3620
|
-
const move = inputs.indexer.getAnimLeaf(idx)?.as(Move);
|
|
3621
|
-
if (!move) {
|
|
3622
|
-
return addCatchUpMove(currentMoveInfo);
|
|
3623
|
-
}
|
|
3624
|
-
const start = inputs.indexer.indexToMoveStartTimestamp(idx);
|
|
3625
|
-
const duration = inputs.indexer.moveDuration(idx);
|
|
3626
|
-
const fraction = (inputs.detailedTimelineInfo.timestamp - start) / duration;
|
|
3627
|
-
const end = start + duration;
|
|
3628
|
-
const currentMove = {
|
|
3629
|
-
move,
|
|
3630
|
-
direction: Direction.Forwards,
|
|
3631
|
-
fraction,
|
|
3632
|
-
startTimestamp: start,
|
|
3633
|
-
endTimestamp: end
|
|
3634
|
-
};
|
|
3635
|
-
if (fraction === 0) {
|
|
3636
|
-
currentMoveInfo.movesStarting.push(currentMove);
|
|
3637
|
-
} else if (fraction === 1) {
|
|
3638
|
-
currentMoveInfo.movesFinishing.push(currentMove);
|
|
3639
|
-
} else {
|
|
3640
|
-
currentMoveInfo.currentMoves.push(currentMove);
|
|
3641
|
-
currentMoveInfo.latestStart = Math.max(currentMoveInfo.latestStart, start);
|
|
3642
|
-
currentMoveInfo.earliestEnd = Math.min(currentMoveInfo.earliestEnd, end);
|
|
3643
|
-
}
|
|
3644
|
-
}
|
|
3645
|
-
return addCatchUpMove(currentMoveInfo);
|
|
3646
|
-
}
|
|
3475
|
+
// src/cubing/twisty/model/props/timeline/TempoScaleProp.ts
|
|
3476
|
+
var TempoScaleProp = class extends TwistyPropSource {
|
|
3477
|
+
getDefaultValue() {
|
|
3478
|
+
return 1;
|
|
3479
|
+
}
|
|
3480
|
+
derive(v) {
|
|
3481
|
+
return v < 0 ? 1 : v;
|
|
3647
3482
|
}
|
|
3648
3483
|
};
|
|
3649
3484
|
|
|
3650
|
-
// src/cubing/twisty/model/props/
|
|
3651
|
-
var
|
|
3652
|
-
|
|
3653
|
-
|
|
3654
|
-
|
|
3655
|
-
|
|
3656
|
-
|
|
3657
|
-
|
|
3485
|
+
// src/cubing/twisty/model/props/timeline/TimestampRequestProp.ts
|
|
3486
|
+
var smartTimestamps = {
|
|
3487
|
+
"start": true,
|
|
3488
|
+
"end": true,
|
|
3489
|
+
"anchor": true,
|
|
3490
|
+
"opposite-anchor": true
|
|
3491
|
+
};
|
|
3492
|
+
var TimestampRequestProp = class extends SimpleTwistyPropSource {
|
|
3493
|
+
getDefaultValue() {
|
|
3494
|
+
return "opposite-anchor";
|
|
3658
3495
|
}
|
|
3659
|
-
|
|
3660
|
-
|
|
3496
|
+
set(v) {
|
|
3497
|
+
if (!this.validInput(v)) {
|
|
3498
|
+
return;
|
|
3499
|
+
}
|
|
3500
|
+
super.set(v);
|
|
3661
3501
|
}
|
|
3662
|
-
|
|
3663
|
-
|
|
3664
|
-
|
|
3665
|
-
var CurrentStateProp = class extends TwistyPropDerived {
|
|
3666
|
-
derive(inputs) {
|
|
3667
|
-
let transformation = inputs.indexer.transformationAtIndex(inputs.currentLeavesSimplified.stateIndex);
|
|
3668
|
-
transformation = inputs.anchoredStart.applyTransformation(transformation);
|
|
3669
|
-
for (const finishingMove of inputs.currentLeavesSimplified.movesFinishing) {
|
|
3670
|
-
transformation = transformation.applyMove(finishingMove);
|
|
3502
|
+
validInput(v) {
|
|
3503
|
+
if (typeof v === "number") {
|
|
3504
|
+
return true;
|
|
3671
3505
|
}
|
|
3672
|
-
|
|
3673
|
-
|
|
3506
|
+
if (smartTimestamps[v]) {
|
|
3507
|
+
return true;
|
|
3674
3508
|
}
|
|
3675
|
-
return
|
|
3509
|
+
return false;
|
|
3676
3510
|
}
|
|
3677
3511
|
};
|
|
3678
3512
|
|
|
3679
|
-
// src/cubing/twisty/model/props/
|
|
3680
|
-
var
|
|
3513
|
+
// src/cubing/twisty/model/props/viewer/BackViewProp.ts
|
|
3514
|
+
var backViewLayouts = {
|
|
3515
|
+
"none": true,
|
|
3516
|
+
"side-by-side": true,
|
|
3517
|
+
"top-right": true
|
|
3518
|
+
};
|
|
3519
|
+
var BackViewProp = class extends SimpleTwistyPropSource {
|
|
3520
|
+
getDefaultValue() {
|
|
3521
|
+
return "auto";
|
|
3522
|
+
}
|
|
3523
|
+
};
|
|
3524
|
+
|
|
3525
|
+
// src/cubing/twisty/model/props/viewer/TimeRangeProp.ts
|
|
3526
|
+
var TimeRangeProp = class extends TwistyPropDerived {
|
|
3681
3527
|
derive(inputs) {
|
|
3682
3528
|
return {
|
|
3683
|
-
|
|
3684
|
-
|
|
3529
|
+
start: 0,
|
|
3530
|
+
end: inputs.indexer.algDuration()
|
|
3685
3531
|
};
|
|
3686
3532
|
}
|
|
3687
3533
|
};
|
|
3688
3534
|
|
|
3689
|
-
// src/cubing/twisty/model/props/
|
|
3690
|
-
var
|
|
3691
|
-
|
|
3692
|
-
return
|
|
3535
|
+
// src/cubing/twisty/model/props/viewer/ViewerLinkProp.ts
|
|
3536
|
+
var ViewerLinkProp = class extends SimpleTwistyPropSource {
|
|
3537
|
+
getDefaultValue() {
|
|
3538
|
+
return "auto";
|
|
3693
3539
|
}
|
|
3694
3540
|
};
|
|
3695
3541
|
|
|
3696
|
-
// src/cubing/twisty/model/
|
|
3697
|
-
var
|
|
3698
|
-
var UserVisibleErrorTracker = class extends SimpleTwistyPropSource {
|
|
3542
|
+
// src/cubing/twisty/model/props/viewer/VisualizationProp.ts
|
|
3543
|
+
var VisualizationFormatProp = class extends SimpleTwistyPropSource {
|
|
3699
3544
|
getDefaultValue() {
|
|
3700
|
-
return
|
|
3701
|
-
}
|
|
3702
|
-
reset() {
|
|
3703
|
-
this.set(this.getDefaultValue());
|
|
3545
|
+
return "auto";
|
|
3704
3546
|
}
|
|
3705
|
-
|
|
3706
|
-
|
|
3547
|
+
};
|
|
3548
|
+
|
|
3549
|
+
// src/cubing/twisty/model/props/viewer/VisualizationStrategyProp.ts
|
|
3550
|
+
var VisualizationStrategyProp = class extends TwistyPropDerived {
|
|
3551
|
+
derive(inputs) {
|
|
3552
|
+
switch (inputs.puzzleID) {
|
|
3553
|
+
case "clock":
|
|
3554
|
+
case "square1":
|
|
3555
|
+
case "kilominx":
|
|
3556
|
+
case "redi_cube":
|
|
3557
|
+
return "2D";
|
|
3558
|
+
case "3x3x3":
|
|
3559
|
+
switch (inputs.visualizationRequest) {
|
|
3560
|
+
case "auto":
|
|
3561
|
+
case "3D":
|
|
3562
|
+
return "Cube3D";
|
|
3563
|
+
default:
|
|
3564
|
+
return inputs.visualizationRequest;
|
|
3565
|
+
}
|
|
3566
|
+
default:
|
|
3567
|
+
switch (inputs.visualizationRequest) {
|
|
3568
|
+
case "auto":
|
|
3569
|
+
case "3D":
|
|
3570
|
+
return "PG3D";
|
|
3571
|
+
case "experimental-2D-LL":
|
|
3572
|
+
return "2D";
|
|
3573
|
+
default:
|
|
3574
|
+
return inputs.visualizationRequest;
|
|
3575
|
+
}
|
|
3576
|
+
}
|
|
3707
3577
|
}
|
|
3708
3578
|
};
|
|
3709
3579
|
|
|
3710
|
-
// src/cubing/twisty/model/props/puzzle/
|
|
3711
|
-
var
|
|
3580
|
+
// src/cubing/twisty/model/props/puzzle/display/FoundationDisplayProp.ts
|
|
3581
|
+
var FoundationDisplayProp = class extends SimpleTwistyPropSource {
|
|
3712
3582
|
getDefaultValue() {
|
|
3713
|
-
return
|
|
3714
|
-
}
|
|
3715
|
-
canReuseValue(v1, v2) {
|
|
3716
|
-
return v1.move === v2.move && v1.amount === v2.amount;
|
|
3583
|
+
return "auto";
|
|
3717
3584
|
}
|
|
3718
3585
|
};
|
|
3719
3586
|
|
|
3720
|
-
// src/cubing/twisty/model/props/puzzle/
|
|
3721
|
-
var
|
|
3722
|
-
|
|
3723
|
-
|
|
3587
|
+
// src/cubing/twisty/model/props/puzzle/display/SpriteProp.ts
|
|
3588
|
+
var cachedLoader = null;
|
|
3589
|
+
async function loader() {
|
|
3590
|
+
return cachedLoader ?? (cachedLoader = new (await THREEJS).TextureLoader());
|
|
3591
|
+
}
|
|
3592
|
+
var SpriteProp = class extends TwistyPropDerived {
|
|
3593
|
+
async derive(inputs) {
|
|
3594
|
+
const { spriteURL: textureURL } = inputs;
|
|
3595
|
+
if (textureURL === null) {
|
|
3724
3596
|
return null;
|
|
3725
3597
|
}
|
|
3726
|
-
return
|
|
3598
|
+
return new Promise(async (resolve, _reject) => {
|
|
3599
|
+
const onLoadingError = () => {
|
|
3600
|
+
console.warn("Could not load sprite:", textureURL.toString());
|
|
3601
|
+
resolve(null);
|
|
3602
|
+
};
|
|
3603
|
+
try {
|
|
3604
|
+
(await loader()).load(textureURL.toString(), resolve, onLoadingError, onLoadingError);
|
|
3605
|
+
} catch (e) {
|
|
3606
|
+
onLoadingError();
|
|
3607
|
+
}
|
|
3608
|
+
});
|
|
3727
3609
|
}
|
|
3728
3610
|
};
|
|
3729
3611
|
|
|
@@ -3734,24 +3616,161 @@ var MovePressInputProp = class extends SimpleTwistyPropSource {
|
|
|
3734
3616
|
}
|
|
3735
3617
|
};
|
|
3736
3618
|
|
|
3737
|
-
// src/cubing/twisty/model/props/
|
|
3738
|
-
var
|
|
3619
|
+
// src/cubing/twisty/model/props/viewer/BackgroundProp.ts
|
|
3620
|
+
var BackgroundProp = class extends SimpleTwistyPropSource {
|
|
3739
3621
|
getDefaultValue() {
|
|
3740
3622
|
return "auto";
|
|
3741
3623
|
}
|
|
3742
3624
|
};
|
|
3743
3625
|
|
|
3744
|
-
// src/cubing/twisty/model/props/
|
|
3745
|
-
var
|
|
3626
|
+
// src/cubing/twisty/model/props/viewer/LatitudeLimit.ts
|
|
3627
|
+
var DEFAULT_LATITUDE_LIMIT = 35;
|
|
3628
|
+
var LatitudeLimitProp = class extends SimpleTwistyPropSource {
|
|
3746
3629
|
getDefaultValue() {
|
|
3747
|
-
return
|
|
3630
|
+
return DEFAULT_LATITUDE_LIMIT;
|
|
3748
3631
|
}
|
|
3749
3632
|
};
|
|
3750
3633
|
|
|
3751
|
-
// src/cubing/twisty/model/props/
|
|
3752
|
-
|
|
3634
|
+
// src/cubing/twisty/model/props/viewer/OrbitCoordinatesRequestProp.ts
|
|
3635
|
+
function orbitCoordinatesEqual(c1, c2) {
|
|
3636
|
+
return c1.latitude === c2.latitude && c1.longitude === c2.longitude && c1.distance === c2.distance;
|
|
3637
|
+
}
|
|
3638
|
+
var OrbitCoordinatesRequestProp = class extends TwistyPropSource {
|
|
3753
3639
|
getDefaultValue() {
|
|
3754
|
-
return
|
|
3640
|
+
return "auto";
|
|
3641
|
+
}
|
|
3642
|
+
canReuseValue(v1, v2) {
|
|
3643
|
+
return v1 === v2 || orbitCoordinatesEqual(v1, v2);
|
|
3644
|
+
}
|
|
3645
|
+
async derive(newCoordinates, oldValuePromise) {
|
|
3646
|
+
if (newCoordinates === "auto") {
|
|
3647
|
+
return "auto";
|
|
3648
|
+
}
|
|
3649
|
+
let oldValue = await oldValuePromise;
|
|
3650
|
+
if (oldValue === "auto") {
|
|
3651
|
+
oldValue = {};
|
|
3652
|
+
}
|
|
3653
|
+
const newValue = Object.assign({}, oldValue);
|
|
3654
|
+
Object.assign(newValue, newCoordinates);
|
|
3655
|
+
if (typeof newValue.latitude !== "undefined") {
|
|
3656
|
+
newValue.latitude = Math.min(Math.max(newValue.latitude, -90), 90);
|
|
3657
|
+
}
|
|
3658
|
+
if (typeof newValue.longitude !== "undefined") {
|
|
3659
|
+
newValue.longitude = mod(newValue.longitude, 360, 180);
|
|
3660
|
+
}
|
|
3661
|
+
return newValue;
|
|
3662
|
+
}
|
|
3663
|
+
};
|
|
3664
|
+
|
|
3665
|
+
// src/cubing/twisty/model/props/viewer/OrbitCoordinatesProp.ts
|
|
3666
|
+
var OrbitCoordinatesProp = class extends TwistyPropDerived {
|
|
3667
|
+
canReuseValue(v1, v2) {
|
|
3668
|
+
return orbitCoordinatesEqual(v1, v2);
|
|
3669
|
+
}
|
|
3670
|
+
async derive(inputs) {
|
|
3671
|
+
if (inputs.orbitCoordinatesRequest === "auto") {
|
|
3672
|
+
return defaultCameraOrbitCoordinates(inputs.puzzleID, inputs.strategy);
|
|
3673
|
+
}
|
|
3674
|
+
const req = Object.assign(Object.assign({}, defaultCameraOrbitCoordinates(inputs.puzzleID, inputs.strategy), inputs.orbitCoordinatesRequest));
|
|
3675
|
+
if (Math.abs(req.latitude) <= inputs.latitudeLimit) {
|
|
3676
|
+
return req;
|
|
3677
|
+
} else {
|
|
3678
|
+
const { latitude, longitude, distance } = req;
|
|
3679
|
+
return {
|
|
3680
|
+
latitude: inputs.latitudeLimit * Math.sign(latitude),
|
|
3681
|
+
longitude,
|
|
3682
|
+
distance
|
|
3683
|
+
};
|
|
3684
|
+
}
|
|
3685
|
+
}
|
|
3686
|
+
};
|
|
3687
|
+
var centeredCameraOrbitCoordinates = {
|
|
3688
|
+
latitude: 31.717474411461005,
|
|
3689
|
+
longitude: 0,
|
|
3690
|
+
distance: 5.877852522924731
|
|
3691
|
+
};
|
|
3692
|
+
var cubeCube3DCameraOrbitCoordinates = {
|
|
3693
|
+
latitude: 35,
|
|
3694
|
+
longitude: 30,
|
|
3695
|
+
distance: 6
|
|
3696
|
+
};
|
|
3697
|
+
var cubePG3DCameraOrbitCoordinates = {
|
|
3698
|
+
latitude: 35,
|
|
3699
|
+
longitude: 30,
|
|
3700
|
+
distance: 6.25
|
|
3701
|
+
};
|
|
3702
|
+
var megaminxCameraOrbitCoordinates = {
|
|
3703
|
+
latitude: Math.atan(1 / 2) * DEGREES_PER_RADIAN,
|
|
3704
|
+
longitude: 0,
|
|
3705
|
+
distance: 6.7
|
|
3706
|
+
};
|
|
3707
|
+
var pyraminxCameraOrbitCoordinates = {
|
|
3708
|
+
latitude: 26.56505117707799,
|
|
3709
|
+
longitude: 0,
|
|
3710
|
+
distance: 6
|
|
3711
|
+
};
|
|
3712
|
+
function defaultCameraOrbitCoordinates(puzzleID, strategy) {
|
|
3713
|
+
if (puzzleID[1] === "x") {
|
|
3714
|
+
if (strategy === "Cube3D") {
|
|
3715
|
+
return cubeCube3DCameraOrbitCoordinates;
|
|
3716
|
+
} else {
|
|
3717
|
+
return cubePG3DCameraOrbitCoordinates;
|
|
3718
|
+
}
|
|
3719
|
+
} else {
|
|
3720
|
+
switch (puzzleID) {
|
|
3721
|
+
case "megaminx":
|
|
3722
|
+
case "gigaminx":
|
|
3723
|
+
return megaminxCameraOrbitCoordinates;
|
|
3724
|
+
case "pyraminx":
|
|
3725
|
+
case "master_tetraminx":
|
|
3726
|
+
return pyraminxCameraOrbitCoordinates;
|
|
3727
|
+
case "skewb":
|
|
3728
|
+
return cubePG3DCameraOrbitCoordinates;
|
|
3729
|
+
default:
|
|
3730
|
+
return centeredCameraOrbitCoordinates;
|
|
3731
|
+
}
|
|
3732
|
+
}
|
|
3733
|
+
}
|
|
3734
|
+
|
|
3735
|
+
// src/cubing/twisty/model/TwistySceneModel.ts
|
|
3736
|
+
var TwistySceneModel = class {
|
|
3737
|
+
constructor(twistyPlayerModel) {
|
|
3738
|
+
this.twistyPlayerModel = twistyPlayerModel;
|
|
3739
|
+
this.background = new BackgroundProp();
|
|
3740
|
+
this.foundationDisplay = new FoundationDisplayProp();
|
|
3741
|
+
this.foundationStickerSpriteURL = new URLProp();
|
|
3742
|
+
this.hintFacelet = new HintFaceletProp();
|
|
3743
|
+
this.hintStickerSpriteURL = new URLProp();
|
|
3744
|
+
this.latitudeLimit = new LatitudeLimitProp();
|
|
3745
|
+
this.movePressInput = new MovePressInputProp();
|
|
3746
|
+
this.orbitCoordinatesRequest = new OrbitCoordinatesRequestProp();
|
|
3747
|
+
this.stickering = new StickeringProp();
|
|
3748
|
+
this.foundationStickerSprite = new SpriteProp({
|
|
3749
|
+
spriteURL: this.foundationStickerSpriteURL
|
|
3750
|
+
});
|
|
3751
|
+
this.hintStickerSprite = new SpriteProp({
|
|
3752
|
+
spriteURL: this.hintStickerSpriteURL
|
|
3753
|
+
});
|
|
3754
|
+
this.orbitCoordinates = new OrbitCoordinatesProp({
|
|
3755
|
+
orbitCoordinatesRequest: this.orbitCoordinatesRequest,
|
|
3756
|
+
latitudeLimit: this.latitudeLimit,
|
|
3757
|
+
puzzleID: twistyPlayerModel.puzzleID,
|
|
3758
|
+
strategy: twistyPlayerModel.visualizationStrategy
|
|
3759
|
+
});
|
|
3760
|
+
}
|
|
3761
|
+
};
|
|
3762
|
+
|
|
3763
|
+
// src/cubing/twisty/model/UserVisibleErrorTracker.ts
|
|
3764
|
+
var EMPTY_ERRORS = { errors: [] };
|
|
3765
|
+
var UserVisibleErrorTracker = class extends SimpleTwistyPropSource {
|
|
3766
|
+
getDefaultValue() {
|
|
3767
|
+
return EMPTY_ERRORS;
|
|
3768
|
+
}
|
|
3769
|
+
reset() {
|
|
3770
|
+
this.set(this.getDefaultValue());
|
|
3771
|
+
}
|
|
3772
|
+
canReuseValue(_v1, _v2) {
|
|
3773
|
+
return arrayEquals(_v1.errors, _v2.errors);
|
|
3755
3774
|
}
|
|
3756
3775
|
};
|
|
3757
3776
|
|
|
@@ -3760,25 +3779,16 @@ var TwistyPlayerModel = class {
|
|
|
3760
3779
|
constructor() {
|
|
3761
3780
|
this.userVisibleErrorTracker = new UserVisibleErrorTracker();
|
|
3762
3781
|
this.alg = new AlgProp();
|
|
3763
|
-
this.background = new BackgroundProp();
|
|
3764
3782
|
this.backView = new BackViewProp();
|
|
3765
3783
|
this.controlPanel = new ControlPanelProp();
|
|
3766
3784
|
this.catchUpMove = new CatchUpMoveProp();
|
|
3767
|
-
this.foundationDisplay = new FoundationDisplayProp();
|
|
3768
|
-
this.foundationStickerSpriteURL = new URLProp();
|
|
3769
|
-
this.hintFacelet = new HintFaceletProp();
|
|
3770
|
-
this.hintStickerSpriteURL = new URLProp();
|
|
3771
3785
|
this.indexerConstructorRequest = new IndexerConstructorRequestProp();
|
|
3772
|
-
this.latitudeLimit = new LatitudeLimitProp();
|
|
3773
|
-
this.movePressInput = new MovePressInputProp();
|
|
3774
|
-
this.orbitCoordinatesRequest = new OrbitCoordinatesRequestProp();
|
|
3775
3786
|
this.playingInfo = new PlayingInfoProp();
|
|
3776
3787
|
this.puzzleDescriptionRequest = new PGPuzzleDescriptionStringProp();
|
|
3777
3788
|
this.puzzleIDRequest = new PuzzleIDRequestProp();
|
|
3778
3789
|
this.setupAnchor = new SetupAnchorProp();
|
|
3779
3790
|
this.setupAlg = new AlgProp();
|
|
3780
3791
|
this.setupTransformation = new SetupTransformationProp();
|
|
3781
|
-
this.stickering = new StickeringProp();
|
|
3782
3792
|
this.tempoScale = new TempoScaleProp();
|
|
3783
3793
|
this.timestampRequest = new TimestampRequestProp();
|
|
3784
3794
|
this.viewerLink = new ViewerLinkProp();
|
|
@@ -3786,12 +3796,6 @@ var TwistyPlayerModel = class {
|
|
|
3786
3796
|
this.title = new ArbitraryStringProp();
|
|
3787
3797
|
this.videoURL = new URLProp();
|
|
3788
3798
|
this.competitionID = new ArbitraryStringProp();
|
|
3789
|
-
this.foundationStickerSprite = new SpriteProp({
|
|
3790
|
-
spriteURL: this.foundationStickerSpriteURL
|
|
3791
|
-
});
|
|
3792
|
-
this.hintStickerSprite = new SpriteProp({
|
|
3793
|
-
spriteURL: this.hintStickerSpriteURL
|
|
3794
|
-
});
|
|
3795
3799
|
this.puzzleLoader = new PuzzleLoaderProp({
|
|
3796
3800
|
puzzleIDRequest: this.puzzleIDRequest,
|
|
3797
3801
|
puzzleDescriptionRequest: this.puzzleDescriptionRequest
|
|
@@ -3817,12 +3821,6 @@ var TwistyPlayerModel = class {
|
|
|
3817
3821
|
indexerConstructorRequest: this.indexerConstructorRequest
|
|
3818
3822
|
});
|
|
3819
3823
|
this.moveCount = new NaiveMoveCountProp({ alg: this.puzzleAlg });
|
|
3820
|
-
this.orbitCoordinates = new OrbitCoordinatesProp({
|
|
3821
|
-
orbitCoordinatesRequest: this.orbitCoordinatesRequest,
|
|
3822
|
-
latitudeLimit: this.latitudeLimit,
|
|
3823
|
-
puzzleID: this.puzzleID,
|
|
3824
|
-
strategy: this.visualizationStrategy
|
|
3825
|
-
});
|
|
3826
3824
|
this.setupAlgTransformation = new AlgTransformationProp({
|
|
3827
3825
|
setupAlg: this.puzzleSetupAlg,
|
|
3828
3826
|
kpuzzle: this.kpuzzle
|
|
@@ -3871,6 +3869,7 @@ var TwistyPlayerModel = class {
|
|
|
3871
3869
|
currentMoveInfo: this.currentMoveInfo,
|
|
3872
3870
|
state: this.currentState
|
|
3873
3871
|
});
|
|
3872
|
+
this.twistySceneModel = new TwistySceneModel(this);
|
|
3874
3873
|
}
|
|
3875
3874
|
async twizzleLink() {
|
|
3876
3875
|
const [
|
|
@@ -3888,7 +3887,7 @@ var TwistyPlayerModel = class {
|
|
|
3888
3887
|
this.alg.get(),
|
|
3889
3888
|
this.setupAlg.get(),
|
|
3890
3889
|
this.setupAnchor.get(),
|
|
3891
|
-
this.stickering.get()
|
|
3890
|
+
this.twistySceneModel.stickering.get()
|
|
3892
3891
|
]);
|
|
3893
3892
|
const isExplorer = viewerLink === "experimental-twizzle-explorer";
|
|
3894
3893
|
console.log({ isExplorer, viewerLink });
|
|
@@ -3981,13 +3980,13 @@ var TwistyPlayerSettable = class extends ManagedCustomElement {
|
|
|
3981
3980
|
throw err("timestamp");
|
|
3982
3981
|
}
|
|
3983
3982
|
set hintFacelets(hintFaceletStyle) {
|
|
3984
|
-
this.experimentalModel.hintFacelet.set(hintFaceletStyle);
|
|
3983
|
+
this.experimentalModel.twistySceneModel.hintFacelet.set(hintFaceletStyle);
|
|
3985
3984
|
}
|
|
3986
3985
|
get hintFacelets() {
|
|
3987
3986
|
throw err("hintFacelets");
|
|
3988
3987
|
}
|
|
3989
3988
|
set experimentalStickering(stickering) {
|
|
3990
|
-
this.experimentalModel.stickering.set(stickering);
|
|
3989
|
+
this.experimentalModel.twistySceneModel.stickering.set(stickering);
|
|
3991
3990
|
}
|
|
3992
3991
|
get experimentalStickering() {
|
|
3993
3992
|
throw err("stickering");
|
|
@@ -3999,7 +3998,7 @@ var TwistyPlayerSettable = class extends ManagedCustomElement {
|
|
|
3999
3998
|
throw err("backView");
|
|
4000
3999
|
}
|
|
4001
4000
|
set background(backgroundTheme) {
|
|
4002
|
-
this.experimentalModel.background.set(backgroundTheme);
|
|
4001
|
+
this.experimentalModel.twistySceneModel.background.set(backgroundTheme);
|
|
4003
4002
|
}
|
|
4004
4003
|
get background() {
|
|
4005
4004
|
throw err("background");
|
|
@@ -4041,31 +4040,31 @@ var TwistyPlayerSettable = class extends ManagedCustomElement {
|
|
|
4041
4040
|
throw err("viewerLink");
|
|
4042
4041
|
}
|
|
4043
4042
|
set experimentalMovePressInput(movePressInput) {
|
|
4044
|
-
this.experimentalModel.movePressInput.set(movePressInput);
|
|
4043
|
+
this.experimentalModel.twistySceneModel.movePressInput.set(movePressInput);
|
|
4045
4044
|
}
|
|
4046
4045
|
get experimentalMovePressInput() {
|
|
4047
4046
|
throw err("experimentalMovePressInput");
|
|
4048
4047
|
}
|
|
4049
4048
|
set cameraLatitude(latitude) {
|
|
4050
|
-
this.experimentalModel.orbitCoordinatesRequest.set({ latitude });
|
|
4049
|
+
this.experimentalModel.twistySceneModel.orbitCoordinatesRequest.set({ latitude });
|
|
4051
4050
|
}
|
|
4052
4051
|
get cameraLatitude() {
|
|
4053
4052
|
throw err("cameraLatitude");
|
|
4054
4053
|
}
|
|
4055
4054
|
set cameraLongitude(longitude) {
|
|
4056
|
-
this.experimentalModel.orbitCoordinatesRequest.set({ longitude });
|
|
4055
|
+
this.experimentalModel.twistySceneModel.orbitCoordinatesRequest.set({ longitude });
|
|
4057
4056
|
}
|
|
4058
4057
|
get cameraLongitude() {
|
|
4059
4058
|
throw err("cameraLongitude");
|
|
4060
4059
|
}
|
|
4061
4060
|
set cameraDistance(distance) {
|
|
4062
|
-
this.experimentalModel.orbitCoordinatesRequest.set({ distance });
|
|
4061
|
+
this.experimentalModel.twistySceneModel.orbitCoordinatesRequest.set({ distance });
|
|
4063
4062
|
}
|
|
4064
4063
|
get cameraDistance() {
|
|
4065
4064
|
throw err("cameraDistance");
|
|
4066
4065
|
}
|
|
4067
4066
|
set cameraLatitudeLimit(latitudeLimit) {
|
|
4068
|
-
this.experimentalModel.latitudeLimit.set(latitudeLimit);
|
|
4067
|
+
this.experimentalModel.twistySceneModel.latitudeLimit.set(latitudeLimit);
|
|
4069
4068
|
}
|
|
4070
4069
|
get cameraLatitudeLimit() {
|
|
4071
4070
|
throw err("cameraLatitudeLimit");
|
|
@@ -4083,13 +4082,13 @@ var TwistyPlayerSettable = class extends ManagedCustomElement {
|
|
|
4083
4082
|
throw err("tempoScale");
|
|
4084
4083
|
}
|
|
4085
4084
|
set experimentalSprite(url) {
|
|
4086
|
-
this.experimentalModel.foundationStickerSpriteURL.set(url);
|
|
4085
|
+
this.experimentalModel.twistySceneModel.foundationStickerSpriteURL.set(url);
|
|
4087
4086
|
}
|
|
4088
4087
|
get experimentalSprite() {
|
|
4089
4088
|
throw err("experimentalSprite");
|
|
4090
4089
|
}
|
|
4091
4090
|
set experimentalHintSprite(url) {
|
|
4092
|
-
this.experimentalModel.hintStickerSpriteURL.set(url);
|
|
4091
|
+
this.experimentalModel.twistySceneModel.hintStickerSpriteURL.set(url);
|
|
4093
4092
|
}
|
|
4094
4093
|
get experimentalHintSprite() {
|
|
4095
4094
|
throw err("experimentalHintSprite");
|
|
@@ -4183,7 +4182,7 @@ var TwistyPlayer = class extends TwistyPlayerSettable {
|
|
|
4183
4182
|
this.contentWrapper.appendChild(scrubber);
|
|
4184
4183
|
this.buttons = new TwistyButtons(this.experimentalModel, this.controller, this);
|
|
4185
4184
|
this.contentWrapper.appendChild(this.buttons);
|
|
4186
|
-
this.experimentalModel.background.addFreshListener((backgroundTheme) => {
|
|
4185
|
+
this.experimentalModel.twistySceneModel.background.addFreshListener((backgroundTheme) => {
|
|
4187
4186
|
this.contentWrapper.classList.toggle("checkered", backgroundTheme !== "none");
|
|
4188
4187
|
});
|
|
4189
4188
|
this.experimentalModel.controlPanel.addFreshListener((controlPanel) => {
|
|
@@ -4282,7 +4281,7 @@ setVisualizationWrapper_fn = function(strategy) {
|
|
|
4282
4281
|
switch (strategy) {
|
|
4283
4282
|
case "2D":
|
|
4284
4283
|
case "experimental-2D-LL":
|
|
4285
|
-
newWrapper = new Twisty2DSceneWrapper(this.experimentalModel, strategy);
|
|
4284
|
+
newWrapper = new Twisty2DSceneWrapper(this.experimentalModel.twistySceneModel, strategy);
|
|
4286
4285
|
break;
|
|
4287
4286
|
case "Cube3D":
|
|
4288
4287
|
case "PG3D":
|
|
@@ -4365,7 +4364,7 @@ var TwistyAlgWrapperElem = class extends HTMLElementShim {
|
|
|
4365
4364
|
this.queue.push(dataUp.element);
|
|
4366
4365
|
return dataUp.moveCount;
|
|
4367
4366
|
}
|
|
4368
|
-
flushQueue(direction =
|
|
4367
|
+
flushQueue(direction = 1 /* Forwards */) {
|
|
4369
4368
|
for (const node of maybeReverseList(this.queue, direction)) {
|
|
4370
4369
|
this.append(node);
|
|
4371
4370
|
}
|
|
@@ -4377,13 +4376,13 @@ var TwistyAlgWrapperElem = class extends HTMLElementShim {
|
|
|
4377
4376
|
};
|
|
4378
4377
|
customElementsShim.define("twisty-alg-wrapper-elem", TwistyAlgWrapperElem);
|
|
4379
4378
|
function oppositeDirection(direction) {
|
|
4380
|
-
return direction ===
|
|
4379
|
+
return direction === 1 /* Forwards */ ? -1 /* Backwards */ : 1 /* Forwards */;
|
|
4381
4380
|
}
|
|
4382
4381
|
function updateDirectionByAmount(currentDirection, amount) {
|
|
4383
4382
|
return amount < 0 ? oppositeDirection(currentDirection) : currentDirection;
|
|
4384
4383
|
}
|
|
4385
4384
|
function maybeReverseList(l, direction) {
|
|
4386
|
-
if (direction ===
|
|
4385
|
+
if (direction === 1 /* Forwards */) {
|
|
4387
4386
|
return l;
|
|
4388
4387
|
}
|
|
4389
4388
|
const copy = Array.from(l);
|
|
@@ -4523,7 +4522,7 @@ var algToDOMTreeInstance = new AlgToDOMTree();
|
|
|
4523
4522
|
var algToDOMTree = algToDOMTreeInstance.traverseAlg.bind(algToDOMTreeInstance);
|
|
4524
4523
|
var MoveHighlighter = class {
|
|
4525
4524
|
constructor() {
|
|
4526
|
-
this.moveCharIndexMap = new Map();
|
|
4525
|
+
this.moveCharIndexMap = /* @__PURE__ */ new Map();
|
|
4527
4526
|
this.currentElem = null;
|
|
4528
4527
|
}
|
|
4529
4528
|
addMove(charIndex, elem) {
|
|
@@ -4559,7 +4558,7 @@ var TwistyAlgViewer = class extends HTMLElementShim {
|
|
|
4559
4558
|
__privateSet(this, _domTree, algToDOMTree(alg, {
|
|
4560
4559
|
earliestMoveIndex: 0,
|
|
4561
4560
|
twistyAlgViewer: this,
|
|
4562
|
-
direction:
|
|
4561
|
+
direction: 1 /* Forwards */
|
|
4563
4562
|
}).element);
|
|
4564
4563
|
this.textContent = "";
|
|
4565
4564
|
this.appendChild(__privateGet(this, _domTree));
|
|
@@ -5161,7 +5160,7 @@ var URLParamUpdater = class {
|
|
|
5161
5160
|
__privateSet(this, _prefix, options?.prefix ?? "");
|
|
5162
5161
|
this.listenToAlgProp(model.alg, "alg");
|
|
5163
5162
|
this.listenToAlgProp(model.setupAlg, "setup-alg");
|
|
5164
|
-
this.listenToStringSourceProp(model.stickering, "stickering");
|
|
5163
|
+
this.listenToStringSourceProp(model.twistySceneModel.stickering, "stickering");
|
|
5165
5164
|
this.listenToStringSourceProp(model.setupAnchor, "setup-anchor");
|
|
5166
5165
|
this.listenToStringOrNoValueProp(model.puzzleIDRequest, "puzzle", NO_VALUE);
|
|
5167
5166
|
this.listenToStringOrNoValueProp(model.puzzleDescriptionRequest, "puzzle-description", NO_VALUE);
|