fix decimal bpms for sm charts and other bpm changes

This commit is contained in:
KadeDeveloper
2021-07-26 14:02:26 -07:00
parent 6010812204
commit a0471bdd35
3 changed files with 20 additions and 10 deletions

View File

@ -638,7 +638,7 @@ class ChartingState extends MusicBeatState
var eventPos = new FlxUIInputText(150,100,80,""); var eventPos = new FlxUIInputText(150,100,80,"");
var eventAdd = new FlxButton(95,155,"Add Event", function() { var eventAdd = new FlxButton(95,155,"Add Event", function() {
var pog:Song.Event = new Song.Event("New Event " + HelperFunctions.truncateFloat(curDecimalBeat, 3),HelperFunctions.truncateFloat(curDecimalBeat, 3),_song.bpm + "","BPM Change"); var pog:Song.Event = new Song.Event("New Event " + HelperFunctions.truncateFloat(curDecimalBeat, 3),HelperFunctions.truncateFloat(curDecimalBeat, 3),_song.bpm,"BPM Change");
trace("adding " + pog.name); trace("adding " + pog.name);
@ -653,13 +653,13 @@ class ChartingState extends MusicBeatState
eventName.text = pog.name; eventName.text = pog.name;
eventType.selectedLabel = pog.type; eventType.selectedLabel = pog.type;
eventValue.text = pog.value; eventValue.text = pog.value + "";
eventPos.text = pog.position + ""; eventPos.text = pog.position + "";
currentSelectedEventName = pog.name; currentSelectedEventName = pog.name;
currentEventPosition = pog.position; currentEventPosition = pog.position;
savedType = pog.type; savedType = pog.type;
savedValue = pog.value; savedValue = pog.value + "";
var listofnames = []; var listofnames = [];
@ -737,13 +737,13 @@ class ChartingState extends MusicBeatState
eventName.text = firstEvent.name; eventName.text = firstEvent.name;
eventType.selectedLabel = firstEvent.type; eventType.selectedLabel = firstEvent.type;
eventValue.text = firstEvent.value; eventValue.text = firstEvent.value + "";
eventPos.text = firstEvent.position + ""; eventPos.text = firstEvent.position + "";
currentSelectedEventName = firstEvent.name; currentSelectedEventName = firstEvent.name;
currentEventPosition = firstEvent.position; currentEventPosition = firstEvent.position;
savedType = firstEvent.type; savedType = firstEvent.type;
savedValue = firstEvent.value; savedValue = firstEvent.value + "";
var listofnames = []; var listofnames = [];
@ -838,7 +838,7 @@ class ChartingState extends MusicBeatState
trace("bruh"); trace("bruh");
eventType.selectedLabel = firstEventObject.type; eventType.selectedLabel = firstEventObject.type;
trace("bruh"); trace("bruh");
eventValue.text = firstEventObject.value; eventValue.text = firstEventObject.value + "";
trace("bruh"); trace("bruh");
currentSelectedEventName = firstEventObject.name; currentSelectedEventName = firstEventObject.name;
trace("bruh"); trace("bruh");
@ -858,7 +858,7 @@ class ChartingState extends MusicBeatState
trace('selecting ' + name + ' found: ' + event); trace('selecting ' + name + ' found: ' + event);
eventName.text = event.name; eventName.text = event.name;
eventValue.text = event.value; eventValue.text = event.value + "";
eventPos.text = event.position + ""; eventPos.text = event.position + "";
eventType.selectedLabel = event.type; eventType.selectedLabel = event.type;
currentSelectedEventName = event.name; currentSelectedEventName = event.name;

View File

@ -11,10 +11,10 @@ class Event
{ {
public var name:String; public var name:String;
public var position:Float; public var position:Float;
public var value:Dynamic; public var value:Float;
public var type:String; public var type:String;
public function new(name:String,pos:Float,value:Dynamic,type:String) public function new(name:String,pos:Float,value:Float,type:String)
{ {
this.name = name; this.name = name;
this.position = pos; this.position = pos;

View File

@ -73,13 +73,23 @@ class SMHeader
TimingStruct.AllTimings[currentIndex].startTime = data.startTime + data.length; TimingStruct.AllTimings[currentIndex].startTime = data.startTime + data.length;
} }
changeEvents.push(new Song.Event(HelperFunctions.truncateFloat(beat,0) + "SM",beat,bpm,"BPM Change")); changeEvents.push(new Song.Event(HelperFunctions.truncateFloat(beat,3) + "SM",beat,bpm,"BPM Change"));
if (bpmSplit.length == 1) if (bpmSplit.length == 1)
break; break;
currentIndex++; currentIndex++;
} }
for(i in TimingStruct.AllTimings)
{
trace("BPM - " + i.bpm + " - " + i.startBeat);
}
for(i in changeEvents)
{
trace("BPM - " + i.value + " - " + i.position);
}
trace(changeEvents.length + " - BPM CHANGES"); trace(changeEvents.length + " - BPM CHANGES");
return 0.0; return 0.0;
} }