mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2024-11-14 19:25:16 -05:00
Update OpenFL to latest (requires a few fixes)
This commit is contained in:
parent
9de51fd7d1
commit
68b7610225
7 changed files with 15 additions and 13 deletions
14
hmm.json
14
hmm.json
|
@ -23,8 +23,10 @@
|
|||
},
|
||||
{
|
||||
"name": "flixel-text-input",
|
||||
"type": "haxelib",
|
||||
"version": "1.1.0"
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "951a0103a17bfa55eed86703ce50b4fb0d7590bc",
|
||||
"url": "https://github.com/FunkinCrew/flixel-text-input"
|
||||
},
|
||||
{
|
||||
"name": "flixel-ui",
|
||||
|
@ -75,14 +77,14 @@
|
|||
"name": "haxeui-core",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "5dc4c933bdc029f6139a47962e3b8c754060f210",
|
||||
"ref": "22f7c5a8ffca90d4677cffd6e570f53761709fbc",
|
||||
"url": "https://github.com/haxeui/haxeui-core"
|
||||
},
|
||||
{
|
||||
"name": "haxeui-flixel",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "57c1604d6b5174839d7e0e012a4dd5dcbfc129da",
|
||||
"ref": "28bb710d0ae5d94b5108787593052165be43b980",
|
||||
"url": "https://github.com/haxeui/haxeui-flixel"
|
||||
},
|
||||
{
|
||||
|
@ -141,7 +143,7 @@
|
|||
"name": "lime",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "a393a54b6120bfa9a2f1db5a16fbf1137d41f257",
|
||||
"ref": "f6153ffcb1ffcf733f91d531eac5fda4189e07f7",
|
||||
"url": "https://github.com/FunkinCrew/lime"
|
||||
},
|
||||
{
|
||||
|
@ -190,7 +192,7 @@
|
|||
"name": "thx.core",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "6240b6e136f7490d9298edbe8c1891374bd7cdf2",
|
||||
"ref": "76d87418fadd92eb8e1b61f004cff27d656e53dd",
|
||||
"url": "https://github.com/fponticelli/thx.core"
|
||||
},
|
||||
{
|
||||
|
|
|
@ -54,7 +54,7 @@ class ABotVis extends FlxTypedSpriteGroup<FlxSprite>
|
|||
public function initAnalyzer()
|
||||
{
|
||||
@:privateAccess
|
||||
analyzer = new SpectralAnalyzer(snd._channel.__source, 7, 0.1, 40);
|
||||
analyzer = new SpectralAnalyzer(snd._channel.__audioSource, 7, 0.1, 40);
|
||||
|
||||
#if desktop
|
||||
// On desktop it uses FFT stuff that isn't as optimized as the direct browser stuff we use on HTML5
|
||||
|
|
|
@ -117,7 +117,7 @@ class VisShit
|
|||
{
|
||||
// Math.pow3
|
||||
@:privateAccess
|
||||
var buf = snd._channel.__source.buffer;
|
||||
var buf = snd._channel.__audioSource.buffer;
|
||||
|
||||
// @:privateAccess
|
||||
audioData = cast buf.data; // jank and hacky lol! kinda busted on HTML5 also!!
|
||||
|
|
|
@ -16,7 +16,7 @@ class WaveformDataParser
|
|||
|
||||
// Method 1. This only works if the sound has been played before.
|
||||
@:privateAccess
|
||||
var soundBuffer:Null<lime.media.AudioBuffer> = sound?._channel?.__source?.buffer;
|
||||
var soundBuffer:Null<lime.media.AudioBuffer> = sound?._channel?.__audioSource?.buffer;
|
||||
|
||||
if (soundBuffer == null)
|
||||
{
|
||||
|
|
|
@ -192,7 +192,7 @@ class ChartEditorNoteDataToolbox extends ChartEditorBaseToolbox
|
|||
var paramStepper:NumberStepper = new NumberStepper();
|
||||
paramStepper.value = (setParamsToPlace ? chartEditorState.noteParamsToPlace[i].value : param.data?.defaultValue) ?? 0.0;
|
||||
paramStepper.percentWidth = 100;
|
||||
paramStepper.step = param.data?.step ?? 1;
|
||||
paramStepper.step = param.data?.step ?? 1.0;
|
||||
|
||||
// this check should be unnecessary but for some reason
|
||||
// even when these are null it will set it to 0
|
||||
|
@ -283,7 +283,7 @@ class ChartEditorNoteDataToolbox extends ChartEditorBaseToolbox
|
|||
return;
|
||||
}
|
||||
|
||||
var heightToSet:Int = Std.int(Math.max(DIALOG_HEIGHT, (toolboxNotesGrid?.height ?? 50) + HEIGHT_OFFSET)) + MINIMIZE_FIX;
|
||||
var heightToSet:Int = Std.int(Math.max(DIALOG_HEIGHT, (toolboxNotesGrid?.height ?? 50.0) + HEIGHT_OFFSET)) + MINIMIZE_FIX;
|
||||
if (this.height != heightToSet)
|
||||
{
|
||||
this.height = heightToSet;
|
||||
|
|
|
@ -1527,7 +1527,7 @@ class FreeplayState extends MusicBeatSubState
|
|||
var moveDataX = funnyMoveShit.x ?? spr.x;
|
||||
var moveDataY = funnyMoveShit.y ?? spr.y;
|
||||
var moveDataSpeed = funnyMoveShit.speed ?? 0.2;
|
||||
var moveDataWait = funnyMoveShit.wait ?? 0;
|
||||
var moveDataWait = funnyMoveShit.wait ?? 0.0;
|
||||
|
||||
FlxTween.tween(spr, {x: moveDataX, y: moveDataY}, moveDataSpeed, {ease: FlxEase.expoIn});
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ class LevelProp extends Bopper
|
|||
this.propData = value;
|
||||
|
||||
this.visible = this.propData != null;
|
||||
danceEvery = this.propData?.danceEvery ?? 0;
|
||||
danceEvery = this.propData?.danceEvery ?? 0.0;
|
||||
|
||||
applyData();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue