gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move TouchUtil and SwipeUtil to funkin.util

Browse Source
This commit is contained in:
sector-a
2025-04-16 15:00:02 +03:00
committed by KarimAkra
parent 8b1b81a925
commit f970ea6acf
28 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/mobile/ui/FunkinButton.hx
+4 -6
View File
@@ -12,7 +12,7 @@ import flixel.input.touch.FlxTouch;
import flixel.math.FlxPoint;
import flixel.util.FlxDestroyUtil;
import flixel.util.FlxSignal;
import funkin.mobile.util.SwipeUtil;
import funkin.util.SwipeUtil;
import openfl.display.Graphics;
import haxe.ds.Map;
@@ -211,11 +211,9 @@ class FunkinButton extends FunkinSprite implements IFlxInput
touchID = touch.touchPointID;
if (buttonsTouchID.exists(touchID) && buttonsTouchID.get(touchID) != this)
{
var prevButton = buttonsTouchID.get(touchID);
if (prevButton != null && !prevButton.limitToBounds)
{
prevButton.onOutHandler();
}
final prevButton:Null<FunkinButton> = buttonsTouchID.get(touchID);
if (prevButton != null && !prevButton.limitToBounds) prevButton.onOutHandler();
}
buttonsTouchID.set(touchID, this);
source/funkin/mobile/ui/TouchPointer.hx
+1 -1
View File
@@ -14,7 +14,7 @@ import openfl.display.BitmapData;
import flixel.util.FlxDestroyUtil;
import openfl.display.Sprite;
import flixel.FlxSprite;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import flixel.math.FlxAngle;
import funkin.util.MathUtil;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
source/funkin/mobile/ui/mods/ModsManager.hx
+1 -1
View File
@@ -5,7 +5,7 @@ import flixel.graphics.FlxGraphic;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import flixel.util.FlxSpriteUtil;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import funkin.util.FileUtil;
import funkin.ui.MusicBeatSubState;
import funkin.modding.PolymodHandler;
source/funkin/mobile/ui/options/MobileControlsSchemeMenu.hx
+2 -2
View File
@@ -8,8 +8,8 @@ import flixel.FlxG;
import funkin.mobile.ui.options.objects.SchemeMenuButton;
import funkin.mobile.ui.options.objects.HitboxShowcase;
import funkin.mobile.ui.FunkinHitbox;
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.ui.MusicBeatSubState;
import funkin.ui.AtlasText;
import funkin.graphics.shaders.HSVShader;
source/funkin/mobile/ui/options/objects/SchemeMenuButton.hx
+2 -2
View File
@@ -5,8 +5,8 @@ import flixel.effects.FlxFlicker;
import flixel.group.FlxSpriteGroup;
import flixel.util.FlxSignal;
import flixel.util.FlxColor;
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.audio.FunkinSound;
import funkin.ui.AtlasText;
source/funkin/play/GameOverSubState.hx
+1 -1
View File
@@ -19,7 +19,7 @@ import funkin.ui.story.StoryMenuState;
import funkin.util.MathUtil;
import funkin.effects.RetroCameraFade;
import flixel.math.FlxPoint;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import openfl.utils.Assets;
/**
source/funkin/play/GitarooPause.hx
+2 -2
View File
@@ -7,8 +7,8 @@ import funkin.ui.MusicBeatState;
import flixel.addons.transition.FlxTransitionableState;
import funkin.ui.mainmenu.MainMenuState;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
#end
class GitarooPause extends MusicBeatState
source/funkin/play/PauseSubState.hx
+2 -2
View File
@@ -19,8 +19,8 @@ import funkin.play.cutscene.VideoCutscene;
import funkin.ui.AtlasText;
import funkin.ui.MusicBeatSubState;
import funkin.ui.transition.StickerSubState;
import funkin.mobile.util.SwipeUtil;
import funkin.mobile.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.util.TouchUtil;
#if NO_DISABLE_ADMOB_ADS
import funkin.mobile.util.AdMobUtil;
#end
source/funkin/play/PlayState.hx
+1 -1
View File
@@ -58,7 +58,7 @@ import funkin.util.SerializerUtil;
import funkin.util.HapticUtil;
import haxe.Int64;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import funkin.mobile.ui.FunkinHitbox;
import funkin.mobile.ui.FunkinHitbox.FunkinHitboxControlSchemes;
#if NO_DISABLE_ADMOB_ADS
source/funkin/play/ResultState.hx
+1 -1
View File
@@ -35,7 +35,7 @@ import funkin.play.components.ClearPercentCounter;
import funkin.api.newgrounds.Medals;
#end
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
#if NO_DISABLE_ADMOB_ADS
import funkin.mobile.util.AdMobUtil;
#end
source/funkin/ui/MenuList.hx
+2 -2
View File
@@ -6,8 +6,8 @@ import flixel.effects.FlxFlicker;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.util.FlxSignal.FlxTypedSignal;
import funkin.audio.FunkinSound;
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.ui.options.OptionsState.PageName;
class MenuTypedList<T:MenuListItem> extends FlxTypedGroup<T>
source/funkin/ui/charSelect/CharSelectSubState.hx
+2 -4
View File
@@ -35,10 +35,8 @@ import funkin.graphics.FunkinSprite;
#if FEATURE_NEWGROUNDS
import funkin.api.newgrounds.Medals;
#end
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
#end
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
class CharSelectSubState extends MusicBeatSubState
{
source/funkin/ui/charSelect/CharacterUnlockState.hx
+1 -1
View File
@@ -14,7 +14,7 @@ import funkin.ui.freeplay.charselect.PlayableCharacter;
import funkin.data.freeplay.player.PlayerRegistry;
import funkin.ui.mainmenu.MainMenuState;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
#end
using flixel.util.FlxSpriteUtil;
source/funkin/ui/credits/CreditsState.hx
+1 -1
View File
@@ -6,7 +6,7 @@ import funkin.audio.FunkinSound;
import flixel.FlxSprite;
import funkin.ui.mainmenu.MainMenuState;
import flixel.group.FlxSpriteGroup;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
/**
* The state used to display the credits scroll.
source/funkin/ui/debug/latency/LatencyState.hx
+1 -1
View File
@@ -13,7 +13,7 @@ import funkin.play.notes.Strumline;
import funkin.ui.mainmenu.MainMenuState;
import funkin.data.song.SongData.SongNoteData;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import funkin.mobile.ui.FunkinHitbox;
import funkin.play.notes.NoteDirection;
import funkin.graphics.FunkinSprite;
source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
+14 -3
View File
@@ -9,7 +9,7 @@ import flixel.util.FlxTimer;
import flixel.text.FlxText;
import flixel.text.FlxText.FlxTextAlign;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
#end
@:nullSafety
@@ -94,8 +94,10 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
currentInstrumentalIndex = (currentInstrumentalIndex - 1 + instrumentalIds.length) % instrumentalIds.length;
changedInst = true;
}
if (parent.getControls().ACCEPT #if mobile || ((TouchUtil.overlapsComplex(currentInstrumental) && TouchUtil.justPressed)
&& !(TouchUtil.overlapsComplex(leftArrow) || TouchUtil.overlapsComplex(rightArrow))) #end)
if (parent.getControls()
.ACCEPT #if mobile
|| ((TouchUtil.overlapsComplex(currentInstrumental) && TouchUtil.justPressed)
&& !(TouchUtil.overlapsComplex(leftArrow) || TouchUtil.overlapsComplex(rightArrow))) #end)
{
busy = true;
onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
@@ -109,6 +111,15 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
currentInstrumental.text = instrumentalIds[currentInstrumentalIndex].toTitleCase() ?? '';
if (currentInstrumental.text == '') currentInstrumental.text = 'Default';
}
if (parent.getControls().ACCEPT #if mobile
|| TouchUtil.overlapsComplex(currentInstrumental)
&& TouchUtil.justPressed
&& !TouchUtil.overlapsComplex(leftArrow)
&& !TouchUtil.overlapsComplex(rightArrow) #end)
{
onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
}
}
public function close():Void
source/funkin/ui/freeplay/FreeplayState.hx
+2 -4
View File
@@ -49,10 +49,8 @@ import funkin.data.freeplay.style.FreeplayStyleRegistry;
#if FEATURE_DISCORD_RPC
import funkin.api.discord.DiscordClient;
#end
#if TOUCH_CONTROLS
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
#end
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
import flixel.system.scaleModes.FullScreenScaleMode;
/**
source/funkin/ui/freeplay/LetterSort.hx
+2 -2
View File
@@ -10,8 +10,8 @@ import flixel.tweens.FlxEase;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import funkin.input.Controls;
import funkin.mobile.util.SwipeUtil;
import funkin.mobile.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.graphics.adobeanimate.FlxAtlasSprite;
class LetterSort extends FlxSpriteGroup
source/funkin/ui/freeplay/SongMenuItem.hx
+2 -2
View File
@@ -19,8 +19,8 @@ import flixel.addons.effects.FlxTrail;
import funkin.play.scoring.Scoring.ScoringRank;
import flixel.util.FlxColor;
import funkin.ui.PixelatedIcon;
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
using StringTools;
source/funkin/ui/mainmenu/MainMenuState.hx
+2 -2
View File
@@ -11,7 +11,7 @@ import flixel.util.FlxColor;
import flixel.tweens.FlxEase;
import funkin.graphics.FunkinCamera;
import funkin.audio.FunkinSound;
import funkin.mobile.util.SwipeUtil;
import funkin.util.SwipeUtil;
import flixel.tweens.FlxTween;
import funkin.ui.MusicBeatState;
import flixel.util.FlxTimer;
@@ -23,7 +23,7 @@ import funkin.ui.title.TitleState;
import funkin.ui.story.StoryMenuState;
import funkin.ui.Prompt;
import funkin.util.WindowUtil;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
#if FEATURE_DISCORD_RPC
import funkin.api.discord.DiscordClient;
#end
source/funkin/ui/options/OptionsState.hx
+1 -1
View File
@@ -17,7 +17,7 @@ import funkin.api.newgrounds.NewgroundsClient;
#end
#if mobile
import funkin.mobile.ui.FunkinBackspace;
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
import funkin.mobile.ui.options.MobileControlsSchemeMenu;
#end
import flixel.util.FlxColor;
source/funkin/ui/options/PreferencesMenu.hx
+2 -2
View File
@@ -19,8 +19,8 @@ import funkin.ui.options.items.EnumPreferenceItem;
import funkin.mobile.ui.FunkinBackspace;
#if mobile
import funkin.mobile.ui.FunkinHitbox;
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
#end
class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
source/funkin/ui/options/items/EnumPreferenceItem.hx
+1 -1
View File
@@ -4,7 +4,7 @@ import funkin.ui.TextMenuList.TextMenuItem;
import funkin.ui.AtlasText;
import funkin.input.Controls;
#if mobile
import funkin.mobile.util.SwipeUtil;
import funkin.util.SwipeUtil;
#end
/**
source/funkin/ui/options/items/NumberPreferenceItem.hx
+1 -1
View File
@@ -4,7 +4,7 @@ import funkin.ui.TextMenuList.TextMenuItem;
import funkin.ui.AtlasText;
import funkin.input.Controls;
#if mobile
import funkin.mobile.util.SwipeUtil;
import funkin.util.SwipeUtil;
#end
/**
source/funkin/ui/story/StoryMenuState.hx
+2 -2
View File
@@ -23,8 +23,8 @@ import funkin.ui.MusicBeatState;
import funkin.ui.transition.LoadingState;
import funkin.ui.transition.StickerSubState;
import funkin.util.MathUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.mobile.util.TouchUtil;
import funkin.util.SwipeUtil;
import funkin.util.TouchUtil;
import openfl.utils.Assets;
import flixel.system.scaleModes.FullScreenScaleMode;
#if FEATURE_DISCORD_RPC
source/funkin/ui/title/TitleState.hx
+2 -2
View File
@@ -34,8 +34,8 @@ import funkin.ui.freeplay.FreeplayState;
import openfl.display.BlendMode;
import funkin.save.Save;
#if mobile
import funkin.mobile.util.TouchUtil;
import funkin.mobile.util.SwipeUtil;
import funkin.util.TouchUtil;
import funkin.util.SwipeUtil;
#end
#if desktop
source/funkin/mobile/util/SwipeUtil.hx → source/funkin/util/SwipeUtil.hx
+2 -2
View File
@@ -1,10 +1,10 @@
package funkin.mobile.util;
package funkin.util;
#if FLX_POINTER_INPUT
import flixel.FlxG;
import flixel.input.FlxSwipe;
#end
import funkin.mobile.util.TouchUtil;
import funkin.util.TouchUtil;
// Turning this into a library or something would be nice -Zack
// NOTE DO NOT TOUCH THIS, I have a draft of a rework, and touching this would be a pain in the ass. -Zack
source/funkin/mobile/util/TouchUtil.hx → source/funkin/util/TouchUtil.hx
+1 -1
View File
@@ -5,7 +5,7 @@
// Another slight note from little me, it turns out it WAS accurate, my ass during clean up just completely forgot. My fault!! I gotta focus on multi-touch next time.
// Easy to fix but I'll tackle it for later.
// - Zack
package funkin.mobile.util;
package funkin.util;
import funkin.mobile.ui.TouchPointer;
import flixel.FlxBasic;