kipphi 2.0.0 → 2.0.1

package/judgeline.ts

@@ -1,20 +1,19 @@
 import type { Chart, JudgeLineGroup } from "./chart";
-import { EventType, NoteType, type EventDataRPELike, type EventLayerDataKPA, type JudgeLineDataKPA, type JudgeLineDataRPE, type NNListDataKPA, type NoteDataRPE, type RGB, type TimeT, type ValueTypeOfEventType } from "./chartTypes";
+import { EventType, EventValueType, JudgeLineDataKPA2, NoteType, type EventDataRPELike, type EventLayerDataKPA, type JudgeLineDataKPA, type JudgeLineDataRPE, type NNListDataKPA, type NoteDataRPE, type RGB, type TimeT, type ValueTypeOfEventType } from "./chartTypes";
 import type { TemplateEasingLib } from "./easing";
-import { EventEndNode, EventNodeLike, EventNodeSequence, EventStartNode } from "./event";
+import { EventEndNode, EventNode, EventNodeLike, EventNodeSequence, EventStartNode, Monotonicity, SpeedENS } from "./event";
 import { HNList, NNList, Note, NoteNode, NNNList } from "./note";
-import { TimeCalculator } from "./time";
+import { type TimeCalculator } from "./bpm";
+import TC from "./time";
 import { NodeType } from "./util";
-import Environment from "./env";
+import Environment, { err } from "./env";
 /// #declaration:global
-const TC = TimeCalculator
 
 export interface EventLayer {
     moveX?: EventNodeSequence;
     moveY?: EventNodeSequence;
     rotate?: EventNodeSequence;
     alpha?: EventNodeSequence;
-    speed?: EventNodeSequence;
 }
 
 export interface ExtendedLayer {
@@ -34,6 +33,9 @@ const getRangeMedian = (yOffset: number) => {
     const NNLIST_Y_OFFSET_HALF_SPAN = Environment.NNLIST_Y_OFFSET_HALF_SPAN
     return (Math.floor((Math.abs(yOffset) - NNLIST_Y_OFFSET_HALF_SPAN) / NNLIST_Y_OFFSET_HALF_SPAN / 2) * (NNLIST_Y_OFFSET_HALF_SPAN * 2) + NNLIST_Y_OFFSET_HALF_SPAN * 2) * Math.sign(yOffset);
 }
+
+
+
 export class JudgeLine {
     texture: string;
     group: JudgeLineGroup;
@@ -41,6 +43,7 @@ export class JudgeLine {
     hnLists = new Map<string, HNList>();
     nnLists = new Map<string, NNList>();
     eventLayers: EventLayer[] = [];
+    speedSequence: SpeedENS;
     extendedLayer: ExtendedLayer = {};
     // notePosition: Float64Array;
     // noteSpeeds: NoteSpeeds;
@@ -63,8 +66,11 @@ export class JudgeLine {
 
     /**
      * 每帧渲染时所用的变换矩阵，缓存下来用于之后的UI绑定渲染
+     * 
+     * 已移除，谱面NPM包不需要这个，播放器侧如要使用，可以用同名接口扩展此类
+     * @removed since 2.0.1
      */
-    renderMatrix: Matrix;
+    // renderMatrix: Matrix;
 
     rotatesWithFather: boolean = false;
 
@@ -79,7 +85,7 @@ export class JudgeLine {
         // this.noteSpeeds = {};
     }
     static fromRPEJSON(chart: Chart, id: number, data: JudgeLineDataRPE, templates: TemplateEasingLib, timeCalculator: TimeCalculator) {
-        let line = new JudgeLine(chart)
+        const line = new JudgeLine(chart)
         line.id = id;
         line.name = data.Name;
         chart.judgeLineGroups[data.Group].add(line);
@@ -102,15 +108,15 @@ export class JudgeLine {
         if (data.notes) {
             const holdLists = line.hnLists;
             const noteLists = line.nnLists;
-            let notes = data.notes;
+            const notes = data.notes;
             notes.sort((n1: NoteDataRPE, n2: NoteDataRPE) => {
-                if (TimeCalculator.ne(n1.startTime, n2.startTime)) {
-                    return TimeCalculator.gt(n1.startTime, n2.startTime) ? 1 : -1
+                if (TC.ne(n1.startTime, n2.startTime)) {
+                    return TC.gt(n1.startTime, n2.startTime) ? 1 : -1
                 }
-                return TimeCalculator.gt(n1.endTime, n2.endTime) ? -1 : 1 // 这里曾经排反了（
+                return TC.gt(n1.endTime, n2.endTime) ? -1 : 1 // 这里曾经排反了（
             })
             const len = notes.length;
-            let lastTime: TimeT = [-1, 0, 1];
+            // let lastTime: TimeT = [-1, 0, 1];
             // let comboInfoEntity: ComboInfoEntity;
                     
             for (let i = 0; i < len; i++) {
@@ -119,7 +125,7 @@ export class JudgeLine {
                 const tree = line.getNNList(note.speed, note.yOffset, note.type === NoteType.hold, false)
                 const cur = tree.currentPoint
                 const lastHoldTime: TimeT = cur.type === NodeType.HEAD ? [-1, 0, 1] : cur.startTime
-                if (TimeCalculator.eq(lastHoldTime, note.startTime)) {
+                if (TC.eq(lastHoldTime, note.startTime)) {
                     (tree.currentPoint as NoteNode).add(note)
                 } else {
                     const node = new NoteNode(note.startTime)
@@ -130,8 +136,8 @@ export class JudgeLine {
                 }
                 tree.timesWithNotes++
             }
-            for (let trees of [holdLists, noteLists]) {
-                for (const [_, list] of trees) {
+            for (const lists of [holdLists, noteLists]) {
+                for (const [_, list] of lists) {
                     NoteNode.connect(list.currentPoint, list.tail)
                     list.initJump();
                     // tree.initPointers()
@@ -142,20 +148,23 @@ export class JudgeLine {
         const length = eventLayers.length;
         const createSequence = (type: EventType, events: EventDataRPELike[], index: number) =>  {
             if (events) {
-                const sequence = EventNodeSequence.fromRPEJSON(type, events, chart);
-                sequence.id = `#${id}.${index}.${EventType[type]}`;
+                const seqId = `#${id}.${index}.${EventType[type]}`;
+                const sequence = EventNodeSequence.fromRPEJSON(type, events, chart, seqId);
+                sequence.id = seqId
                 chart.sequenceMap.set(sequence.id, sequence);
                 return sequence;
             }
         }
         const createExtendedSequence = <T extends EventType>(type: T, events: EventDataRPELike<ValueTypeOfEventType<T>>[]) =>  {
             if (events) {
-                const sequence = EventNodeSequence.fromRPEJSON(type, events, chart);
-                sequence.id = `#${id}.ex.${EventType[type]}`;
+                const seqId = `#${id}.ex.${EventType[type]}`;
+                const sequence = EventNodeSequence.fromRPEJSON(type, events, chart, seqId);
+                sequence.id = seqId;
                 chart.sequenceMap.set(sequence.id, sequence);
                 return sequence;
             }
         }
+        const speedSequences: SpeedENS[] = [];
         for (let index = 0; index < length; index++) {
             const layerData = eventLayers[index];
             if (!layerData) {
@@ -165,11 +174,20 @@ export class JudgeLine {
                 moveX: createSequence(EventType.moveX, layerData.moveXEvents, index),
                 moveY: createSequence(EventType.moveY, layerData.moveYEvents, index),
                 rotate: createSequence(EventType.rotate, layerData.rotateEvents, index),
-                alpha: createSequence(EventType.alpha, layerData.alphaEvents, index),
-                speed: createSequence(EventType.speed, layerData.speedEvents, index)
+                alpha: createSequence(EventType.alpha, layerData.alphaEvents, index)
             };
+            if (layerData.speedEvents) {
+                const seq = createSequence(EventType.speed, layerData.speedEvents, index);
+                speedSequences.push(seq as SpeedENS);
+            }
             line.eventLayers[index] = layer;
         }
+        if (speedSequences.length > 1) {
+            line.speedSequence = EventNodeSequence.mergeSequences(speedSequences) as SpeedENS;
+            line.speedSequence.updateFloorPositionAfter(line.speedSequence.head.next, timeCalculator);
+        } else {
+            line.speedSequence = chart.createEventNodeSequence(EventType.speed, `#${id}.speed`) as SpeedENS;
+        }
         if (data.extended) {
             if (data.extended.scaleXEvents) {
                 line.extendedLayer.scaleX = createExtendedSequence(EventType.scaleX, data.extended.scaleXEvents);
@@ -192,58 +210,118 @@ export class JudgeLine {
         // line.computeNotePositionY(timeCalculator);
         return line;
     }
-    static fromKPAJSON(isOld: boolean, chart: Chart, id: number, data: JudgeLineDataKPA, templates: TemplateEasingLib, timeCalculator: TimeCalculator) {
-        let line = new JudgeLine(chart)
+    static fromKPAJSON(
+        version: number,
+        chart: Chart,
+        id: number,
+        data: JudgeLineDataKPA | JudgeLineDataKPA2,
+        templates: TemplateEasingLib, 
+        timeCalculator: TimeCalculator
+    )
+    {
+        const withNewEventStructure = version >= 150;
+        const independentSpeedENS = version >= 201;
+        const lowerCaseNameAndTexture = version >= 201;
+
+        const line = new JudgeLine(chart)
         line.id = id;
-        line.name = data.Name;
+        line.name = lowerCaseNameAndTexture ? (data as JudgeLineDataKPA2).name : (data as JudgeLineDataKPA).Name;
         line.rotatesWithFather = data.rotatesWithFather;
         line.anchor = data.anchor ?? [0.5, 0.5];
-        line.texture = data.Texture || "line.png";
+        line.texture = (lowerCaseNameAndTexture ? (data as JudgeLineDataKPA2).texture : (data as JudgeLineDataKPA).Texture)  ?? "line.png";
         line.cover = data.cover ?? true;
         line.zOrder = data.zOrder ?? 0;
 
 
+
         chart.judgeLineGroups[data.group].add(line);
         const nnnList = chart.nnnList;
-        for (let isHold of [false, true]) {
+        for (const isHold of [false, true]) {
             const key: "hnLists" | "nnLists" = `${isHold ? "hn" : "nn"}Lists`
-            const lists: Record<string, NNListDataKPA>= data[key];
-            for (let name in lists) {
-                const listData = lists[name];
-                if (!isOld) {
+            const listsData: Record<string, NNListDataKPA>= data[key];
+            for (const name in listsData) {
+                const listData = listsData[name];
+                if (withNewEventStructure) {
                         
                     const list = NNList.fromKPAJSON(isHold, chart.effectiveBeats, listData, nnnList, timeCalculator);
                     list.parentLine = line;
-                    list.id = name
+                    list.id = name;
+                    // isHold为真则lists为Map<string, HNList>，且list为HNList，能够匹配
+                    // @ts-expect-error 这里我也不知道怎么让它知道这里是匹配的
                     line[key].set(name, list);
                 } else {
                     line.getNNListFromOldKPAJSON(line[key], name, isHold, chart.effectiveBeats, listData, nnnList, timeCalculator);
                 }
             }
         }
-        for (let child of data.children) {
-            line.children.add(JudgeLine.fromKPAJSON(isOld, chart, child.id, child, templates, timeCalculator));
+        for (const child of data.children) {
+            line.children.add(JudgeLine.fromKPAJSON(version, chart, child.id, child, templates, timeCalculator));
+        }
+        const unwrap = <VT>(sequence: EventNodeSequence<unknown>, predicate: (value: unknown) => boolean, typeStr: keyof typeof EventValueType) => {
+            const value = sequence.head.next.value
+            if (!predicate(value)) {
+                throw err.EXPECTED_TYPED_ENS(typeStr, sequence.id, value);
+            }
+            return sequence as EventNodeSequence<VT>;
         }
-        for (let eventLayerData of data.eventLayers) {
-            let eventLayer: EventLayer = {} as EventLayer;
-            for (let key in eventLayerData) {
+        for (const eventLayerData of data.eventLayers) {
+            const eventLayer: EventLayer = {} as EventLayer;
+            for (const key in eventLayerData) {
                 // use "fromRPEJSON" for they have the same logic
-                eventLayer[key] = chart.sequenceMap.get(eventLayerData[key]);
+                eventLayer[key] = unwrap(chart.sequenceMap.get(eventLayerData[key]), v => typeof v === "number", "numeric");
             }
             line.eventLayers.push(eventLayer);
         }
+        if (independentSpeedENS) {
+            const seq = unwrap(
+                chart.sequenceMap.get((data as JudgeLineDataKPA2).speedEventNodeSeq),
+                v => typeof v === "number",
+                "numeric"
+            );
+            line.speedSequence = seq as SpeedENS;
+        } else {
+            // 合并多个层级上的速度序列，合并完以后置空
+            const oldSequences: SpeedENS[] = [];
+            for (const layer of line.eventLayers) {
+                const ly = layer as {speed: SpeedENS};
+                if (ly.speed) {
+                    oldSequences.push(ly.speed);
+                    ly.speed = null;
+                }
+            }
+            let seq: EventNodeSequence<number>;
+            if (oldSequences.length > 0) {
+                
+                seq = EventNodeSequence.mergeSequences(
+                    oldSequences
+                );
+                (seq as SpeedENS).updateFloorPositionAfter((seq as SpeedENS).head.next, timeCalculator);
+            } else {
+                seq = chart.createEventNodeSequence(EventType.speed, `#${line.id}.speed`);
+
+            }
+            line.speedSequence = seq as SpeedENS;
+        }
         line.extendedLayer.scaleX = data.extended?.scaleXEvents
-                                ? chart.sequenceMap.get(data.extended.scaleXEvents)
+                                ? unwrap(chart.sequenceMap.get(
+                                    data.extended.scaleXEvents),
+                                    v => typeof v === "number",
+                                    "numeric"
+                                )
                                 : chart.createEventNodeSequence(EventType.scaleX, `#${line.id}.ex.scaleX`);
         line.extendedLayer.scaleY = data.extended?.scaleYEvents
-                                ? chart.sequenceMap.get(data.extended.scaleYEvents)
+                                ? unwrap(chart.sequenceMap.get(
+                                    data.extended.scaleYEvents),
+                                    v => typeof v === "number",
+                                    "numeric"
+                                )
                                 : chart.createEventNodeSequence(EventType.scaleY, `#${line.id}.ex.scaleY`);
         if (data.extended) {
             if (data.extended.textEvents) {
-                line.extendedLayer.text = chart.sequenceMap.get(data.extended.textEvents);
+                line.extendedLayer.text = unwrap(chart.sequenceMap.get(data.extended.textEvents), v => typeof v === "string", "text");
             }
             if (data.extended.colorEvents) {
-                line.extendedLayer.color = chart.sequenceMap.get(data.extended.colorEvents);
+                line.extendedLayer.color = unwrap(chart.sequenceMap.get(data.extended.colorEvents), v => Array.isArray(v), "color");
             }
         }
         
@@ -302,27 +380,48 @@ export class JudgeLine {
             return this.eventLayers[index];
         }
     }
+    /*
+    应该是古老代码，现在不用了，暂时不移除
     updateSpeedIntegralFrom(beats: number, timeCalculator: TimeCalculator) {
-        for (let eventLayer of this.eventLayers) {
+        for (const eventLayer of this.eventLayers) {
             eventLayer?.speed?.updateNodesIntegralFrom(beats, timeCalculator);
         }
     }
+    //*/
     /**
+     * 判定线当前所在的FloorPosition
+     * 
+     * 可以理解为：有一个假想的充满音符的瀑布流，判定线在其中或前进或后退
+     */
+    currentFloorPosition: number;
+    cachedFloorPositions: Float64Array;
+    computeCurrentFloorPosition(beats: number, timeCalculator: TimeCalculator) {
+        this.currentFloorPosition = this.speedSequence.getFloorPositionAt(beats, timeCalculator);
+    }
+    getRelativeFloorPositionAt(beats: number, timeCalculator: TimeCalculator) {
+        return this.speedSequence.getFloorPositionAt(beats, timeCalculator) - this.currentFloorPosition;
+    }
+    /**
+     * 通过速度序列的FloorPosition反解出一个时间范围。
+     * 
+     * KPA内核代码中最大的一坨史山，没有之一。
+     * 
+     * 谱面渲染时最耗时的函数
+     * 
      * startY and endY must not be negative
      * @param beats 
      * @param timeCalculator 
      * @param startY 
      * @param endY 
      * @returns 
-     */
+     * /
     computeTimeRange(beats: number, timeCalculator: TimeCalculator , startY: number, endY: number): [number, number][] {
-        console.log("invoked")
         //return [[0, Infinity]]
         //*
         // 提取所有有变化的时间点
         let times: number[] = [];
-        let result: [number, number][] = [];
-        for (let eventLayer of this.eventLayers) {
+        const result: [number, number][] = [];
+        for (const eventLayer of this.eventLayers) {
             const sequence = eventLayer?.speed;
             if (!sequence) {
                 continue;
@@ -330,7 +429,7 @@ export class JudgeLine {
             let node: EventStartNode = sequence.getNodeAt(beats);
             let endNode: EventEndNode | EventNodeLike<NodeType.TAIL>
             while (true) {
-                times.push(TimeCalculator.toBeats(node.time))
+                times.push(TC.toBeats(node.time))
                 if ((endNode = node.next).type === NodeType.TAIL) {
                     break;
                 }
@@ -341,7 +440,7 @@ export class JudgeLine {
         times = [...new Set(times)].sort((a, b) => a - b)
         const len = times.length;
         let nextTime = times[0]
-        let nextPosY = this.getStackedIntegral(nextTime, timeCalculator)
+        let nextPosY = this.getStackedFloorPosition(nextTime, timeCalculator)
         let nextSpeed = this.getStackedValue("speed", nextTime, true)
         let range: [number, number] = [undefined, undefined];
         // console.log(times)
@@ -354,14 +453,14 @@ export class JudgeLine {
                 thisSpeed = 0; // 不这样做可能导致下面异号判断为真从而死循环
             }
             nextTime = times[i + 1]
-            nextPosY = this.getStackedIntegral(nextTime, timeCalculator);
+            nextPosY = this.getStackedFloorPosition(nextTime, timeCalculator);
             nextSpeed = this.getStackedValue("speed", nextTime, true)
             // console.log(thisSpeed, nextSpeed, thisSpeed * nextSpeed < 0, i, [...result])
             if (thisSpeed * nextSpeed < 0) { // 有变号零点，再次切断，保证处理的每个区间单调性
                 //debugger;
                 nextTime = (nextTime - thisTime) * (0 - thisSpeed) / (nextSpeed - thisSpeed) + thisTime;
                 nextSpeed = 0
-                nextPosY = this.getStackedIntegral(nextTime, timeCalculator)
+                nextPosY = this.getStackedFloorPosition(nextTime, timeCalculator)
                 //debugger
             } else {
                 // console.log("i++")
@@ -377,7 +476,7 @@ export class JudgeLine {
                 或a > e >= b
                 全部在区间内
                 s <= a <= b
-                */
+                * /
                 if (thisPosY < startY && startY <= nextPosY
                 || thisPosY > endY && endY >= nextPosY) {
                     range[0] = thisSpeed !== nextSpeed ? thisTime : computeTime(
@@ -393,12 +492,6 @@ export class JudgeLine {
                     range[1] = thisSpeed !== nextSpeed ? nextTime : computeTime(
                         thisSpeed,
                         (thisPosY > nextPosY ? startY : endY) - thisPosY, thisTime)
-                    if (range[0] > range[1]){
-                        console.error("range start should be smaller than range end.")
-                        console.log("\nRange is:", range, "thisTime:", thisTime, "thisSpeed:", thisSpeed, "thisPosY:", thisPosY,
-                                "\nstartY:", startY, "endY:", endY, "nextTime:", nextTime, "nextPosY:", nextPosY, "nextSpeed:", nextSpeed,
-                                "\njudgeLine:", this)
-                    }
                     result.push(range)
                     range = [undefined, undefined];
                 }
@@ -432,16 +525,203 @@ export class JudgeLine {
                 result.push(range)
             }
         }
+        return result;
+        //* /
+    }*/
+   /**
+     * 通过速度序列的FloorPosition反解出一个时间范围。
+     * 
+     * KPA内核代码中最大的一坨史山，没有之一。
+     * 
+     * 谜面渲染时最耗时的函数
+     * 
+     * 调用此方法前需要先更新判定线当前的FP。
+     * 
+     * startY and endY must not be negative
+     * @param beats 
+     * @param timeCalculator 
+     * @param startY 
+     * @param endY 
+     * @returns 
+     */
+    computeTimeRange(beats: number, timeCalculator: TimeCalculator, startY: number, endY: number): [number, number][] {
+        //return [[0, Infinity]]
+        //*
+        const result: [number, number][] = [];
+        
+        // 直接使用speedSequence，不再遍历所有事件层
+        if (!this.speedSequence) {
+            return result;
+        }
+        const speedSequence = this.speedSequence;
+        const lineMonotonicity = speedSequence.monotonicity ?? Monotonicity.swinging;
+
+        const currentJudgeLineFloorPos = this.currentFloorPosition;
+        
+        // 获取起始节点
+        let startNode: EventStartNode<number> = this.speedSequence.getNodeAt(beats);
+        let range: [number, number] = [undefined, undefined];
+        // 启用遮罩时，两个Y边界都是正数，直接返回空数组
+        if (lineMonotonicity === Monotonicity.decreasing && startY >= 0 && endY > 0) {
+
+            return result;
+        }
+
+        
+        const computeTime = (speed: number, currentPos: number, fore: number) => 
+            timeCalculator.secondsToBeats(currentPos / (speed * 120) + timeCalculator.toSeconds(fore));
+        
+        // 遍历所有事件节点直到结尾
+        while (true) {
+            const thisTime = TC.toBeats(startNode.time);
+            const endNode = startNode.next;
+            const nextStart = endNode.next;
+            if (endNode.type === NodeType.TAIL) {
+                // 处理最后一个节点到无穷大的情况
+                const thisPosY = startNode.floorPosition - currentJudgeLineFloorPos;
+                const thisSpeed = startNode.value;
+                
+                const inf = thisSpeed > 0 ? Infinity : (thisSpeed < 0 ? -Infinity : thisPosY);
+                
+                if (range[0] === undefined) {
+                    if (thisPosY < startY && startY <= inf || thisPosY >= endY && endY > inf) {
+                        range[0] = computeTime(
+                            thisSpeed,
+                            (thisPosY < inf ? startY : endY) - thisPosY,
+                            thisTime)
+                    } else if (thisSpeed === 0) {
+                        range[0] = 0;
+                    }
+                }
+                
+                if (range[0] !== undefined) {
+                    if (thisPosY < endY && endY <= inf || thisPosY >= startY && startY > inf) {
+                        range[1] = computeTime(
+                            thisSpeed,
+                            (thisPosY > inf ? startY : endY) - thisPosY,
+                            thisTime)
+                        result.push(range)
+                    } else if (thisSpeed === 0) {
+                        range[1] = Infinity;
+                        result.push(range)
+                    }
+                }
+                break;
+            }
+        
+            
+            const nextTime = TC.toBeats(nextStart.time);
+            
+            const thisPosY = startNode.floorPosition - currentJudgeLineFloorPos;
+            const nextPosY = nextStart.floorPosition - currentJudgeLineFloorPos;
+            
+            let thisSpeed = startNode.value;
+            let nextSpeed = nextStart.value;
+            
+            if (Math.abs(thisSpeed) < 1e-8) {
+                thisSpeed = 0;
+            }
+            
+            if (Math.abs(nextSpeed) < 1e-8) {
+                nextSpeed = 0;
+            }
+            
+            // 处理速度变号的情况
+            if (thisSpeed * nextSpeed < 0) {
+                // 计算速度为0的时间点
+                const zeroTime = (nextTime - thisTime) * (0 - thisSpeed) / (nextSpeed - thisSpeed) + thisTime;
+                const zeroPosY = speedSequence.getFloorPositionAt(zeroTime, timeCalculator) - currentJudgeLineFloorPos;
+                const zeroSpeed = 0;
+                
+                // 处理第一段(开始到零点)
+                if (range[0] === undefined) {
+                    if (thisPosY < startY && startY <= zeroPosY || thisPosY > endY && endY >= zeroPosY) {
+                        range[0] = thisSpeed !== zeroSpeed ? thisTime : computeTime(
+                            thisSpeed,
+                            (thisPosY < zeroPosY ? startY : endY) - thisPosY, thisTime
+                        );
+                    } else if (startY <= thisPosY && thisPosY <= endY) {
+                        range[0] = thisTime;
+                    }
+                }
+                
+                if (range[0] !== undefined) {
+                    if (thisPosY < endY && endY <= zeroPosY || thisPosY > startY && startY >= zeroPosY) {
+                        range[1] = thisSpeed !== zeroSpeed ? zeroTime : computeTime(
+                            thisSpeed,
+                            (thisPosY > zeroPosY ? startY : endY) - thisPosY, thisTime)
+                        result.push(range);
+                        if (lineMonotonicity !== Monotonicity.swinging) {
+                            // 单调的FloorPosition函数只能产生一个符合条件的区间，可以提前返回达到优化目的
+                            return result;
+                        }
+                        range = [undefined, undefined];
+                    }
+                }
+                
+                // 处理第二段(零点到结束)
+                if (range[0] === undefined) {
+                    if (zeroPosY < startY && startY <= nextPosY || zeroPosY > endY && endY >= nextPosY) {
+                        range[0] = zeroSpeed !== nextSpeed ? zeroTime : computeTime(
+                            nextSpeed,
+                            (zeroPosY < nextPosY ? startY : endY) - zeroPosY, zeroTime)
+                    } else if (startY <= zeroPosY && zeroPosY <= endY) {
+                        range[0] = zeroTime;
+                    }
+                }
+                
+                if (range[0] !== undefined) {
+                    if (zeroPosY < endY && endY <= nextPosY || zeroPosY > startY && startY >= nextPosY) {
+                        range[1] = zeroSpeed !== nextSpeed ? nextTime : computeTime(
+                            nextSpeed,
+                            (zeroPosY > nextPosY ? startY : endY) - zeroPosY, zeroTime)
+                        result.push(range)
+                        if (lineMonotonicity !== Monotonicity.swinging) {
+                            // 单调的FloorPosition函数只能产生一个符合条件的区间，可以提前返回达到优化目的
+                            return result;
+                        }
+                        range = [undefined, undefined];
+                    }
+                }
+            } else {
+                // 正常情况处理
+                if (range[0] === undefined) {
+                    if (thisPosY < startY && startY <= nextPosY || thisPosY > endY && endY >= nextPosY) {
+                        range[0] = thisSpeed !== nextSpeed ? thisTime : computeTime(
+                            thisSpeed,
+                            (thisPosY < nextPosY ? startY : endY) - thisPosY, thisTime)
+                    } else if (startY <= thisPosY && thisPosY <= endY) {
+                        range[0] = thisTime;
+                    }
+                }
+                
+                if (range[0] !== undefined) {
+                    if (thisPosY < endY && endY <= nextPosY || thisPosY > startY && startY >= nextPosY) {
+                        range[1] = thisSpeed !== nextSpeed ? nextTime : computeTime(
+                            thisSpeed,
+                            (thisPosY > nextPosY ? startY : endY) - thisPosY, thisTime)
+                        result.push(range);
+                        if (lineMonotonicity !== Monotonicity.swinging) {
+                            // 单调的FloorPosition函数只能产生一个符合条件的区间，可以提前返回达到优化目的
+                            return result;
+                        }
+                        range = [undefined, undefined];
+                    }
+                }
+                // 我挺希望能够显式内联上面的……复用性也太低了
+            }
+            
+            // 移动到下一个节点
+            startNode = nextStart;
+        }
+        
         return result;
         //*/
     }
-    /*
-    computeLinePositionY(beats: number, timeCalculator: TimeCalculator)  {
-        return this.getStackedIntegral(beats, timeCalculator)
-    }
-    */
+
     /**
      * 
+     * @deprecated 1.7.0
      * @param beats 
      * @param usePrev 如果取到节点，将使用EndNode的值。默认为FALSE
      * @returns 
@@ -454,10 +734,6 @@ export class JudgeLine {
             this.getStackedValue("alpha", beats, usePrev),
         ]
     }
-    getMatrix(beats: number, usePrev = false) {
-        const base = this.father.getMatrix(beats, usePrev);
-        const x = this
-    }
     getStackedValue(type: keyof EventLayer, beats: number, usePrev: boolean = false) {
         const length = this.eventLayers.length;
         let current = 0;
@@ -470,7 +746,17 @@ export class JudgeLine {
         }
         return current
     }
-    getStackedIntegral(beats: number, timeCalculator: TimeCalculator) {
+    /**
+     * 获取指定时间点的FloorPosition。
+     * 
+     * <del>为了向后兼容，保留了多层速度事件的机制。</del>
+     * 
+     * 已经删除了多层速度事件
+     * @param beats 
+     * @param timeCalculator 
+     * @returns 
+     * /
+    getStackedFloorPosition(beats: number, timeCalculator: TimeCalculator) {
         
         const length = this.eventLayers.length;
         let current = 0;
@@ -479,11 +765,11 @@ export class JudgeLine {
             if (!layer || !layer.speed) {
                 break;
             }
-            current += layer.speed.getIntegral(beats, timeCalculator);
+            current += layer.speed.getFloorPositionAt(beats, timeCalculator);
         }
         // console.log("integral", current)
         return current;
-    }
+    }//*/
     /**
      * 获取对应速度和类型的Note树,没有则创建
      */
@@ -516,17 +802,17 @@ export class JudgeLine {
      * @param eventNodeSequences To Collect the sequences used in this line
      * @returns 
      */
-    dumpKPA(eventNodeSequences: Set<EventNodeSequence<any>>, judgeLineGroups: JudgeLineGroup[]): JudgeLineDataKPA {
-        const children: JudgeLineDataKPA[] = [];
-        for (let line of this.children) {
+    dumpKPA(eventNodeSequences: Set<EventNodeSequence<any>>, judgeLineGroups: JudgeLineGroup[]): JudgeLineDataKPA2 {
+        const children: JudgeLineDataKPA2[] = [];
+        for (const line of this.children) {
             children.push(line.dumpKPA(eventNodeSequences, judgeLineGroups))
         }
         const eventLayers: EventLayerDataKPA[] = [];
         for (let i = 0; i < this.eventLayers.length; i++) {
             const layer = this.eventLayers[i];
             if (!layer) continue;
-            let layerData = {}
-            for (let type in layer) {
+            const layerData = {}
+            for (const type in layer) {
                 const sequence = layer[type as keyof EventLayer];
                 if (!sequence) continue;
                 eventNodeSequences.add(sequence);
@@ -536,10 +822,10 @@ export class JudgeLine {
         }
         const hnListsData = {};
         const nnListsData = {};
-        for (let [id, list] of this.hnLists) {
+        for (const [id, list] of this.hnLists) {
             hnListsData[id] = list.dumpKPA();
         }
-        for (let [id, list] of this.nnLists) {
+        for (const [id, list] of this.nnLists) {
             nnListsData[id] = list.dumpKPA();
         }
         const extended = {
@@ -560,12 +846,13 @@ export class JudgeLine {
         return {
             group: judgeLineGroups.indexOf(this.group),
             id: this.id,
-            Name: this.name,
-            Texture: this.texture,
+            name: this.name,
+            texture: this.texture,
             anchor: this.anchor,
             rotatesWithFather: this.rotatesWithFather,
             children: children,
             eventLayers: eventLayers,
+            speedEventNodeSeq: this.speedSequence?.id,
             hnLists: hnListsData,
             nnLists: nnListsData,
             cover: this.cover,
@@ -575,26 +862,36 @@ export class JudgeLine {
         }
     }
 
+    /*
+    暂时不用此方法
+    updateNNListFloorPositions() {
+        for (const lists of [this.nnLists, this.hnLists]) {
+            for (const list of lists) {
+
+            }
+        }
+    }
+        */
     
     updateEffectiveBeats(EB: number) {
         for (let i = 0; i < this.eventLayers.length; i++) {
             const layer = this.eventLayers[i];
-            for (let type in layer) {
+            for (const type in layer) {
                 const sequence = layer[type as keyof EventLayer];
                 sequence.effectiveBeats = EB;
             }
         }
-        for (let lists of [this.nnLists, this.hnLists]) {
-            for (let [_, list] of lists) {
+        for (const lists of [this.nnLists, this.hnLists]) {
+            for (const [_, list] of lists) {
                 list.effectiveBeats = EB;
             }
         }
     }
     static checkinterdependency(judgeLine: JudgeLine, toBeFather: JudgeLine) { 
-        let descendantsAndSelf = new Set<JudgeLine>();
+        const descendantsAndSelf = new Set<JudgeLine>();
         const add = (line: JudgeLine) => {
             descendantsAndSelf.add(line);
-            for (let child of line.children) {
+            for (const child of line.children) {
                 add(child);
             }
         }