sonolus-next-rush-engine 2.19.1 → 2.19.2-alpha

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.
Binary file
Binary file
@@ -290,6 +290,8 @@ export const extendedToLevelData = (data, offset = 0) => {
290
290
  const timescaleGroupsByName = new Map();
291
291
  const timescaleChangesByIndex = new Map();
292
292
  const timescaleChangesByName = new Map();
293
+ const unorderedChangeBeats = new Set();
294
+ const ascendingScaledTimes = new Set();
293
295
  for (const { idx, e } of ext.getByArch('TimeScaleGroup')) {
294
296
  const group = new EntityBuilder('#TIMESCALE_GROUP');
295
297
  finalEntities.push(group);
@@ -330,14 +332,23 @@ export const extendedToLevelData = (data, offset = 0) => {
330
332
  }
331
333
  finalEntities.push(...changes);
332
334
  changeInfos.sort((a, b) => a.beat - b.beat);
335
+ let ascending = true;
333
336
  for (let i = 0; i < changeInfos.length; i++) {
334
- changeInfos[i].time = beatToTime(changeInfos[i].beat);
335
- changeInfos[i].scaledTime =
337
+ const change = changeInfos[i];
338
+ if (Number.isNaN(change.beat))
339
+ unorderedChangeBeats.add(changeInfos);
340
+ change.time = beatToTime(change.beat);
341
+ change.scaledTime =
336
342
  i === 0
337
- ? changeInfos[i].time
343
+ ? change.time
338
344
  : changeInfos[i - 1].scaledTime +
339
- (changeInfos[i].time - changeInfos[i - 1].time) * changeInfos[i - 1].timeScale;
345
+ (change.time - changeInfos[i - 1].time) * changeInfos[i - 1].timeScale;
346
+ ascending &&=
347
+ Number.isFinite(change.scaledTime) &&
348
+ (i === 0 || changeInfos[i - 1].scaledTime <= change.scaledTime);
340
349
  }
350
+ if (ascending)
351
+ ascendingScaledTimes.add(changeInfos);
341
352
  timescaleChangesByIndex.set(idx, changeInfos);
342
353
  if (e.name)
343
354
  timescaleChangesByName.set(e.name, changeInfos);
@@ -369,7 +380,20 @@ export const extendedToLevelData = (data, offset = 0) => {
369
380
  return scaledTime;
370
381
  if (scaledTime < changes[0].time)
371
382
  return scaledTime;
372
- for (let i = 0; i < changes.length; i++) {
383
+ let first = 0;
384
+ if (ascendingScaledTimes.has(changes) && !Number.isNaN(scaledTime)) {
385
+ let lo = 1;
386
+ let hi = changes.length;
387
+ while (lo < hi) {
388
+ const mid = (lo + hi) >> 1;
389
+ if (changes[mid].scaledTime < scaledTime)
390
+ lo = mid + 1;
391
+ else
392
+ hi = mid;
393
+ }
394
+ first = lo - 1;
395
+ }
396
+ for (let i = first; i < changes.length; i++) {
373
397
  const start = changes[i];
374
398
  if (i === changes.length - 1) {
375
399
  if (start.timeScale === 0)
@@ -470,13 +494,23 @@ export const extendedToLevelData = (data, offset = 0) => {
470
494
  const tailTsgRef = getField(tailOriginal, 'timeScaleGroup');
471
495
  const headChanges = getTSGChanges(headTsgRef);
472
496
  const tailChanges = getTSGChanges(tailTsgRef);
473
- const splitBeats = headChanges
474
- .filter((change) => {
475
- if (!(headBeat + 1e-6 < change.beat && change.beat < tailBeat - 1e-6))
476
- return false;
477
- return !nearlyEqual(change.timeScale, getTimeScaleAt(headChanges, change.beat));
478
- })
479
- .map(({ beat }) => beat);
497
+ const minBeat = headBeat + 1e-6;
498
+ const maxBeat = tailBeat - 1e-6;
499
+ if (!(minBeat < maxBeat))
500
+ return [];
501
+ const ordered = !unorderedChangeBeats.has(headChanges);
502
+ const first = ordered ? lastIndexLeq(headChanges, minBeat, (change) => change.beat) + 1 : 0;
503
+ const splitBeats = [];
504
+ for (let i = first; i < headChanges.length; i++) {
505
+ const change = headChanges[i];
506
+ if (ordered && change.beat >= maxBeat)
507
+ break;
508
+ if (minBeat < change.beat &&
509
+ change.beat < maxBeat &&
510
+ !nearlyEqual(change.timeScale, getTimeScaleAt(headChanges, change.beat))) {
511
+ splitBeats.push(change.beat);
512
+ }
513
+ }
480
514
  if (splitBeats.length === 0)
481
515
  return [];
482
516
  const headScaledTime = timeToScaledTime(beatToTime(headBeat), headChanges);
@@ -493,7 +527,7 @@ export const extendedToLevelData = (data, offset = 0) => {
493
527
  }
494
528
  }
495
529
  }
496
- const uniqueSplitBeats = [...splitBeats]
530
+ const uniqueSplitBeats = splitBeats
497
531
  .sort((a, b) => a - b)
498
532
  .filter((beat, i, beats) => i === 0 || !nearlyEqual(beat, beats[i - 1]));
499
533
  const headLane = getNum(headOriginal, 'lane');
package/dist/index.d.ts CHANGED
@@ -10,7 +10,7 @@ import { USC } from './usc/index.js';
10
10
  export * from './usc/index.js';
11
11
  export { type ExtendedEntityData, type ExtendedEntityDataField, bandoriToLeveldata, extendedToLevelData, hldToLeveldata, mmwsToUSC, siriusToLeveldata, susToUSC, ucmmwsToLevelData, uscToLevelData, };
12
12
  export declare const convertToLevelData: (input: string | Uint8Array | USC | LevelData, offset?: number) => LevelData;
13
- export declare const version = "2.19.1";
13
+ export declare const version = "2.19.2-alpha";
14
14
  export declare const engineFullName: {
15
15
  readonly en: 'Next RUSH';
16
16
  };
package/dist/index.js CHANGED
@@ -90,7 +90,7 @@ export const convertToLevelData = (input, offset = 0) => {
90
90
  }
91
91
  return uscToLevelData(usc, offset, true, true);
92
92
  };
93
- export const version = '2.19.1';
93
+ export const version = '2.19.2-alpha';
94
94
  export const engineFullName = {
95
95
  en: 'Next RUSH',
96
96
  };
@@ -108,13 +108,16 @@ export const siriusToLeveldata = (sirius, offset = 0) => {
108
108
  };
109
109
  for (const source of sirius.entities) {
110
110
  let archetype = startArchetypes.get(source.archetype);
111
- if (archetype) {
111
+ if (archetype && !notes.has(source)) {
112
112
  const key = geometryKey(source);
113
- const atLane = starts.get(key) ?? [];
114
- atLane.push(source);
113
+ const beat = getValue(source, 'beat');
114
+ const atLane = starts.get(key) ?? new Map();
115
+ const atBeat = atLane.get(beat) ?? [];
116
+ atBeat.push(source);
117
+ atLane.set(beat, atBeat);
115
118
  starts.set(key, atLane);
116
119
  }
117
- else {
120
+ if (!archetype) {
118
121
  switch (source.archetype) {
119
122
  case 'Sirius Normal Note':
120
123
  archetype = 'NormalTapNote';
@@ -154,10 +157,42 @@ export const siriusToLeveldata = (sirius, offset = 0) => {
154
157
  addSimNote(source, note);
155
158
  }
156
159
  }
160
+ for (const atLane of starts.values()) {
161
+ for (const atBeat of atLane.values())
162
+ atBeat.reverse();
163
+ }
164
+ const unorderedMidpoints = new Set();
157
165
  for (const atLane of midpoints.values()) {
158
166
  atLane.sort((a, b) => getValue(a, 'beat') - getValue(b, 'beat'));
167
+ if (atLane.some((point) => Number.isNaN(getValue(point, 'beat')))) {
168
+ unorderedMidpoints.add(atLane);
169
+ }
170
+ }
171
+ function getHoldMidpoints(key, startBeat, endBeat) {
172
+ const points = midpoints.get(key);
173
+ if (!points || !(startBeat < endBeat))
174
+ return [];
175
+ if (unorderedMidpoints.has(points)) {
176
+ return points.filter((note) => {
177
+ const beat = getValue(note, 'beat');
178
+ return startBeat < beat && beat < endBeat;
179
+ });
180
+ }
181
+ let first = 0;
182
+ let last = points.length;
183
+ while (first < last) {
184
+ const mid = (first + last) >> 1;
185
+ if (getValue(points[mid], 'beat') <= startBeat)
186
+ first = mid + 1;
187
+ else
188
+ last = mid;
189
+ }
190
+ const result = [];
191
+ for (let i = first; i < points.length && getValue(points[i], 'beat') < endBeat; i++) {
192
+ result.push(points[i]);
193
+ }
194
+ return result;
159
195
  }
160
- const usedStarts = new Set();
161
196
  const previousHolds = new Map();
162
197
  const ends = sirius.entities
163
198
  .filter((entity) => endArchetypes.has(entity.archetype))
@@ -172,10 +207,11 @@ export const siriusToLeveldata = (sirius, offset = 0) => {
172
207
  continue;
173
208
  }
174
209
  const key = geometryKey(source);
175
- const startSource = starts
176
- .get(key)
177
- ?.find((note) => !usedStarts.has(note) && getValue(note, 'beat') === startBeat);
178
- const points = (midpoints.get(key) ?? []).filter((note) => getValue(note, 'beat') > startBeat && getValue(note, 'beat') < endBeat);
210
+ const startCandidates = Number.isNaN(startBeat)
211
+ ? undefined
212
+ : starts.get(key)?.get(startBeat);
213
+ const startSource = startCandidates?.pop();
214
+ const points = getHoldMidpoints(key, startBeat, endBeat);
179
215
  const previous = previousHolds.get(key);
180
216
  const critical = startSource
181
217
  ? startSource.archetype.includes('Critical')
@@ -188,8 +224,6 @@ export const siriusToLeveldata = (sirius, offset = 0) => {
188
224
  const head = startSource
189
225
  ? notes.get(startSource)
190
226
  : createNote('AnchorNote', source, startBeat, false);
191
- if (startSource)
192
- usedStarts.add(startSource);
193
227
  setValue(head, 'segmentKind', critical ? 2 : 1);
194
228
  // Scratch tails can extend beyond the hold body. Keep an unscored body
195
229
  // endpoint so the connector stays at the original lane and width.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sonolus-next-rush-engine",
3
- "version": "2.19.1",
3
+ "version": "2.19.2-alpha",
4
4
  "description": "Perspective-lane rhythm game for Sonolus",
5
5
  "author": "Hyeon2",
6
6
  "repository": {