cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-26 23:16:46 +00:00
Code Issues Releases Wiki Activity

Updated hmm deps, no more forks!

Browse source
This commit is contained in:
Eric Myllyoja 2022-06-12 00:02:49 -04:00
parent 05db82c828
commit 705d0ed5b9
7 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hmm.json
View file

@ -7,18 +7,11 @@
"ref": "2d83fa8", "ref": "2d83fa8",
"url": "https://github.com/Aidan63/linc_discord-rpc" "url": "https://github.com/Aidan63/linc_discord-rpc"
}, },
{
"name": "firetongue",
"type": "git",
"dir": null,
"ref": "c5666c8",
"url": "https://github.com/larsiusprime/firetongue"
},
{ {
"name": "flixel", "name": "flixel",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "93a049d6", "ref": "0637ac4",
"url": "https://github.com/haxeflixel/flixel" "url": "https://github.com/haxeflixel/flixel"
}, },
{ {
@ -35,8 +28,8 @@
"name": "hscript", "name": "hscript",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "1f5c498", "ref": "7124b6c",
"url": "https://github.com/mastereric/hscript" "url": "https://github.com/HaxeFoundation/hscript"
}, },
{ {
"name": "hxcpp", "name": "hxcpp",
@ -62,7 +55,7 @@
"name": "polymod", "name": "polymod",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "cd4600c", "ref": "4c2c949",
"url": "https://github.com/larsiusprime/polymod" "url": "https://github.com/larsiusprime/polymod"
}, },
{ {

33
source/funkin/Controls.hx
View file

@ -1,5 +1,6 @@
package funkin; package funkin;
import flixel.util.FlxDirectionFlags;
import flixel.FlxObject; import flixel.FlxObject;
import flixel.input.FlxInput; import flixel.input.FlxInput;
import flixel.input.actions.FlxAction; import flixel.input.actions.FlxAction;
@ -544,7 +545,7 @@ class Controls extends FlxActionSet
forEachBound(control, function(action, state) addKeys(action, keys, state)); forEachBound(control, function(action, state) addKeys(action, keys, state));
} }
public function bindSwipe(control:Control, swipeDir:Int = FlxObject.UP, ?swpLength:Float = 90) public function bindSwipe(control:Control, swipeDir:Int = FlxDirectionFlags.UP, ?swpLength:Float = 90)
{ {
forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press, swpLength))); forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press, swpLength)));
} }
@ -635,16 +636,16 @@ class Controls extends FlxActionSet
#if FLX_TOUCH #if FLX_TOUCH
// MAKE BETTER TOUCH BIND CODE // MAKE BETTER TOUCH BIND CODE
bindSwipe(Control.NOTE_UP, FlxObject.UP, 40); bindSwipe(Control.NOTE_UP, FlxDirectionFlags.UP, 40);
bindSwipe(Control.NOTE_DOWN, FlxObject.DOWN, 40); bindSwipe(Control.NOTE_DOWN, FlxDirectionFlags.DOWN, 40);
bindSwipe(Control.NOTE_LEFT, FlxObject.LEFT, 40); bindSwipe(Control.NOTE_LEFT, FlxDirectionFlags.LEFT, 40);
bindSwipe(Control.NOTE_RIGHT, FlxObject.RIGHT, 40); bindSwipe(Control.NOTE_RIGHT, FlxDirectionFlags.RIGHT, 40);
// feels more like drag when up/down are inversed // feels more like drag when up/down are inversed
bindSwipe(Control.UI_UP, FlxObject.DOWN); bindSwipe(Control.UI_UP, FlxDirectionFlags.DOWN);
bindSwipe(Control.UI_DOWN, FlxObject.UP); bindSwipe(Control.UI_DOWN, FlxDirectionFlags.UP);
bindSwipe(Control.UI_LEFT, FlxObject.LEFT); bindSwipe(Control.UI_LEFT, FlxDirectionFlags.LEFT);
bindSwipe(Control.UI_RIGHT, FlxObject.RIGHT); bindSwipe(Control.UI_RIGHT, FlxDirectionFlags.RIGHT);
#end #end
#if android #if android
@ -870,7 +871,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
var activateLength:Float = 90; var activateLength:Float = 90;
var hapticPressure:Int = 100; var hapticPressure:Int = 100;
public function new(swipeDir:Int = FlxObject.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90) public function new(swipeDir:Int = FlxDirectionFlags.ANY, Trigger:FlxInputState, ?swipeLength:Float = 90)
{ {
super(OTHER, swipeDir, Trigger); super(OTHER, swipeDir, Trigger);
@ -933,9 +934,9 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
/* switch (inputID) /* switch (inputID)
{ {
case FlxObject.UP: case FlxDirectionFlags.UP:
return return
case FlxObject.DOWN: case FlxDirectionFlags.DOWN:
} }
*/ */
} }
@ -955,13 +956,13 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
{ {
switch (inputID) switch (inputID)
{ {
case FlxObject.UP: case FlxDirectionFlags.UP:
if (degAngle >= 45 && degAngle <= 90 + 45) return properTouch(swp); if (degAngle >= 45 && degAngle <= 90 + 45) return properTouch(swp);
case FlxObject.DOWN: case FlxDirectionFlags.DOWN:
if (-degAngle >= 45 && -degAngle <= 90 + 45) return properTouch(swp); if (-degAngle >= 45 && -degAngle <= 90 + 45) return properTouch(swp);
case FlxObject.LEFT: case FlxDirectionFlags.LEFT:
if (degAngle <= 45 && -degAngle <= 45) return properTouch(swp); if (degAngle <= 45 && -degAngle <= 45) return properTouch(swp);
case FlxObject.RIGHT: case FlxDirectionFlags.RIGHT:
if (degAngle >= 90 + 45 && degAngle <= -90 + -45) return properTouch(swp); if (degAngle >= 90 + 45 && degAngle <= -90 + -45) return properTouch(swp);
} }
} }

4
source/funkin/animate/TimelineFrame.hx
View file

@ -2,7 +2,7 @@ package funkin.animate;
import funkin.animate.ParseAnimate.Frame; import funkin.animate.ParseAnimate.Frame;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.input.mouse.FlxMouseEventManager; import flixel.input.mouse.FlxMouseEvent;
import flixel.util.FlxColor; import flixel.util.FlxColor;
class TimelineFrame extends FlxSprite class TimelineFrame extends FlxSprite
@ -17,7 +17,7 @@ class TimelineFrame extends FlxSprite
makeGraphic((10 * length) + (2 * (length - 1)), 10, FlxColor.RED); makeGraphic((10 * length) + (2 * (length - 1)), 10, FlxColor.RED);
FlxMouseEventManager.add(this, null, null, function(spr:TimelineFrame) FlxMouseEvent.add(this, null, null, function(spr:TimelineFrame)
{ {
alpha = 0.5; alpha = 0.5;
}, function(spr:TimelineFrame) }, function(spr:TimelineFrame)

6
source/funkin/audiovis/SpectogramSprite.hx
View file

@ -113,7 +113,7 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
prevLine.x = (curAud.balanced * swagheight / 2 + swagheight / 2) + x; prevLine.x = (curAud.balanced * swagheight / 2 + swagheight / 2) + x;
prevLine.y = (i / group.members.length * daHeight) + y; prevLine.y = (i / group.members.length * daHeight) + y;
var line = FlxVector.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);
group.members[i].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1)); group.members[i].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1));
group.members[i].angle = line.degrees; group.members[i].angle = line.degrees;
@ -230,7 +230,7 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
prevLine.x = (freqIDK * swagheight / 2 + swagheight / 2) + x; prevLine.x = (freqIDK * swagheight / 2 + swagheight / 2) + x;
prevLine.y = (i / group.members.length * daHeight) + y; prevLine.y = (i / group.members.length * daHeight) + y;
var line = FlxVector.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].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1));
@ -290,7 +290,7 @@ class SpectogramSprite extends FlxTypedSpriteGroup<FlxSprite>
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;
var line = FlxVector.get(prevLine.x - group.members[Std.int(remappedSample)].x, prevLine.y - group.members[Std.int(remappedSample)].y); var line = FlxPoint.get(prevLine.x - group.members[Std.int(remappedSample)].x, prevLine.y - group.members[Std.int(remappedSample)].y);
group.members[Std.int(remappedSample)].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1)); group.members[Std.int(remappedSample)].setGraphicSize(Std.int(Math.max(line.length, 1)), Std.int(1));
group.members[Std.int(remappedSample)].angle = line.degrees; group.members[Std.int(remappedSample)].angle = line.degrees;

5
source/funkin/play/PicoFight.hx
View file

@ -8,6 +8,7 @@ import flixel.math.FlxMath;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import funkin.Note.NoteData; import funkin.Note.NoteData;
import funkin.audiovis.PolygonSpectogram; import funkin.audiovis.PolygonSpectogram;
import flixel.util.FlxDirectionFlags;
class PicoFight extends MusicBeatState class PicoFight extends MusicBeatState
{ {
@ -88,12 +89,12 @@ class PicoFight extends MusicBeatState
if (notes.strumTime < Conductor.songPosition + (Conductor.crochet * 4)) if (notes.strumTime < Conductor.songPosition + (Conductor.crochet * 4))
{ {
spawnNote(notes); spawnNote(notes);
spawnNote(notes, FlxObject.RIGHT); spawnNote(notes, FlxDirectionFlags.RIGHT);
} }
} }
} }
function spawnNote(note:NoteData, facing:Int = FlxObject.LEFT) function spawnNote(note:NoteData, facing:Int = FlxDirectionFlags.LEFT)
{ {
var spr:FlxSprite = new FlxSprite(0, (FlxG.height / 2) - 60).makeGraphic(10, 120, Note.codeColors[note.noteData]); var spr:FlxSprite = new FlxSprite(0, (FlxG.height / 2) - 60).makeGraphic(10, 120, Note.codeColors[note.noteData]);
spr.ID = Std.int(note.strumTime); // using ID as strum, lol! spr.ID = Std.int(note.strumTime); // using ID as strum, lol!

4
source/funkin/ui/stageBuildShit/SprStage.hx
View file

@ -1,7 +1,7 @@
package funkin.ui.stageBuildShit; package funkin.ui.stageBuildShit;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.input.mouse.FlxMouseEventManager; import flixel.input.mouse.FlxMouseEvent;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
class SprStage extends FlxSprite class SprStage extends FlxSprite
@ -18,7 +18,7 @@ class SprStage extends FlxSprite
{ {
super(x, y); super(x, y);
FlxMouseEventManager.add(this, dragShitFunc, null, function(spr:SprStage) FlxMouseEvent.add(this, dragShitFunc, null, function(spr:SprStage)
{ {
if (isSelected() || StageBuilderState.curTool == SELECT) if (isSelected() || StageBuilderState.curTool == SELECT)
alpha = 0.5; alpha = 0.5;

6
source/funkin/ui/stageBuildShit/StageBuilderState.hx
View file

@ -5,7 +5,7 @@ import flixel.FlxSprite;
import flixel.addons.display.FlxGridOverlay; import flixel.addons.display.FlxGridOverlay;
import flixel.group.FlxGroup; import flixel.group.FlxGroup;
import flixel.input.mouse.FlxMouseButton.FlxMouseButtonID; import flixel.input.mouse.FlxMouseButton.FlxMouseButtonID;
import flixel.input.mouse.FlxMouseEventManager; import flixel.input.mouse.FlxMouseEvent;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.ui.FlxButton; import flixel.ui.FlxButton;
@ -93,8 +93,6 @@ class StageBuilderState extends MusicBeatState
var saveSceneBtn:FlxButton = new FlxButton(20, 50, "Save Scene", saveScene); var saveSceneBtn:FlxButton = new FlxButton(20, 50, "Save Scene", saveScene);
hudGrp.add(saveSceneBtn); hudGrp.add(saveSceneBtn);
FlxMouseEventManager.init();
#if desktop #if desktop
FlxG.stage.window.onDropFile.add(function(path:String) FlxG.stage.window.onDropFile.add(function(path:String)
{ {
@ -424,7 +422,7 @@ class StageBuilderState extends MusicBeatState
{ {
sprGrp.sort(daLayerSorting, FlxSort.ASCENDING); sprGrp.sort(daLayerSorting, FlxSort.ASCENDING);
FlxMouseEventManager.reorder(); FlxMouseEvent.reorder();
} }
function daLayerSorting(order:Int = FlxSort.ASCENDING, layer1:SprStage, layer2:SprStage):Int function daLayerSorting(order:Int = FlxSort.ASCENDING, layer1:SprStage, layer2:SprStage):Int