gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change event params a bit and fix cam zooming

Browse Source
This commit is contained in:
Ralty
2025-06-30 10:49:38 +07:00
parent a6fcb3d237
commit 241b87ad58
9 changed files with 109 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/system/Conductor.hx
+34 -14
View File
@@ -6,6 +6,12 @@ import funkin.backend.chart.ChartData;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.editors.charter.Charter;
enum BeatType {
STEP;
BEAT;
MEASURE;
}
@:structInit
class BPMChangeEvent
{
@@ -25,6 +31,16 @@ class BPMChangeEvent
final class Conductor
{
public static function getBeats(?every:BeatType, interval:Float, offset:Float = 0):Float {
final beat = switch(every) {
case MEASURE: curMeasureFloat;
case STEP: curStepFloat;
default: curBeatFloat;
}
if (interval <= 0) return beat - offset;
else return Math.floor((beat - offset) * interval) / interval;
}
/**
* FlxSignals
*/
@@ -96,12 +112,21 @@ final class Conductor
return bpmChangeMap.length == 0 ? 4 : bpmChangeMap[curChangeIndex].beatsPerMeasure;
/**
* Number of steps per beat (bottom number in time signature). Defaults to 4.
* Number of steps per beat. Defaults to 4.
* Not a divisor number for time signature, it does the complete opposite.
* It's because CNE Conductor is based in sixteenth note instead of beat.
*/
public static var stepsPerBeat(get, never):Float;
public static var stepsPerBeat(get, never):Int;
private static function get_stepsPerBeat()
return bpmChangeMap.length == 0 ? 4 : bpmChangeMap[curChangeIndex].stepsPerBeat;
/**
* How much value notes to divide for beat (bottom or divisor number in time signature).
* Only for a convinient way to access divisor instead of multiply by steps per beat.
*/
public static var denominator(get, never):Int;
private static function get_denominator() return Math.floor(16 / stepsPerBeat);
/**
* Current step
*/
@@ -231,13 +256,13 @@ final class Conductor
if (curChange.songTime != time) curChange = mapBPMChange(curChange, time, curChange.bpm);
curChange.beatsPerMeasure = params[0];
curChange.stepsPerBeat = params[1];
curChange.stepsPerBeat = Math.floor(16 / params[1]); // convert from denominator to stepsPerBeat
curChange.stepTime = CoolUtil.floorInt(curChange.stepTime + .99998);
curChange.beatTime = CoolUtil.floorInt(curChange.beatTime + .99998);
curChange.measureTime = CoolUtil.floorInt(curChange.measureTime + .99998);
} else if (name == "Continuous BPM Change") {
}
else if (name == "Continuous BPM Change") {
var prevBPM = curChange.bpm;
if (curChange.bpm == params[0]) {
invalidEvents.push(e);
@@ -266,7 +291,7 @@ final class Conductor
bpmChangeMap = [curChange];
invalidEvents = [];
for(event in Charter.instance.eventsGroup.members) {
for (event in Charter.instance.eventsGroup.members) {
event.events.sort(function(a, b) {
if (MathUtil.equal(a.time, b.time)) {
if (a.name == "Continuous BPM Change") return 1;
@@ -282,11 +307,8 @@ final class Conductor
if ((e.name == "BPM Change" || e.name == "Time Signature Change" || e.name == "Continuous BPM Change")) {
curChange = mapEvent(e, curChange);
}
}
}
}
private static var elapsed:Float;
@@ -303,12 +325,10 @@ final class Conductor
return;
}
if (lastSongPos != (lastSongPos = FlxG.sound.music.time - songOffset)) {
// update conductor
if (lastSongPos != (lastSongPos = FlxG.sound.music.time - songOffset))
songPosition = lastSongPos;
} else {
else
songPosition += songOffset + elapsed * 1000;
}
}
private static function onStateSwitch(newState:FlxState) {
source/funkin/backend/system/framerate/ConductorInfo.hx
+1 -1
View File
@@ -13,7 +13,7 @@ class ConductorInfo extends FramerateCategory {
_text += '\n - ${Conductor.curStep} steps';
_text += '\n - ${Conductor.curMeasure} measures';
_text += '\nCurrent BPM: ${Conductor.bpm}';
_text += '\nTime Signature: ${Conductor.beatsPerMeasure}/${Conductor.stepsPerBeat}';
_text += '\nTime Signature: ${Conductor.beatsPerMeasure}/${Conductor.denominator}';
this.text.text = _text;
super.__enterFrame(t);