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

swipe cleanup

Browse source
This commit is contained in:
Cameron Taylor 2021-08-25 12:18:12 -04:00
parent e20814cefa
commit 27da6fdba9
2 changed files with 61 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
source/Controls.hx
View file

@ -544,6 +544,11 @@ class Controls extends FlxActionSet
forEachBound(control, function(action, state) addKeys(action, keys, state));
}
public function bindSwipe(control:Control, swipeDir:Int = FlxObject.UP)
{
forEachBound(control, function(action, press) action.add(new FlxActionInputDigitalMobileSwipeGameplay(swipeDir, press)));
}
/**
* Sets all actions that pertain to the binder to trigger when the supplied keys are used.
* If binder is a literal you can inline this
@ -622,37 +627,33 @@ class Controls extends FlxActionSet
case Custom: // nothing
}
bindMobileLol();
}
function bindMobileLol()
{
#if FLX_TOUCH
// MAKE BETTER TOUCH BIND CODE
bindSwipe(Control.NOTE_UP, FlxObject.UP);
bindSwipe(Control.NOTE_DOWN, FlxObject.DOWN);
bindSwipe(Control.NOTE_LEFT, FlxObject.LEFT);
bindSwipe(Control.NOTE_RIGHT, FlxObject.RIGHT);
bindSwipe(Control.UI_UP, FlxObject.UP);
bindSwipe(Control.UI_DOWN, FlxObject.DOWN);
bindSwipe(Control.UI_LEFT, FlxObject.LEFT);
bindSwipe(Control.UI_RIGHT, FlxObject.RIGHT);
#end
#if android
forEachBound(Control.BACK, function(action, pres)
{
action.add(new FlxActionInputDigitalAndroid(FlxAndroidKey.BACK, JUST_PRESSED));
});
#if FLX_TOUCH
forEachBound(Control.NOTE_UP, function(action, press)
{
action.add(new FlxActionInputDigitalMobileSwipeGameplay(FlxObject.UP, JUST_PRESSED));
});
forEachBound(Control.NOTE_DOWN, function(action, press)
{
action.add(new FlxActionInputDigitalMobileSwipeGameplay(FlxObject.DOWN, JUST_PRESSED));
});
forEachBound(Control.NOTE_LEFT, function(action, press)
{
action.add(new FlxActionInputDigitalMobileSwipeGameplay(FlxObject.LEFT, JUST_PRESSED));
});
forEachBound(Control.NOTE_RIGHT, function(action, press)
{
action.add(new FlxActionInputDigitalMobileSwipeGameplay(FlxObject.RIGHT, JUST_PRESSED));
});
#end
#end
}
var virutalPad:FlxVirtualPad;
function removeKeyboard()
{
for (action in this.digitalActions)
@ -858,13 +859,9 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
super(MOBILE, swipeDir, Trigger);
}
// make thing to register swipes
// make thing to reset swipe when u hit it
// make haptic for swipes that goes on downward slope until you hit it, which then hits you with it
// can reset swipe and swipe another direction
// multiple swipe support
// move touch controls to update() override?
// make datatype that has all 3 needed info and then make an array of them?
//
var initTouchPos:FlxPoint = new FlxPoint();
var touchAngle:Float = 0;
@ -887,6 +884,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
{
initTouchPos.set(touch.screenX, touch.screenY);
curStep = 1;
Haptic.vibrate(40, 70);
}
if (touch.pressed)
{
@ -904,7 +902,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
if (touchLength >= (activateLength / vibrationSteps) * curStep)
{
curStep += 1;
Haptic.vibrate(Std.int(hapticPressure / curStep), 50);
// Haptic.vibrate(Std.int(hapticPressure / (curStep * 1.5)), 50);
}
}
@ -938,13 +936,9 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
if (degAngle <= 45 && -degAngle <= 45) return properTouch();
case FlxObject.RIGHT:
if (degAngle >= 90 + 45 && -degAngle >= 90 + 45) return properTouch();
default:
return false;
}
}
default:
return false;
}
return false;
@ -953,7 +947,7 @@ class FlxActionInputDigitalMobileSwipeGameplay extends FlxActionInputDigital
function properTouch():Bool
{
curStep = 1;
Haptic.vibrate(100, 20);
Haptic.vibrate(100, 30);
initTouchPos.set(curTouchPos.x, curTouchPos.y);
return true;
}

51
source/PlayState.hx
View file

@ -2662,40 +2662,55 @@ class PlayState extends MusicBeatState
controls.NOTE_UP_R,
controls.NOTE_RIGHT_R
];
var widHalf = FlxG.width / 2;
var heightHalf = FlxG.height / 2;
/*
var widHalf = FlxG.width / 2;
var heightHalf = FlxG.height / 2;
if (FlxG.onMobile)
{
for (touch in FlxG.touches.list)
{
var getHeight:Int = Math.floor(touch.justPressedPosition.y / (FlxG.height / 3));
var getWid:Int = Math.floor(touch.justPressedPosition.x / (FlxG.width / 4));
if (touch.justPressed)
{
var getHeight:Int = Math.floor(touch.justPressedPosition.y / (FlxG.height / 3));
switch (getHeight)
switch (getWid)
{
case 0:
pressArray[2] = true;
case 1:
touch.justPressedPosition.x < widHalf ? pressArray[0] = true : pressArray[3] = true;
pressArray[3] = true;
case 2:
pressArray[1] = true;
pressArray[0] = true;
default:
switch (getHeight)
{
case 0:
pressArray[2] = true;
case 1:
touch.justPressedPosition.x < widHalf ? pressArray[0] = true : pressArray[3] = true;
case 2:
pressArray[1] = true;
}
}
}
var getHeight:Int = Math.floor(touch.justPressedPosition.y / (FlxG.height / 3));
switch (getHeight)
switch (getWid)
{
case 0:
holdArray[2] = true;
case 1:
touch.justPressedPosition.x < widHalf ? holdArray[0] = true : holdArray[3] = true;
holdArray[3] = true;
case 2:
holdArray[1] = true;
holdArray[0] = true;
default:
switch (getHeight)
{
case 0:
holdArray[2] = true;
case 1:
touch.justPressedPosition.x < widHalf ? holdArray[0] = true : holdArray[3] = true;
case 2:
holdArray[1] = true;
}
}
}
}