From b75c7c23614785fd31af2bdd2c6b059fd6c4f1b9 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Thu, 28 Mar 2024 23:08:50 -0400 Subject: [PATCH] funkVis html5 --- hmm.json | 2 +- source/funkin/audio/visualize/ABotVis.hx | 3 ++- source/funkin/audio/visualize/AudioClip.hx | 23 ---------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 source/funkin/audio/visualize/AudioClip.hx diff --git a/hmm.json b/hmm.json index 81624a08a..430f33f0d 100644 --- a/hmm.json +++ b/hmm.json @@ -49,7 +49,7 @@ "name": "funkVis", "type": "git", "dir": null, - "ref": "0ac2fffa67fd30563df97c66718551efa92d283e", + "ref": "backend-rework", "url": "https://github.com/FunkinCrew/funkVis" }, { diff --git a/source/funkin/audio/visualize/ABotVis.hx b/source/funkin/audio/visualize/ABotVis.hx index a8b6fb937..1188d389f 100644 --- a/source/funkin/audio/visualize/ABotVis.hx +++ b/source/funkin/audio/visualize/ABotVis.hx @@ -9,6 +9,7 @@ import flixel.math.FlxMath; import flixel.sound.FlxSound; import funkin.util.MathUtil; import funkVis.dsp.SpectralAnalyzer; +import funkVis.audioclip.frontends.LimeAudioClip; using Lambda; @@ -57,7 +58,7 @@ class ABotVis extends FlxTypedSpriteGroup public function initAnalyzer() { @:privateAccess - analyzer = new SpectralAnalyzer(7, new AudioClip(cast snd._channel.__source), 0.01, 30); + analyzer = new SpectralAnalyzer(7, new LimeAudioClip(cast snd._channel.__source), 0.01, 30); analyzer.maxDb = -35; // analyzer.fftN = 2048; } diff --git a/source/funkin/audio/visualize/AudioClip.hx b/source/funkin/audio/visualize/AudioClip.hx deleted file mode 100644 index a8e353799..000000000 --- a/source/funkin/audio/visualize/AudioClip.hx +++ /dev/null @@ -1,23 +0,0 @@ -package funkin.audio.visualize; - -import flixel.FlxG; -import flixel.math.FlxMath; -import funkVis.AudioBuffer; -import lime.media.AudioSource; - -class AudioClip implements funkVis.AudioClip -{ - public var audioBuffer(default, null):AudioBuffer; - public var currentFrame(get, never):Int; - - public function new(audioSource:AudioSource) - { - var data:lime.utils.UInt16Array = cast audioSource.buffer.data; - this.audioBuffer = new AudioBuffer(data, audioSource.buffer.sampleRate); - } - - private function get_currentFrame():Int - { - return Std.int(FlxMath.remapToRange(FlxG.sound.music.time, 0, FlxG.sound.music.length, 0, audioBuffer.data.length / 2)); - } -}