kipphi 2.1.3 → 2.1.4-beta.1
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/event.ts +1 -0
- package/index.d.ts +2 -1
- package/index.js +12 -1
- package/package.json +1 -1
- package/time.ts +10 -0
- package/version.ts +1 -1
package/event.ts
CHANGED
|
@@ -518,6 +518,7 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
|
|
|
518
518
|
*/
|
|
519
519
|
static fromRPEJSON<T extends EventType, VT extends EventValueESType = number>(type: T, data: EventDataRPELike<VT>[], chart: Chart, pos: string, endValue?: number) {
|
|
520
520
|
const {templateEasingLib: templates} = chart
|
|
521
|
+
data.sort((a, b) => TC.cmp(a.startTime, b.startTime));
|
|
521
522
|
const length = data.length;
|
|
522
523
|
// const isSpeed = type === EventType.Speed;
|
|
523
524
|
// console.log(isSpeed)
|
package/index.d.ts
CHANGED
|
@@ -553,7 +553,7 @@ declare module "chartTypes" {
|
|
|
553
553
|
export type ExtendedEventTypeName = "scaleX" | "scaleY" | "text" | "color";
|
|
554
554
|
}
|
|
555
555
|
declare module "version" {
|
|
556
|
-
export const VERSION =
|
|
556
|
+
export const VERSION = 214;
|
|
557
557
|
export const SCHEMA = "https://cdn.jsdelivr.net/npm/kipphi@2.1.0/chartType2.schema.json";
|
|
558
558
|
}
|
|
559
559
|
declare module "util" {
|
|
@@ -2288,6 +2288,7 @@ declare module "time" {
|
|
|
2288
2288
|
static gt(beaT1: TimeT, beaT2: TimeT): boolean;
|
|
2289
2289
|
/** @returns beaT1 < beaT2 */
|
|
2290
2290
|
static lt(beaT1: TimeT, beaT2: TimeT): boolean;
|
|
2291
|
+
static cmp(beaT1: TimeT, beaT2: TimeT): number;
|
|
2291
2292
|
/** @returns beaT1 != beaT2 */
|
|
2292
2293
|
static ne(beaT1: TimeT, beaT2: TimeT): boolean;
|
|
2293
2294
|
/**
|
package/index.js
CHANGED
|
@@ -250,6 +250,16 @@ class TC2 {
|
|
|
250
250
|
static lt(beaT1, beaT2) {
|
|
251
251
|
return beaT1[0] < beaT2[0] || beaT1[0] === beaT2[0] && beaT1[1] * beaT2[2] < beaT1[2] * beaT2[1];
|
|
252
252
|
}
|
|
253
|
+
static cmp(beaT1, beaT2) {
|
|
254
|
+
if (beaT1[0] > beaT2[0]) {
|
|
255
|
+
return 1;
|
|
256
|
+
} else if (beaT1[0] < beaT2[0]) {
|
|
257
|
+
return -1;
|
|
258
|
+
} else {
|
|
259
|
+
return beaT1[1] * beaT2[2] > beaT1[2] * beaT2[1] ? 1 : -1;
|
|
260
|
+
}
|
|
261
|
+
return 0;
|
|
262
|
+
}
|
|
253
263
|
static ne(beaT1, beaT2) {
|
|
254
264
|
return beaT1[0] !== beaT2[0] || beaT1[1] * beaT2[2] !== beaT1[2] * beaT2[1];
|
|
255
265
|
}
|
|
@@ -1756,6 +1766,7 @@ class EventNodeSequence {
|
|
|
1756
1766
|
}
|
|
1757
1767
|
static fromRPEJSON(type, data, chart, pos, endValue) {
|
|
1758
1768
|
const { templateEasingLib: templates } = chart;
|
|
1769
|
+
data.sort((a, b) => TC2.cmp(a.startTime, b.startTime));
|
|
1759
1770
|
const length = data.length;
|
|
1760
1771
|
const seq = new EventNodeSequence(type, type === 5 /* easing */ ? TC2.toBeats(data[length - 1].endTime) : chart.effectiveBeats);
|
|
1761
1772
|
let listLength = length;
|
|
@@ -3379,7 +3390,7 @@ class TimeCalculator {
|
|
|
3379
3390
|
}
|
|
3380
3391
|
}
|
|
3381
3392
|
// src/version.ts
|
|
3382
|
-
var VERSION =
|
|
3393
|
+
var VERSION = 214;
|
|
3383
3394
|
var SCHEMA = "https://cdn.jsdelivr.net/npm/kipphi@2.1.0/chartType2.schema.json";
|
|
3384
3395
|
|
|
3385
3396
|
// src/chart.ts
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kipphi",
|
|
3
3
|
"description": "Parse your Phigros Chart(.rpe.json or .kpa.json) into an editor-friendly format.",
|
|
4
|
-
"version": "2.1.
|
|
4
|
+
"version": "2.1.4-beta.1",
|
|
5
5
|
"author": "Team Zincs (https://github.com/TeamZincs)",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|
package/time.ts
CHANGED
|
@@ -25,6 +25,16 @@ export default class TC {
|
|
|
25
25
|
static lt(beaT1:TimeT, beaT2: TimeT): boolean {
|
|
26
26
|
return beaT1[0] < beaT2[0] || beaT1[0] === beaT2[0] && beaT1[1] * beaT2[2] < beaT1[2] * beaT2[1]
|
|
27
27
|
}
|
|
28
|
+
static cmp(beaT1: TimeT, beaT2: TimeT): number {
|
|
29
|
+
if (beaT1[0] > beaT2[0]) {
|
|
30
|
+
return 1;
|
|
31
|
+
} else if (beaT1[0] < beaT2[0]) {
|
|
32
|
+
return -1;
|
|
33
|
+
} else {
|
|
34
|
+
return beaT1[1] * beaT2[2] > beaT1[2] * beaT2[1] ? 1 : -1;
|
|
35
|
+
}
|
|
36
|
+
return 0;
|
|
37
|
+
}
|
|
28
38
|
/** @returns beaT1 != beaT2 */
|
|
29
39
|
static ne(beaT1:TimeT, beaT2: TimeT): boolean {
|
|
30
40
|
return beaT1[0] !== beaT2[0] || beaT1[1] * beaT2[2] !== beaT1[2] * beaT2[1]
|