@rian8337/osu-strain-graph-generator 4.0.0-beta.92 → 4.0.0-beta.94

package/dist/index.js

@@ -339,6 +339,27 @@ class Chart {
     }
 }
 
+/**
+ * Creates a sampler function that retrieves the value of the most recent peak at or before a given time.
+ *
+ * Peaks of different skills can represent sections of different (and possibly variable) lengths, or even
+ * one peak per hitobject, so they cannot be assumed to share a common, fixed-width time grid. This walks
+ * a single chronologically sorted `peaks` array forward as `time` increases, treating each peak as holding
+ * its value until the next peak takes over.
+ *
+ * @param peaks The peaks to sample from, in chronological order.
+ */
+function createSampler(peaks) {
+    let index = -1;
+    let value = 0;
+    return (time) => {
+        while (index + 1 < peaks.length && peaks[index + 1].time <= time) {
+            ++index;
+            value = peaks[index].value;
+        }
+        return value;
+    };
+}
 /**
  * Generates the strain chart of a beatmap and returns the chart as a buffer.
  *
@@ -349,37 +370,55 @@ class Chart {
  */
 function index (beatmap, strainPeaks, clockRate, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e;
         const sectionLength = 400;
-        const currentSectionEnd = Math.ceil(beatmap.hitObjects.objects[0].startTime / sectionLength) *
-            sectionLength;
-        const strainInformations = new Array(Math.max(strainPeaks.aimWithSliders.length, strainPeaks.speed.length, strainPeaks.flashlight.length) + 1);
+        const hasFlashlight = strainPeaks.flashlight.length > 0;
+        // Each skill's peaks may be sectioned differently (fixed-width sections, variable-length sections,
+        // or one peak per hitobject), so they are merged onto the union of their own timestamps rather than
+        // a shared, assumed-uniform grid.
+        const timestamps = new Set();
+        for (const peak of strainPeaks.aimWithSliders) {
+            timestamps.add(peak.time);
+        }
+        for (const peak of strainPeaks.speed) {
+            timestamps.add(peak.time);
+        }
+        for (const peak of strainPeaks.flashlight) {
+            timestamps.add(peak.time);
+        }
+        const sortedTimestamps = [...timestamps].sort((a, b) => a - b);
+        const firstObjectStartTime = beatmap.hitObjects.objects[0].startTime / clockRate;
+        const sampleAim = createSampler(strainPeaks.aimWithSliders);
+        const sampleSpeed = createSampler(strainPeaks.speed);
+        const sampleFlashlight = createSampler(strainPeaks.flashlight);
+        const strainInformations = new Array(sortedTimestamps.length + 1);
         // Intentionally insert a 0 strain at 400ms less than the beginning
         // of the first object to smoothen the end curve.
         strainInformations[0] = {
             strain: 0,
-            time: (currentSectionEnd - sectionLength) / 1000,
+            time: (firstObjectStartTime - sectionLength) / 1000,
         };
-        for (let i = 1; i < strainInformations.length; ++i) {
-            const aimStrain = (_a = strainPeaks.aimWithSliders[i]) !== null && _a !== void 0 ? _a : 0;
-            const speedStrain = (_b = strainPeaks.speed[i]) !== null && _b !== void 0 ? _b : 0;
-            const flashlightStrain = (_c = strainPeaks.flashlight[i]) !== null && _c !== void 0 ? _c : 0;
-            strainInformations[i] = {
-                time: (currentSectionEnd + sectionLength * (i - 1)) / 1000,
-                strain: strainPeaks.flashlight.length > 0
+        for (let i = 0; i < sortedTimestamps.length; ++i) {
+            const time = sortedTimestamps[i];
+            const aimStrain = sampleAim(time);
+            const speedStrain = sampleSpeed(time);
+            const flashlightStrain = sampleFlashlight(time);
+            strainInformations[i + 1] = {
+                time: time / 1000,
+                strain: hasFlashlight
                     ? (aimStrain + speedStrain + flashlightStrain) / 3
                     : (aimStrain + speedStrain) / 2,
             };
         }
-        const maxTime = (_e = (_d = strainInformations.at(-1)) === null || _d === void 0 ? void 0 : _d.time) !== null && _e !== void 0 ? _e : beatmap.hitObjects.objects.at(-1).endTime / 1000 / clockRate;
+        const maxTime = (_b = (_a = strainInformations.at(-1)) === null || _a === void 0 ? void 0 : _a.time) !== null && _b !== void 0 ? _b : beatmap.hitObjects.objects.at(-1).endTime / 1000 / clockRate;
         const maxStrain = Math.max(osuBase.MathUtils.max(strainInformations.map((v) => v.strain)), 1);
         const maxXUnits = 10;
         const maxYUnits = 10;
         const unitsPerTickX = Math.ceil(maxTime / maxXUnits / 10) * 10;
         const unitsPerTickY = maxStrain / maxYUnits / 20;
         const chart = new Chart({
-            graphWidth: (_f = options === null || options === void 0 ? void 0 : options.width) !== null && _f !== void 0 ? _f : 600,
-            graphHeight: (_g = options === null || options === void 0 ? void 0 : options.height) !== null && _g !== void 0 ? _g : 150,
+            graphWidth: (_c = options === null || options === void 0 ? void 0 : options.width) !== null && _c !== void 0 ? _c : 600,
+            graphHeight: (_d = options === null || options === void 0 ? void 0 : options.height) !== null && _d !== void 0 ? _d : 150,
             minX: 0,
             minY: 0,
             maxX: Math.ceil(maxTime / unitsPerTickX) * unitsPerTickX,
@@ -404,7 +443,7 @@ function index (beatmap, strainPeaks, clockRate, options) {
             pointRadius: 0,
             xValueType: "time",
         });
-        chart.drawArea(strainInformations.map((v) => new osuBase.Vector2(v.time, v.strain)), (_h = options === null || options === void 0 ? void 0 : options.color) !== null && _h !== void 0 ? _h : "#000000");
+        chart.drawArea(strainInformations.map((v) => new osuBase.Vector2(v.time, v.strain)), (_e = options === null || options === void 0 ? void 0 : options.color) !== null && _e !== void 0 ? _e : "#000000");
         return chart.getBuffer();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-strain-graph-generator",
-    "version": "4.0.0-beta.92",
+    "version": "4.0.0-beta.94",
     "description": "A module for generating strain graph of an osu!standard beatmap.",
     "keywords": [
         "osu",
@@ -34,12 +34,12 @@
     },
     "dependencies": {
         "@rian8337/osu-base": "4.0.0-beta.91",
-        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.92",
-        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.92",
+        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.94",
+        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.94",
         "canvas": "^3.1.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "102e7baf7e9179caf6b0e81cafb53d6e3a561184"
+    "gitHead": "ab494480e1793b60e89b1e8b56c73b7a6995ff1f"
 }