AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

truncate float refactor

Browse Source
This commit is contained in:
KadeDev 2021-04-23 11:21:44 -07:00
parent 57478c3ef2
commit 412d611f04
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/Options.hx
View File

@ -191,11 +191,11 @@ class Judgement extends Option
Conductor.recalculateTimings(); Conductor.recalculateTimings();
OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description +
" - SIK: " + OptionsMenu.truncateFloat(45 * Conductor.timeScale, 0) + " - SIK: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) +
"ms GD: " + OptionsMenu.truncateFloat(90 * Conductor.timeScale, 0) + "ms GD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) +
"ms BD: " + OptionsMenu.truncateFloat(135 * Conductor.timeScale, 0) + "ms BD: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) +
"ms SHT: " + OptionsMenu.truncateFloat(155 * Conductor.timeScale, 0) + "ms SHT: " + HelperFunctions.truncateFloat(155 * Conductor.timeScale, 0) +
"ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; "ms TOTAL: " + HelperFunctions.truncateFloat(Conductor.safeZoneOffset,0) + "ms";
return true; return true;
} }
@ -210,11 +210,11 @@ class Judgement extends Option
Conductor.recalculateTimings(); Conductor.recalculateTimings();
OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description +
" - SIK: " + OptionsMenu.truncateFloat(44 * Conductor.timeScale, 0) + " - SIK: " + HelperFunctions.truncateFloat(44 * Conductor.timeScale, 0) +
"ms GD: " + OptionsMenu.truncateFloat(45 * Conductor.timeScale, 0) + "ms GD: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) +
"ms BD: " + OptionsMenu.truncateFloat(90 * Conductor.timeScale, 0) + "ms BD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) +
"ms SHT: " + OptionsMenu.truncateFloat(135 * Conductor.timeScale, 0) + "ms SHT: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) +
"ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; "ms TOTAL: " + HelperFunctions.truncateFloat(Conductor.safeZoneOffset,0) + "ms";
return true; return true;
} }
} }
@ -312,7 +312,7 @@ class ScrollSpeedOption extends Option
if (FlxG.save.data.scrollSpeed > 10) if (FlxG.save.data.scrollSpeed > 10)
FlxG.save.data.scrollSpeed = 10; FlxG.save.data.scrollSpeed = 10;
OptionsMenu.versionShit.text = "Current Scroll Speed: " + OptionsMenu.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; OptionsMenu.versionShit.text = "Current Scroll Speed: " + HelperFunctions.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description;
return true; return true;
} }
@ -326,7 +326,7 @@ class ScrollSpeedOption extends Option
FlxG.save.data.scrollSpeed = 10; FlxG.save.data.scrollSpeed = 10;
OptionsMenu.versionShit.text = "Current Scroll Speed: " + OptionsMenu.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; OptionsMenu.versionShit.text = "Current Scroll Speed: " + HelperFunctions.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description;
return true; return true;
} }
} }

12
source/OptionsMenu.hx
View File

@ -93,12 +93,6 @@ class OptionsMenu extends MusicBeatState
var isCat:Bool = false; var isCat:Bool = false;
public static function truncateFloat( number : Float, precision : Int): Float {
var num = number;
num = num * Math.pow(10, precision);
num = Math.round( num ) / Math.pow(10, precision);
return num;
}
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
@ -159,7 +153,7 @@ class OptionsMenu extends MusicBeatState
else if (FlxG.keys.pressed.LEFT) else if (FlxG.keys.pressed.LEFT)
FlxG.save.data.offset -= 0.1; FlxG.save.data.offset -= 0.1;
versionShit.text = "Offset (Left, Right, Shift for slow): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; versionShit.text = "Offset (Left, Right, Shift for slow): " + HelperFunctions.truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription;
} }
} }
else else
@ -176,7 +170,7 @@ class OptionsMenu extends MusicBeatState
else if (FlxG.keys.pressed.LEFT) else if (FlxG.keys.pressed.LEFT)
FlxG.save.data.offset -= 0.1; FlxG.save.data.offset -= 0.1;
versionShit.text = "Offset (Left, Right, Shift for slow): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; versionShit.text = "Offset (Left, Right, Shift for slow): " + HelperFunctions.truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription;
} }
@ -234,7 +228,7 @@ class OptionsMenu extends MusicBeatState
currentDescription = currentSelectedCat.getOptions()[curSelected].getDescription(); currentDescription = currentSelectedCat.getOptions()[curSelected].getDescription();
else else
currentDescription = "Please select a catagory"; currentDescription = "Please select a catagory";
versionShit.text = "Offset (Left, Right, Shift for slow): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; versionShit.text = "Offset (Left, Right, Shift for slow): " + HelperFunctions.truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription;
// selector.y = (70 * curSelected) + 30; // selector.y = (70 * curSelected) + 30;