kipphi 2.0.0 → 2.1.0

package/chartTypes.ts

@@ -177,7 +177,8 @@ export enum EasingType {
     normal,
     template,
     bezier,
-    segmented
+    segmented,
+    wrapper
 }
 
 export interface NormalEasingData {
@@ -190,6 +191,11 @@ export interface TemplateEasingData {
     type: EasingType.template;
 }
 
+export interface WrapperEasingData {
+    type: EasingType.wrapper;
+    identifier: string;
+}
+
 export interface BezierEasingData {
     type: EasingType.bezier;
     bezier: [number, number, number, number];
@@ -202,11 +208,12 @@ export interface SegmentedEasingData {
     inner: EasingDataKPA2;
 }
 
-export type EasingDataKPA2 = NormalEasingData | TemplateEasingData | BezierEasingData | SegmentedEasingData;
+export type EasingDataKPA2 = NormalEasingData | TemplateEasingData | BezierEasingData | SegmentedEasingData | WrapperEasingData;
 
 export enum EvaluatorType {
     eased,
-    expressionbased
+    expressionbased,
+    macro
 }
 
 // Eased
@@ -219,7 +226,6 @@ interface EasedEvaluatorDataKPA2<T> {
 export type NumericEasedEvaluatorKPA2 = EasedEvaluatorDataKPA2<number>;
 export type ColorEasedEvaluatorKPA2 = EasedEvaluatorDataKPA2<RGB>;
 export interface TextEasedEvaluatorKPA2 extends EasedEvaluatorDataKPA2<string> {
-    font: string;
     interpretedAs: InterpreteAs;
 }
 
@@ -232,14 +238,53 @@ export interface ExpressionEvaluatorDataKPA2 {
     jsExpr: string;
 }
 
+export interface MacroEvaluatorDataKPA2 {
+    type: EvaluatorType.macro;
+    name: string;
+    compiled: string;
+}
+
+
+export type EvaluatorDataKPA2<T> = EasedEvaluatorDataOfType<T> | ExpressionEvaluatorDataKPA2 | MacroEvaluatorDataKPA2;
+
+export type MacroData = [id: string, proto: number] | string;
+export type MacroLink = [macroTypeAndId: `${'value' | 'time'}:${string}`, nodeId: number]
 
-export type EvaluatorDataKPA2<T> = EasedEvaluatorDataOfType<T> | ExpressionEvaluatorDataKPA2;
 export interface EventDataKPA2<T = number> {
+    /** 开始时间 */
     startTime: TimeT;
+    /** 结束时间 */
     endTime: TimeT;
+    /** 起始值 */
     start: T;
+    /** 终值 */
     end: T;
+    /** 求值器 */
     evaluator: EvaluatorDataKPA2<T>;
+    /** 终值绑定的宏的ID */
+    macroEnd?: MacroData;
+    /** 起始值绑定的宏的ID */
+    macroStart?: MacroData;
+    /** 起始时间绑定的宏的ID */
+    macroStartTime?: MacroData;
+    /** 将该事件的起始节点关联到一个宏的某个参数 */
+    startLinkedMacro?: MacroLink[];
+    endLinkedMacro?: MacroLink[];
+}
+
+export interface FinalEventStartNodeDataKPA2<T = number> {
+    /** 开始时间 */
+    startTime: TimeT;
+    /** 起始值 */
+    start: T;
+    /** 求值器 */
+    evaluator: EvaluatorDataKPA2<T>;
+    /** 起始值绑定的宏的ID */
+    macro?: MacroData;
+    /** 起始时间绑定的宏的ID */
+    macroTime?: MacroData;
+    /** 将该事件的起始节点关联到一个宏的某个参数 */
+    linkedMacro?: MacroLink[];
 }
 
 export enum EventValueType {
@@ -309,12 +354,12 @@ export interface JudgeLineDataRPE {
     eventLayers: (EventLayerDataRPE | null)[];
     /** 扩展事件 */
     extended?: {
-        colorEvents: EventDataRPELike<RGB>[];
-        inclineEvents: EventDataRPELike[];
-        scaleXEvents: EventDataRPELike[];
-        scaleYEvents: EventDataRPELike[];
-        textEvents: EventDataRPELike<string>[];
-        gifEvents: EventDataRPELike<number>[];
+        colorEvents?: EventDataRPELike<RGB>[];
+        inclineEvents?: EventDataRPELike[];
+        scaleXEvents?: EventDataRPELike[];
+        scaleYEvents?: EventDataRPELike[];
+        textEvents?: EventDataRPELike<string>[];
+        gifEvents?: EventDataRPELike<number>[];
     };
     /** 父线线号，没有父线则为-1 */
     father: number;
@@ -355,19 +400,17 @@ export interface JudgeLineDataRPE {
     zIndex?: number;
 }
 
-export interface JudgeLineDataRPEExtended extends JudgeLineDataRPE {
-    _id?: number;
-    children: number[]
-}
 
-export interface CustomEasingData {
+
+export interface TemplateEasingBodyData {
     content: string;
     name: string;
-    usedBy: string[];
-    dependencies: string[];
+    // usedBy: string[];
+    // dependencies: string[];
 }
 
 
+
 // 使用对应标识符来标记事件节点序列
 
 export interface EventLayerDataKPA {
@@ -378,6 +421,14 @@ export interface EventLayerDataKPA {
     speed: string;
 }
 
+export interface EventLayerDataKPA2 {
+    moveX: string;
+    moveY: string;
+    rotate: string;
+    alpha: string;
+    // 移除了速度事件可以有多层的性质
+}
+
 
 export interface NoteNodeDataKPA {
     notes: NoteDataKPA[];
@@ -412,6 +463,28 @@ export interface JudgeLineDataKPA {
     zOrder: number;
 }
 
+export interface JudgeLineDataKPA2 {
+    cover: boolean;
+    id: number;
+    group: number;
+    nnLists: {[k: string]: NNListDataKPA};
+    hnLists: {[k: string]: NNListDataKPA};
+    name: string;
+    texture: string;
+    eventLayers: EventLayerDataKPA2[];
+    speedEventNodeSeq: string;
+    children: JudgeLineDataKPA2[];
+    rotatesWithFather: boolean;
+
+    anchor: [number, number];
+    extended?: {
+        scaleXEvents: string;
+        scaleYEvents: string;
+        textEvents?: string;
+        colorEvents?: string;
+    }
+    zOrder: number;
+}
 
 
 export interface EventNodeSequenceDataKPA<VT> {
@@ -425,9 +498,31 @@ export interface EventNodeSequenceDataKPA2<VT> {
     events: EventDataKPA2<VT>[];
     id: string;
     type: EventType;
-    endValue: VT;
+    final: FinalEventStartNodeDataKPA2<VT>;
+}
+
+export interface WrapperEasingBodyData {
+    jsExpr: string;
+    start: number;
+    end: number;
+    id: string;
 }
 
+export interface MacroEvaluatorBodyData {
+    macro: string;
+    id: string;
+}
+
+export interface MacroTimeBodyData {
+    id: string;
+    macro: string;
+    parametric?: boolean;
+}
+export interface MacroValueBodyData {
+    id: string;
+    macro: string;
+    parametric?: boolean;
+}
 export interface ChartDataKPA {
     version: number;
     offset: number;
@@ -448,7 +543,7 @@ export interface ChartDataKPA {
         name: number;
         level: number;
     }
-    envEasings: CustomEasingData[]; // New!
+    envEasings: TemplateEasingBodyData[]; // New!
     eventNodeSequences: EventNodeSequenceDataKPA<any>[];
     orphanLines: JudgeLineDataKPA[];
     bpmList: BPMSegmentData[];
@@ -459,6 +554,7 @@ export interface ChartDataKPA {
 
 export interface ChartDataKPA2 {
     version: number;
+    $schema: string;
     offset: number;
     duration: number;
     info: {
@@ -469,17 +565,21 @@ export interface ChartDataKPA2 {
         composer: string;
     };
     ui: {
-        pause: number;
-        combonumber: number;
-        combo: number;
-        score: number;
-        bar: number;
-        name: number;
-        level: number;
+        pause?: number;
+        combonumber?: number;
+        combo?: number;
+        score?: number;
+        bar?: number;
+        name?: number;
+        level?: number;
     }
-    envEasings: CustomEasingData[];
-    eventNodeSequences: EventNodeSequenceDataKPA2<any>[];
-    orphanLines: JudgeLineDataKPA[];
+    templateEasings: TemplateEasingBodyData[];
+    wrapperEasings: WrapperEasingBodyData[];
+    macroEvaluators: MacroEvaluatorBodyData[];
+    timeMacros: MacroTimeBodyData[];
+    valueMacros: MacroValueBodyData[];
+    eventNodeSequences: EventNodeSequenceDataKPA2<unknown>[];
+    orphanLines: JudgeLineDataKPA2[];
     bpmList: BPMSegmentData[];
     judgeLineGroups: string[];
     chartTime?: number;
@@ -509,4 +609,5 @@ export enum NoteType {
 
 export type ValueTypeOfEventType<T extends EventType> = [number, number, number, number, number, number, number, number, number, string, RGB][T]
 
+export type ExtendedEventTypeName = "scaleX" | "scaleY" | "text" | "color"
 /// #enddeclaration

package/easing.ts

@@ -1,7 +1,8 @@
-import { type CustomEasingData, type EasingDataKPA2, EasingType, EventType, type SegmentedEasingData, type NormalEasingData, type BezierEasingData, type TemplateEasingData } from "./chartTypes";
-import { EventNodeSequence } from "./event";
+import { type TemplateEasingBodyData, type EasingDataKPA2, EasingType, EventType, type SegmentedEasingData, type NormalEasingData, type BezierEasingData, type TemplateEasingData, WrapperEasingData, WrapperEasingBodyData } from "./chartTypes";
+import { type EventNodeSequence } from "./event";
 import { type TupleCoord } from "./util";
-import Environment from "./env";
+import Environment, { err } from "./env";
+import { type ExpressionEvaluator } from "./evaluator";
 
 
 /// #declaration:global
@@ -43,10 +44,6 @@ const easeOutBack = (x: number): number =>{
 }
 
 const linear = (x: number): number => x
-const linearLine: CurveDrawer = (context: CanvasRenderingContext2D, startX: number, startY: number, endX: number , endY: number) => 
-    drawLine(context, startX, startY, endX, endY);
-
-
 
 const easeOutSine = (x: number): number => Math.sin((x * Math.PI) / 2);
 
@@ -95,7 +92,46 @@ const easeInOutBack = toEaseInOut(easeInBack, easeOutBack);
 const easeInOutElastic = toEaseInOut(easeInElastic, easeOutElastic);
 const easeInOutBounce = toEaseInOut(easeInBounce, easeOutBounce);
 
-export const easingFnMap = {
+
+export const easingFns = {
+    linear,
+    easeInSine,
+    easeOutSine,
+    easeInOutSine,
+    easeInQuad,
+    easeOutQuad,
+    easeInOutQuad,
+    easeInCubic,
+    easeOutCubic,
+    easeInOutCubic,
+    easeInQuart,
+    easeOutQuart,
+    easeInOutQuart,
+    easeInQuint,
+    easeOutQuint,
+    easeInOutQuint,
+    easeInExpo,
+    easeOutExpo,
+    easeInOutExpo,
+    easeInCirc,
+    easeOutCirc,
+    easeInOutCirc,
+    easeInBack,
+    easeOutBack,
+    easeInOutBack,
+    easeInElastic,
+    easeOutElastic,
+    easeInOutElastic,
+    easeInBounce,
+    easeOutBounce,
+    easeInOutBounce
+}
+
+type FuncType = "linear" | "sine" | "quad" | "cubic" | "quart" | "quint" | "expo" | "circ" | "back" | "elastic" | "bounce"
+
+export const easingFnMap: {
+    [k in FuncType]: [(x: number) => number, (x: number) => number, (x: number) => number]
+} = {
     "linear": [linear, linear, linear],
     "sine": [easeInSine, easeOutSine, toEaseInOut(easeInSine, easeOutSine)],
     "quad": [easeInQuad, easeOutQuad, toEaseInOut(easeInQuad, easeOutQuad)],
@@ -134,24 +170,9 @@ export abstract class Easing {
         }
         return (t: number) => (this.getValue(easingLeft + timeDelta * t) - leftValue) / delta;
     }
-    drawCurve(context: CanvasRenderingContext2D, startX: number, startY: number, endX: number , endY: number): void {
-        const delta = endY - startY;
-        const timeDelta = endX - startX;
-        let last = startY;
-        context.beginPath()
-        context.moveTo(startX, last)
-        for (let t = 4; t <= timeDelta; t += 4) {
-            const ratio = t / timeDelta
-            const curPosY = this.getValue(ratio) * delta + startY;
-            context.lineTo(startX + t, curPosY);
-            last = curPosY;
-        }
-        context.stroke();
-    }
 }
 
 
-type CurveDrawer = (context: CanvasRenderingContext2D, startX: number, startY: number, endX: number , endY: number) => void
 
 
 /**
@@ -191,22 +212,13 @@ export class NormalEasing extends Easing {
     funcType: string;
     easeType: string;
     _getValue: (t: number) => number;
-    _drawCurve: CurveDrawer;
     constructor(fn: (t: number) => number);
-    constructor(fn: (t: number) => number, curveDrawer?: CurveDrawer);
-    constructor(fn: (t: number) => number, curveDrawer?: CurveDrawer) {
+    constructor(fn: (t: number) => number);
+    constructor(fn: (t: number) => number) {
         super()
         this._getValue = fn;
-        if (curveDrawer) {
-            this._drawCurve = curveDrawer;
-        }
     }
     getValue(t: number): number {
-        if (t > 1 || t < 0) {
-            console.warn("缓动超出定义域！")
-            // debugger;
-        }
-        // console.log("t:", t, "rat", this._getValue(t))
         return this._getValue(t)
     }
     private dumpCache: NormalEasingData;
@@ -216,13 +228,6 @@ export class NormalEasing extends Easing {
             identifier: this.rpeId
         }
     }
-    drawCurve(context: CanvasRenderingContext2D, startX: number, startY: number, endX: number , endY: number) {
-        if (this._drawCurve) {
-            this._drawCurve(context, startX, startY, endX, endY)
-        } else {
-            super.drawCurve(context, startX, startY, endX, endY);
-        }
-    }
 }
 
 
@@ -234,18 +239,18 @@ export class NormalEasing extends Easing {
  * uses the Bezier curve formula to describe an easing.
  */
 export class BezierEasing extends Easing {
-    readonly xs: readonly number[];
-    readonly ys: readonly number[];
-    readonly jumper: readonly number[];
+    readonly xs: Float64Array;
+    readonly ys: Float64Array;
+    readonly jumper: Uint8Array;
     constructor(public readonly cp1: TupleCoord, public readonly cp2: TupleCoord) {
         super()
         const BEZIER_INTERPOLATION_DENSITY = Environment.BEZIER_INTERPOLATION_DENSITY;
         const BEZIER_INTERPOLATION_STEP = 1 / BEZIER_INTERPOLATION_DENSITY;
         // 插值，把贝塞尔曲线近似成256段折线
-        const xs: number[] = new Array(BEZIER_INTERPOLATION_DENSITY - 1);
-        const ys: number[] = new Array(BEZIER_INTERPOLATION_DENSITY - 1);
+        const xs = new Float64Array(BEZIER_INTERPOLATION_DENSITY - 1);
+        const ys = new Float64Array(BEZIER_INTERPOLATION_DENSITY - 1);
         /** 一把尺子，刻度均匀，从`插值步长*下标`映射到xs里面的下标 */
-        const jumper: number[] = new Array(BEZIER_INTERPOLATION_DENSITY);
+        const jumper = new Uint8Array(BEZIER_INTERPOLATION_DENSITY);
         let nextToFill = 0;
         for (let i = 1; i < BEZIER_INTERPOLATION_DENSITY; i++) {
             // 这个t是贝塞尔曲线生成参数
@@ -261,9 +266,9 @@ export class BezierEasing extends Easing {
         for (; 1 > nextToFill * BEZIER_INTERPOLATION_STEP; nextToFill++) {
             jumper[nextToFill] = BEZIER_INTERPOLATION_DENSITY - 1;
         }
-        this.xs = Object.freeze(xs);
-        this.ys = Object.freeze(ys);
-        this.jumper = Object.freeze(jumper);
+        this.xs = xs;
+        this.ys = ys;
+        this.jumper = jumper;
     }
     /**
      * 从横坐标获得纵坐标
@@ -296,19 +301,6 @@ export class BezierEasing extends Easing {
             bezier: [this.cp1[0], this.cp1[1], this.cp2[0], this.cp2[1]]
         }
     }
-    drawCurve(context: CanvasRenderingContext2D, startX: number, startY: number, endX: number , endY: number): void {
-        const [cp1x, cp1y] = this.cp1;
-        const [cp2x, cp2y] = this.cp2
-        const delta = endY - startY;
-        const timeDelta = endX - startX;
-        drawBezierCurve(
-            context,
-            startX, startY,
-            endX, endY,
-            startX + cp1x * timeDelta, startY + cp1y * delta,
-            startX + cp2x * timeDelta, startY + cp2y * delta,
-        )
-    }
 }
 
 /**
@@ -341,7 +333,7 @@ export class TemplateEasing extends Easing {
         }
     }
     get valueDelta(): number {
-        let seq = this.eventNodeSequence;
+        const seq = this.eventNodeSequence;
         return seq.tail.previous.value - seq.head.next.value;
     }
     get headValue(): number {
@@ -349,6 +341,24 @@ export class TemplateEasing extends Easing {
     }
 }
 
+export class WrapperEasing extends Easing {
+    // 需要一对面对面节点
+    constructor(public evaluator: ExpressionEvaluator<number>, public start: number, public end: number, public name: string) {
+        super()
+    }
+    getValue(t: number): number {
+        const end = this.end;
+        const start = this.start;
+        return (this.evaluator.func(t) - start) / (end - start);
+    }
+    dump(): WrapperEasingData {
+        return {
+            type: EasingType.wrapper,
+            identifier: this.name
+        }
+    }
+}
+
 
 
 
@@ -356,8 +366,10 @@ export class TemplateEasing extends Easing {
  * 缓动库
  * 用于管理模板缓动
  * for template easing management
+ * 
  * 谱面的一个属性
  * a property of chart
+ * 
  * 加载谱面时，先加载事件序列，所需的模板缓动会被加入到缓动库，但并不立即实现，在读取模板缓动时，才实现缓动。
  * To load a chart, the eventNodeSquences will be first loaded, during which process
  * the easings will be added to the easing library but not implemented immediately.
@@ -365,31 +377,42 @@ export class TemplateEasing extends Easing {
  * 
  */
 export class TemplateEasingLib {
-    easings: {
-        [name: string]: TemplateEasing
-    }
-    constructor() {
-        this.easings = {};
+    easings = new Map<string, TemplateEasing>();
+    wrapperEasings = new Map<string, WrapperEasing>();
+    // 被迫给一个静态方法进行依赖注入，恨死你了，ESM
+    constructor(public getNewSequence: (type: EventType, effectiveBeats: number) => EventNodeSequence<number>, public ExpressionEvaluatorCon: typeof ExpressionEvaluator) {
     }
     getOrNew(name: string): TemplateEasing {
         const DEFAULT_TEMPLATE_LENGTH = Environment.DEFAULT_TEMPLATE_LENGTH;
-        if (this.easings[name]) {
-            return this.easings[name];
+        if (this.easings.has(name)) {
+            return this.easings.get(name);
         } else {
-            const easing = new TemplateEasing(name, EventNodeSequence.newSeq(EventType.easing, DEFAULT_TEMPLATE_LENGTH));
+            const easing = new TemplateEasing(name, this.getNewSequence(EventType.easing, DEFAULT_TEMPLATE_LENGTH));
             easing.eventNodeSequence.id = "*" + name;
-            return this.easings[name] = easing;
+            this.easings.set(name, easing)
+            return easing;
+        }
+    }
+    readWrapperEasings(data: WrapperEasingBodyData[]) {
+        const len = data.length;
+        for (let i = 0; i < len; i++) {
+            const datum = data[i];
+            // 属于是油饼
+            this.wrapperEasings.set(datum.id, new WrapperEasing(new this.ExpressionEvaluatorCon(datum.jsExpr), datum.start, datum.end, datum.id))
         }
     }
+    getWrapper(name: string): WrapperEasing {
+        return this.wrapperEasings.get(name);
+    }
     /**
      * 注册一个模板缓动，但不会实现它
      * register a template easing when reading eventNodeSequences, but does not implement it immediately
      */
     require(name: string) {
-        this.easings[name] = new TemplateEasing(name, null);
+        this.easings.set(name, new TemplateEasing(name, null));
     }
     implement(name: string, sequence: EventNodeSequence) {
-        this.easings[name].eventNodeSequence = sequence;
+        this.easings.get(name).eventNodeSequence = sequence;
     }
     /**
      * 检查所有模板缓动是否实现
@@ -398,20 +421,19 @@ export class TemplateEasingLib {
      * should be invoked after all template easings are read
      */
     check() {
-        for (let key in this.easings) {
-            if (!this.easings[key].eventNodeSequence) {
-                console.warn(`未实现的缓动：${key}`);
+        for (const [name, easing] of this.easings) {
+            if (!easing.eventNodeSequence) {
+                err.UNIMPLEMENTED_TEMPLATE_EASING(name).warn();
             }
         }
     }
     get(key: string): TemplateEasing | undefined {
-        return this.easings[key];
+        return this.easings.get(key);
     }
     
-    dump(eventNodeSequences: Set<EventNodeSequence>): CustomEasingData[] {
-        const customEasingDataList: CustomEasingData[] = [];
-        for (let key in this.easings) {
-            const templateEasing = this.easings[key];
+    dump(eventNodeSequences: Set<EventNodeSequence>): TemplateEasingBodyData[] {
+        const customEasingDataList: TemplateEasingBodyData[] = [];
+        for (const [key, templateEasing] of this.easings) {
             const eventNodeSequence = templateEasing.eventNodeSequence;
             if (eventNodeSequences.has(eventNodeSequence)) {
                 continue;
@@ -419,16 +441,26 @@ export class TemplateEasingLib {
             eventNodeSequences.add(eventNodeSequence);
             customEasingDataList.push({
                 name: key,
-                content: eventNodeSequence.id, // 这里只存储编号，具体内容在保存时再编码
-                usedBy: [],
-                dependencies: []
+                content: eventNodeSequence.id // 这里只存储编号，具体内容在保存时再编码
             });
         }
         return customEasingDataList;
     }
+    dumpWrapperEasings(): WrapperEasingBodyData[] {
+        const wrapperEasingDataList: WrapperEasingBodyData[] = [];
+        for (const [key, wrapperEasing] of this.wrapperEasings) {
+            wrapperEasingDataList.push({
+                id: key,
+                jsExpr: wrapperEasing.evaluator.jsExpr,
+                start: wrapperEasing.start,
+                end: wrapperEasing.end
+            })
+        }
+        return wrapperEasingDataList;
+    }
 }
 
-export const linearEasing = new NormalEasing(linear, linearLine);
+export const linearEasing = new NormalEasing(linear);
 export const fixedEasing = new NormalEasing((x: number): number => (x === 1 ? 1 : 0));
 
 export const easingMap = {
@@ -446,8 +478,8 @@ export const easingMap = {
     "bounce": {in: new NormalEasing(easeInBounce), out: new NormalEasing(easeOutBounce), inout: new NormalEasing(easeInOutBounce)}
 }
 
-for (let funcType in easingMap) {
-    for (let easeType in easingMap[funcType]) {
+for (const funcType in easingMap) {
+    for (const easeType in easingMap[funcType]) {
         const easing = easingMap[funcType][easeType];
         easing.funcType = funcType;
         easing.easeType = easeType;
@@ -499,7 +531,7 @@ easingArray.forEach((easing, index) => {
 })
 
 export const rpeEasingArray = [
-    null,
+    fixedEasing,
     linearEasing, // 1
     easingMap.sine.out, // 2
     easingMap.sine.in, // 3
@@ -539,5 +571,8 @@ rpeEasingArray.forEach((easing, index) => {
     }
     easing.rpeId = index;
 })
+// 强行添加，避免存储不了这些缓动
+easingMap.expo.inout.rpeId = 101;
+easingMap.quint.inout.rpeId = 102;
 
 /// #enddeclaration