Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'secret/rewrite/master' into downscroll

Browse source
This commit is contained in:
EliteMasterEric 2024-05-28 21:57:29 -04:00
commit f0cd6c50c8
13 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/api/newgrounds/NGUnsafe.hx
View file

@ -1,9 +1,5 @@
package funkin.api.newgrounds; package funkin.api.newgrounds;
import flixel.util.FlxSignal;
import flixel.util.FlxTimer;
import lime.app.Application;
import openfl.display.Stage;
#if newgrounds #if newgrounds
import io.newgrounds.NG; import io.newgrounds.NG;
import io.newgrounds.NGLite; import io.newgrounds.NGLite;

8
source/funkin/api/newgrounds/NGio.hx
View file

@ -2,19 +2,11 @@ package funkin.api.newgrounds;
#if newgrounds #if newgrounds
import flixel.util.FlxSignal; import flixel.util.FlxSignal;
import flixel.util.FlxTimer;
import io.newgrounds.NG; import io.newgrounds.NG;
import io.newgrounds.NGLite; import io.newgrounds.NGLite;
import io.newgrounds.components.ScoreBoardComponent.Period;
import io.newgrounds.objects.Error; import io.newgrounds.objects.Error;
import io.newgrounds.objects.Medal;
import io.newgrounds.objects.Score; import io.newgrounds.objects.Score;
import io.newgrounds.objects.ScoreBoard;
import io.newgrounds.objects.events.Response;
import io.newgrounds.objects.events.Result.GetCurrentVersionResult;
import io.newgrounds.objects.events.Result.GetVersionResult;
import lime.app.Application; import lime.app.Application;
import openfl.display.Stage;
#end #end
/** /**

3
source/funkin/audio/FunkinSound.hx
View file

@ -11,10 +11,9 @@ import funkin.audio.waveform.WaveformDataParser;
import funkin.data.song.SongData.SongMusicData; import funkin.data.song.SongData.SongMusicData;
import funkin.data.song.SongRegistry; import funkin.data.song.SongRegistry;
import funkin.util.tools.ICloneable; import funkin.util.tools.ICloneable;
import openfl.Assets;
import openfl.media.SoundMixer; import openfl.media.SoundMixer;
#if (openfl >= "8.0.0") #if (openfl >= "8.0.0")
import openfl.utils.AssetType;
#end #end
/** /**

2
source/funkin/audio/VoicesGroup.hx
View file

@ -1,9 +1,7 @@
package funkin.audio; package funkin.audio;
import funkin.audio.FunkinSound;
import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxGroup.FlxTypedGroup;
import funkin.audio.waveform.WaveformData; import funkin.audio.waveform.WaveformData;
import funkin.audio.waveform.WaveformDataParser;
class VoicesGroup extends SoundGroup class VoicesGroup extends SoundGroup
{ {

4
source/funkin/audio/visualize/ABotVis.hx
View file

@ -1,13 +1,9 @@
package funkin.audio.visualize; package funkin.audio.visualize;
import funkin.audio.visualize.dsp.FFT;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.addons.plugin.taskManager.FlxTask;
import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
import flixel.math.FlxMath;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import funkin.util.MathUtil;
import funkin.vis.dsp.SpectralAnalyzer; import funkin.vis.dsp.SpectralAnalyzer;
import funkin.vis.audioclip.frontends.LimeAudioClip; import funkin.vis.audioclip.frontends.LimeAudioClip;

1
source/funkin/audio/visualize/PolygonVisGroup.hx
View file

@ -1,6 +1,5 @@
package funkin.audio.visualize; package funkin.audio.visualize;
import funkin.audio.visualize.PolygonSpectogram;
import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;

12
source/funkin/audio/visualize/SpectogramSprite.hx
View file

@ -8,8 +8,6 @@ import flixel.sound.FlxSound;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import funkin.audio.visualize.PolygonSpectogram.VISTYPE; import funkin.audio.visualize.PolygonSpectogram.VISTYPE;
import funkin.audio.visualize.VisShit.CurAudioInfo; import funkin.audio.visualize.VisShit.CurAudioInfo;
import funkin.audio.visualize.dsp.FFT;
import lime.system.ThreadPool;
import lime.utils.Int16Array; import lime.utils.Int16Array;
using Lambda; using Lambda;
@ -38,8 +36,6 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
lengthOfShit = amnt; lengthOfShit = amnt;
regenLineShit(); regenLineShit();
// makeGraphic(200, 200, FlxColor.BLACK);
} }
public function regenLineShit():Void public function regenLineShit():Void
@ -89,8 +85,6 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
{ {
checkAndSetBuffer(); checkAndSetBuffer();
// vis.checkAndSetBuffer();
if (setBuffer) if (setBuffer)
{ {
var samplesToGen:Int = Std.int(sampleRate * seconds); var samplesToGen:Int = Std.int(sampleRate * seconds);
@ -191,7 +185,6 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
// a value between 10hz and 100Khz // a value between 10hz and 100Khz
var hzPicker:Float = Math.pow(10, powedShit); var hzPicker:Float = Math.pow(10, powedShit);
// var sampleApprox:Int = Std.int(FlxMath.remapToRange(i, 0, group.members.length, startingSample, startingSample + samplesToGen));
var remappedFreq:Int = Std.int(FlxMath.remapToRange(hzPicker, 0, 10000, 0, freqShit[0].length - 1)); var remappedFreq:Int = Std.int(FlxMath.remapToRange(hzPicker, 0, 10000, 0, freqShit[0].length - 1));
group.members[i].x = prevLine.x; group.members[i].x = prevLine.x;
@ -211,8 +204,6 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
var line = FlxPoint.get(prevLine.x - group.members[i].x, prevLine.y - group.members[i].y); var line = FlxPoint.get(prevLine.x - group.members[i].x, prevLine.y - group.members[i].y);
// dont draw a line until i figure out a nicer way to view da spikes and shit idk lol! // dont draw a line until i figure out a nicer way to view da spikes and shit idk lol!
// group.members[i].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1));
// group.members[i].angle = line.degrees;
} }
} }
} }
@ -261,9 +252,6 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
group.members[Std.int(remappedSample)].x = prevLine.x; group.members[Std.int(remappedSample)].x = prevLine.x;
group.members[Std.int(remappedSample)].y = prevLine.y; group.members[Std.int(remappedSample)].y = prevLine.y;
// group.members[0].y = prevLine.y;
// FlxSpriteUtil.drawLine(this, prevLine.x, prevLine.y, width * remappedSample, left * height / 2 + height / 2);
prevLine.x = (curAud.balanced * swagheight / 2 + swagheight / 2) + x; prevLine.x = (curAud.balanced * swagheight / 2 + swagheight / 2) + x;
prevLine.y = (Std.int(remappedSample) / lengthOfShit * daHeight) + y; prevLine.y = (Std.int(remappedSample) / lengthOfShit * daHeight) + y;

5
source/funkin/audio/visualize/VisShit.hx
View file

@ -3,7 +3,6 @@ package funkin.audio.visualize;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.sound.FlxSound; import flixel.sound.FlxSound;
import funkin.audio.visualize.dsp.FFT; import funkin.audio.visualize.dsp.FFT;
import lime.system.ThreadPool;
import lime.utils.Int16Array; import lime.utils.Int16Array;
import funkin.util.MathUtil; import funkin.util.MathUtil;
@ -73,9 +72,6 @@ class VisShit
freqOutput.push([]); freqOutput.push([]);
// if (FlxG.keys.justPressed.M)
// trace(FFT.rfft(chunk).map(z -> z.scale(1 / fs).magnitude));
// find spectral peaks and their instantaneous frequencies // find spectral peaks and their instantaneous frequencies
for (k => s in freqs) for (k => s in freqs)
{ {
@ -91,7 +87,6 @@ class VisShit
if (freq < maxFreq) freqOutput[indexOfArray].push(power); if (freq < maxFreq) freqOutput[indexOfArray].push(power);
// //
} }
// haxe.Log.trace("", null);
indexOfArray++; indexOfArray++;
// move to next (overlapping) chunk // move to next (overlapping) chunk

2
source/funkin/audio/visualize/dsp/FFT.hx
View file

@ -1,7 +1,5 @@
package funkin.audio.visualize.dsp; package funkin.audio.visualize.dsp;
import funkin.audio.visualize.dsp.Complex;
using funkin.audio.visualize.dsp.OffsetArray; using funkin.audio.visualize.dsp.OffsetArray;
using funkin.audio.visualize.dsp.Signal; using funkin.audio.visualize.dsp.Signal;

2
source/funkin/audio/waveform/WaveformData.hx
View file

@ -1,7 +1,5 @@
package funkin.audio.waveform; package funkin.audio.waveform;
import funkin.util.MathUtil;
@:nullSafety @:nullSafety
class WaveformData class WaveformData
{ {

2
source/funkin/audio/waveform/WaveformSprite.hx
View file

@ -1,7 +1,5 @@
package funkin.audio.waveform; package funkin.audio.waveform;
import funkin.audio.waveform.WaveformData;
import funkin.audio.waveform.WaveformDataParser;
import funkin.graphics.rendering.MeshRender; import funkin.graphics.rendering.MeshRender;
import flixel.util.FlxColor; import flixel.util.FlxColor;

2
source/funkin/data/dialogue/conversation/ConversationData.hx
View file

@ -1,7 +1,5 @@
package funkin.data.dialogue.conversation; package funkin.data.dialogue.conversation;
import funkin.data.animation.AnimationData;
/** /**
* A type definition for the data for a specific conversation. * A type definition for the data for a specific conversation.
* It includes things like what dialogue boxes to use, what text to display, and what animations to play. * It includes things like what dialogue boxes to use, what text to display, and what animations to play.

1
source/funkin/data/dialogue/conversation/ConversationRegistry.hx
View file

@ -1,7 +1,6 @@
package funkin.data.dialogue.conversation; package funkin.data.dialogue.conversation;
import funkin.play.cutscene.dialogue.Conversation; import funkin.play.cutscene.dialogue.Conversation;
import funkin.data.dialogue.conversation.ConversationData;
import funkin.play.cutscene.dialogue.ScriptedConversation; import funkin.play.cutscene.dialogue.ScriptedConversation;
class ConversationRegistry extends BaseRegistry<Conversation, ConversationData> class ConversationRegistry extends BaseRegistry<Conversation, ConversationData>