cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-22 13:13:47 +00:00
Code Issues Releases Wiki Activity

swipe length default stuff

Browse source
This commit is contained in:
Cameron Taylor 2021-08-25 20:03:58 -04:00
parent 5579d92f21
commit c21961c156
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/Controls.hx
View file

@ -544,9 +544,9 @@ 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) public function bindSwipe(control:Control, swipeDir:Int = FlxObject.UP, ?swpLength:Float = 90)
{ {
forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press))); forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press, swpLength)));
} }
/** /**
@ -635,13 +635,14 @@ 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); bindSwipe(Control.NOTE_UP, FlxObject.UP, 40);
bindSwipe(Control.NOTE_DOWN, FlxObject.DOWN); bindSwipe(Control.NOTE_DOWN, FlxObject.DOWN, 40);
bindSwipe(Control.NOTE_LEFT, FlxObject.LEFT); bindSwipe(Control.NOTE_LEFT, FlxObject.LEFT, 40);
bindSwipe(Control.NOTE_RIGHT, FlxObject.RIGHT); bindSwipe(Control.NOTE_RIGHT, FlxObject.RIGHT, 40);
bindSwipe(Control.UI_UP, FlxObject.UP); // feels more like drag when up/down are inversed
bindSwipe(Control.UI_DOWN, FlxObject.DOWN); bindSwipe(Control.UI_UP, FlxObject.DOWN);
bindSwipe(Control.UI_DOWN, FlxObject.UP);
bindSwipe(Control.UI_LEFT, FlxObject.LEFT); bindSwipe(Control.UI_LEFT, FlxObject.LEFT);
bindSwipe(Control.UI_RIGHT, FlxObject.RIGHT); bindSwipe(Control.UI_RIGHT, FlxObject.RIGHT);
#end #end
@ -862,12 +863,6 @@ typedef Swipes =
class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
{ {
public function new(swipeDir:Int = FlxObject.ANY, Trigger:FlxInputState)
{
super(MOBILE, swipeDir, Trigger);
}
// fix right swipe
var touchMap:Map<Int, Swipes> = new Map(); var touchMap:Map<Int, Swipes> = new Map();
var vibrationSteps:Int = 5; var vibrationSteps:Int = 5;
@ -875,6 +870,17 @@ 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)
{
super(MOBILE, swipeDir, Trigger);
activateLength = swipeLength;
}
// fix right swipe
// make so cant double swipe during gameplay
// hold notes?
override function update():Void override function update():Void
{ {
super.update(); super.update();
@ -910,8 +916,8 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
daSwipe.touchAngle = Math.atan2(dy, dx); daSwipe.touchAngle = Math.atan2(dy, dx);
daSwipe.touchLength = Math.sqrt(dx * dx + dy * dy); daSwipe.touchLength = Math.sqrt(dx * dx + dy * dy);
// FlxG.watch.addQuick("LENGTH", touchLength); FlxG.watch.addQuick("LENGTH", daSwipe.touchLength);
// FlxG.watch.addQuick("ANGLE", FlxAngle.asDegrees(touchLength)); FlxG.watch.addQuick("ANGLE", FlxAngle.asDegrees(daSwipe.touchAngle));
if (daSwipe.touchLength >= (activateLength / vibrationSteps) * curStep) if (daSwipe.touchLength >= (activateLength / vibrationSteps) * curStep)
{ {
@ -945,7 +951,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
switch (trigger) switch (trigger)
{ {
case JUST_PRESSED: case JUST_PRESSED:
if (swp.touchLength >= activateLength) // 90 is random ass value lol if (swp.touchLength >= activateLength)
{ {
switch (inputID) switch (inputID)
{ {
@ -956,7 +962,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
case FlxObject.LEFT: case FlxObject.LEFT:
if (degAngle <= 45 && -degAngle <= 45) return properTouch(swp); if (degAngle <= 45 && -degAngle <= 45) return properTouch(swp);
case FlxObject.RIGHT: case FlxObject.RIGHT:
if (degAngle >= 90 + 45 && -degAngle >= 90 + 45) return properTouch(swp); if (degAngle >= 90 + 45 && degAngle <= -90 + -45) return properTouch(swp);
} }
} }
default: default: